clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,436 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

7436 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
friendica dfee9faca5 rev update 2013-01-10 22:27:41 -08:00
friendica eb6c46a303 Merge https://github.com/friendica/friendica into pull 2013-01-10 01:09:02 -08:00
friendica 51eb0cd59d rev update 2013-01-10 01:08:36 -08:00
Tobias Diekershoff df9f3b3db3 ZH-CN: update to the strings 2013-01-10 06:49:35 +01:00
Tobias Diekershoff 5ad382d797 DE: update to the strings 2013-01-10 06:48:54 +01:00
friendica f6a63abd7d update smarty diabook templates bug 525 2013-01-08 14:45:19 -08:00
friendica de0315396c missing session template_engine calls 2013-01-08 12:24:13 -08:00
friendica 4ab363ed71 bypass smarty wherever using intltext_templates (install, register, friend confirmation emails, etc.) 2013-01-07 20:14:00 -08:00
friendica 972060a8ff Merge pull request #575 from beardy-unixer/master 
If we find a home.html, also look for a home.css
 2013-01-05 19:32:11 -08:00
Thomas Willingham 0cf3d70875 If we find a home.html, also look for a home.css 2013-01-05 14:31:10 +00:00
Tobias Diekershoff e09c31b627 CS: update to the strings 2013-01-05 09:29:26 +01:00
friendica 07ba4da634 email header encoding everywhere 2013-01-04 15:47:29 -08:00
friendica a5755b59a8 preserve multiple newlines - see discussion at https://github.com/friendica/friendica/pull/570 2013-01-04 15:21:05 -08:00
friendica 8209ae6455 Merge https://github.com/friendica/friendica into pull 2013-01-04 15:14:33 -08:00
friendica 9fbaa0d383 rev update 2013-01-04 15:14:00 -08:00
friendica 88cc414355 Merge pull request #570 from annando/master 
Vier, caches and "share" via API
 2013-01-04 15:13:09 -08:00
friendica c0fd572fec Merge pull request #574 from fermionic/20130103-always-load-theme-in-mod_init 
Finalize theme decision in a module's _init function
 2013-01-04 14:36:47 -08:00
Tobias Diekershoff 602ca63111 PL: update to the strings 2013-01-04 09:18:21 +01:00
Thomas Willingham a8ea3d6e48 We haven't Got Zot 2013-01-03 20:18:43 +00:00
Zach Prezkuta 3e59b0715b better location for toggle_mobile code 2013-01-03 11:16:10 -07:00
Zach Prezkuta 0ba1bdbb08 profile_uid bug in boot.php 2013-01-03 10:53:11 -07:00
Zach Prezkuta fdd142c42e never use profile_load outside of a module's _init() function 2013-01-03 10:47:45 -07:00
friendica 0d5b8dfafd Merge https://github.com/friendica/friendica into pull 2013-01-03 03:50:17 -08:00
friendica e394ccd0a8 If we're going to encode the email headers, we probably should use the encoded version rather than the original 2013-01-03 03:47:08 -08:00
Olaf Conradi 1c81409bf8 Merge pull request #573 from oohlaf/fixes 
Don't add src attributes inside acl-template
 2013-01-02 05:32:19 -08:00
Olaf Conradi 2943550fe2 No need to remove data-src attributes 
Better comment string also
 2013-01-02 14:28:13 +01:00
Tobias Diekershoff 68d304cc0f Merge branch 'master' of git://github.com/friendica/friendica 2013-01-02 11:10:59 +01:00
Tobias Diekershoff e56c041579 DE: update to the strings 2013-01-02 11:10:24 +01:00
friendica 9bb9350126 Merge https://github.com/friendica/friendica into pull 2013-01-01 17:33:33 -08:00
friendica 66b1448cdb rev update 2013-01-01 17:32:46 -08:00
fermionic 3c49a1b769 Merge pull request #572 from cvogeley/master 
Fix registration form
 2013-01-01 15:12:45 -08:00
Christian Vogeley d9961bc3b4 revert one change 2013-01-01 23:47:56 +01:00
Christian Vogeley 457a3b5220 Change templates remove var modifiers 2013-01-01 23:41:26 +01:00
Christian Vogeley 4ab7820663 . 2013-01-01 22:44:02 +01:00
Christian Vogeley 5bfd4cf5c4 Move HTML part of oid to template + replace outside the tpl 2013-01-01 22:40:05 +01:00
Tobias Diekershoff 0472ab7282 DE: update to the strings 2013-01-01 22:25:55 +01:00
Christian Vogeley 2a3f8f8ee2 . 2013-01-01 21:08:30 +01:00
Christian Vogeley cde9b6370d Fix registration form 2013-01-01 21:05:24 +01:00
pixelroot 966d786982 modified: view/theme/smoothly/style.css 
modified:   view/theme/smoothly/theme.php
 2013-01-01 16:42:52 +01:00
friendica 405f37b7ae Merge https://github.com/friendica/friendica into pull 2012-12-31 14:54:31 -08:00
friendica 017042d5d4 rev update 2012-12-31 14:54:04 -08:00
fermionic c7d820dee5 Merge pull request #571 from fermionic/20121230-diabook-template-dashes 
replace dashes with underscores in diabook
 2012-12-30 19:46:46 -08:00
Zach Prezkuta 1d1c8f4771 replace dashes with underscores in diabook 2012-12-30 20:46:03 -07:00
Olaf Conradi 6a2bd8b29f Don't replace data-src with src in acl-template 
On pageload an empty acl-list-item as template is created and not yet replaced.
Don't change the data-src for src attributes in those images.
 2012-12-31 00:01:15 +01:00
Michael Vogel 348f43157a Vier: Some templates were missing 2012-12-30 22:58:05 +01:00
Michael Vogel e50c0efcdf Merge remote-tracking branch 'upstream/master' 2012-12-30 21:32:18 +01:00
Michael Vogel ad287914c7 Support of "share" through the API. 2012-12-30 21:30:39 +01:00
Olaf Conradi e05725fb44 Merge pull request #569 from oohlaf/fixes 
Fix browser prefetch of template strings in images
 2012-12-30 08:17:36 -08:00
friendica 215a7f139c make smarty error reporting a bit less chatty 2012-12-30 00:29:07 -08:00
Olaf Conradi c5845be74e Merge branch 'master' into fixes 2012-12-30 01:30:00 +01:00