Commit Graph

1717 Commits

Author SHA1 Message Date
Fabio Comuni 05d9035aaa Merge remote-tracking branch 'origin/master' 2011-03-30 16:05:19 +02:00
Friendika 18da7efa27 undo last commit 2011-03-30 05:22:25 -07:00
Friendika 89df2b19ce increase suhosin $_GET length limit 2011-03-30 05:10:22 -07:00
Friendika 04cd865cc9 placeholder arg in dfrn conversations 2011-03-30 04:20:40 -07:00
Friendika f198c5cff8 secure profile failure 2011-03-30 04:07:47 -07:00
Friendika 4aa60a7aaf oexchange 2011-03-29 21:59:28 -07:00
Friendika 8357c064ae remove obsolete template 2011-03-29 19:23:02 -07:00
Friendika 066bdca30d optionally set article title 2011-03-29 18:57:26 -07:00
Friendika 8f547283c0 update comment count as new comments come in 2011-03-29 18:20:52 -07:00
Friendika a41b4c6e67 cleanup untracked files 2011-03-29 17:46:40 -07:00
Friendika f1db34eebc more templates gone 2011-03-29 17:19:12 -07:00
Friendika e1fd2ecb16 another template 2011-03-29 15:27:14 -07:00
Friendika 97ae3814d9 Merge branch 'fabrixxm-master' 2011-03-29 14:53:11 -07:00
Friendika c2a0016018 revup 2011-03-29 14:52:15 -07:00
erik 2f48135b71 Edited view/sv/settings.tpl via GitHub 2011-03-29 11:42:04 -07:00
erik 80e3241bc1 Edited view/sv/profile_edit.tpl via GitHub 2011-03-29 11:24:07 -07:00
erik 47169d71fd Edited view/sv/settings.tpl via GitHub 2011-03-29 11:19:49 -07:00
erik a406534c00 Edited view/sv/register_open_eml.tpl via GitHub 2011-03-29 11:10:25 -07:00
fabrixxm 341a6f90ec Updated IT strings 2011-03-29 18:05:24 +02:00
fabrixxm 6631bc64d3 Merge remote-tracking branch 'friendika/master' 2011-03-29 18:00:19 +02:00
Fabio Comuni e2b975065c Merge remote-tracking branch 'friendika-master/master' 2011-03-29 14:12:50 +02:00
Friendika 920396e402 off by one 2011-03-28 20:06:45 -07:00
Friendika 6a280c321d small wording change 2011-03-28 18:06:36 -07:00
Friendika 00b5f6f8a1 added comments, make typo checker work with redefined plural string functions 2011-03-28 17:24:11 -07:00
Friendika 0f8bcacfdd util/README updated 2011-03-28 16:10:12 -07:00
Friendika 266a93c584 Merge branch 'omigeot-master' 2011-03-28 15:42:01 -07:00
Friendika 15b6792ca0 revup 2011-03-28 15:41:08 -07:00
fabrixxm 2a23147042 Updated IT strings 2011-03-28 21:19:27 +02:00
Olivier Migeot 3b709a074a French translation considered done, yet not fully tested. 2011-03-28 19:59:16 +02:00
Olivier Migeot 581349de59 Some more templates for french translation 2011-03-28 14:31:57 +02:00
Olivier Migeot 10d44f2bb9 More french templates (except emails, everything should be ok now) 2011-03-28 13:59:05 +02:00
Olivier Migeot c8fb1008f5 Some more templates translated to french. 2011-03-28 13:50:56 +02:00
Olivier Migeot da546588db Merge remote branch 'mike/master' 2011-03-28 12:11:10 +02:00
Friendika 1f6c6c466a author collapse: close off before pagination 2011-03-28 00:49:20 -07:00
Friendika 77fbd2f78c tweaks to author collapsing 2011-03-27 20:43:45 -07:00
Friendika 7defb1768b collapse posts by same author (but not you). 2011-03-27 20:37:44 -07:00
Friendika b57214cb78 wrong date order profile page 2011-03-27 19:59:27 -07:00
Friendika c962f5c4bc comment collapsing, pagination wasn't advancing past 16 2011-03-27 19:53:36 -07:00
Friendika 76918ed5a5 info page 2011-03-27 16:35:56 -07:00
erik 4068a21b37 Edited view/sv/register_verify_eml.tpl via GitHub 2011-03-26 03:11:41 -07:00
erik 17b4f9f8a7 Edited view/sv/register_verify_eml.tpl via GitHub 2011-03-26 03:09:00 -07:00
Friendika ff8bddb4a8 Merge branch 'tobiasd-master' 2011-03-25 15:11:22 -07:00
Friendika f7928f15a8 revup 2011-03-25 15:08:40 -07:00
Tobias Diekershoff 9808b0378d fixed wrong colors for links 2011-03-25 13:03:30 +01:00
Tobias Diekershoff af0f3a7e05 Merge branch 'master' of git://github.com/friendika/friendika 2011-03-25 12:47:36 +01:00
Friendika ca113bfaa0 change link to project website 2011-03-24 21:10:51 -07:00
Friendika 6bc5d6f17b repair duplicate nickname accounts caused by race condition 2011-03-24 15:45:27 -07:00
Friendika 067626380d Merge branch 'erikl-master'
Conflicts:
	view/sv/insecure_net.tpl
	view/sv/jot-header.tpl
	view/sv/msg-header.tpl
	view/sv/profile_edit.tpl
	view/sv/profile_tabs.tpl
	view/sv/strings.php
2011-03-24 04:36:53 -07:00
Friendika ba99ce3d0a Merge branch 'master' of https://github.com/erikl/friendika into erikl-master 2011-03-24 04:06:01 -07:00
Friendika 51447932f7 link same as visited 2011-03-24 01:16:14 -07:00