aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-236-9/+10
|\
| * updated profile_advanced.php from changes in view/enTobias Diekershoff2011-01-231-2/+2
| * Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-01-235-7/+8
| |\
| | * linkify naked urls when they are at the beginning of the textFriendika2011-01-221-1/+2
| | * wrong verb in dislike activity bodyFriendika2011-01-221-1/+1
| | * birthday timezone is absoluteFriendika2011-01-222-4/+4
| | * typoFriendika2011-01-221-1/+1
* | | Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-222-3/+2
|\| |
| * | wording in email template adjustedTobias Diekershoff2011-01-221-2/+1
| * | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-01-221-1/+1
| |\|
| | * incorrect item owner on like/dislike activity body when remote-auth profileFriendika2011-01-211-1/+1
* | | Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-211-1/+1
|\| |
| * | variable name spelling mistake in template correctedTobias Diekershoff2011-01-211-1/+1
| * | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-01-212-5/+9
| |\|
* | | Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-212-5/+9
|\ \ \ | | |/ | |/|
| * | don't urlencode $_GET varsFriendika2011-01-212-5/+9
* | | Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-212-22/+22
|\ \ \ | | |/ | |/|
| * | more stringsTobias Diekershoff2011-01-212-21/+21
| * | spelling ;-)Tobias Diekershoff2011-01-211-1/+1
* | | Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-212-2/+2
|\| |
| * | minor wordeningTobias Diekershoff2011-01-211-1/+1
| * | minor wording correctionTobias Diekershoff2011-01-211-1/+1
* | | Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-213-32/+32
|\| |
| * | minor correction to profile_edit.tpl more stringsTobias Diekershoff2011-01-212-31/+31
| * | made this notification header consisten with the otherTobias Diekershoff2011-01-211-1/+1
* | | Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-211-2/+2
|\| |
| * | minor thing with the stringsTobias Diekershoff2011-01-211-2/+2
* | | Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-211-0/+3
|\| |
| * | german translation of registrations-top.tplTobias Diekershoff2011-01-211-0/+3
* | | Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-211-23/+23
|\| |
| * | some more stringsTobias Diekershoff2011-01-211-23/+23
* | | Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-2149-0/+2867
|\| |
| * | german translation of install_db.tplTobias Diekershoff2011-01-211-6/+6
| * | german translation of jot.tplTobias Diekershoff2011-01-211-7/+7
| * | german translation of lostpass.tpl and lostpass_eml.tplTobias Diekershoff2011-01-212-18/+18
| * | german translation of netfriend.tplTobias Diekershoff2011-01-211-3/+3
| * | german translation of passchanged_eml.tpl pagetypes.tplTobias Diekershoff2011-01-212-19/+19
| * | german translation of the profile* filesTobias Diekershoff2011-01-218-20/+20
| * | german translation of pwdreset.tplTobias Diekershoff2011-01-211-5/+5
| * | german translation of register-link.tplTobias Diekershoff2011-01-211-1/+1
| * | german translation of register_open_eml.tplTobias Diekershoff2011-01-212-18/+15
| * | german translation of register_verify_eml.tplTobias Diekershoff2011-01-211-14/+9
| * | german translation of request_notify_eml.tplTobias Diekershoff2011-01-211-10/+7
| * | german translation of wallwall_item.tplTobias Diekershoff2011-01-211-3/+3
| * | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-01-216-35/+59
| |\|
| * | german translation of settings_nick_set.tplTobias Diekershoff2011-01-201-1/+1
| * | german translation of settings_nick_subdir.tplTobias Diekershoff2011-01-201-4/+7
| * | german translation of settings_nick_unset.tplTobias Diekershoff2011-01-201-5/+7
| * | german translation of wall_item_drop.tplTobias Diekershoff2011-01-201-1/+3
| * | german translation of settings.tplTobias Diekershoff2011-01-201-24/+24