aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-01-245-52/+233
|\
| * don't translate CR-LFFriendika2011-01-242-5/+4
| * Merge branch 'fabrixxm-master'Friendika2011-01-242-46/+228
| |\
| | * Merge branch 'master' of github.com:fabrixxm/friendikaFabio Comuni2011-01-242-46/+228
| | |\
| | | * IT strings fixfabrixxm2011-01-231-46/+48
| | | * string.php translation utilityfabrixxm2011-01-231-0/+180
| * | | version rollFriendika2011-01-241-1/+1
| |/ /
| * | linkify - need at least one character after ://Friendika2011-01-241-1/+1
* | | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-01-2461-8/+3040
|\| |
| * | owner's sparkle link, sometimes not author's - on display pageFriendika2011-01-231-1/+15
| * | following random feedsFriendika2011-01-233-3/+91
| * | fix a few issues with code blocks, ignore tags within blocks, fold multi-line...Friendika2011-01-234-2/+24
| * | add cc-license text to all content pagesFriendika2011-01-233-1/+8
| * | sync template updates en => frFriendika2011-01-231-2/+2
| * | Merge branch 'master' of https://github.com/omigeot/friendika into omigeot-ma...Friendika2011-01-2351-0/+2901
| |\ \
| | * | Done timezones + marital statuses and a few time-related translationsolivierm2011-01-231-476/+476
| | * | A little more...olivierm2011-01-211-10/+10
| | * | More translation, added FIXME where not completely satisfying.olivierm2011-01-211-24/+24
| | * | Translated more frencholivierm2011-01-211-41/+41
| | * | More strings translated for french locale.olivierm2011-01-211-29/+29
| | * | Started the french translation (up to the "TODO" comment in view/fr/strings.php)olivierm2011-01-2151-0/+2901
| * | | given a tag @foo, don't also link/replace words like food in msg bodyFriendika2011-01-231-1/+1
| | |/ | |/|
* | | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-01-233-3/+8
|\| |
| * | fix quotes (again)Friendika2011-01-231-1/+1
| * | new network typesFriendika2011-01-232-2/+7
* | | 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
* | | 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
* | | 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
|\| |
| * | don't urlencode $_GET varsFriendika2011-01-212-5/+9
| |/
* | more stringsTobias Diekershoff2011-01-212-21/+21
* | spelling ;-)Tobias Diekershoff2011-01-211-1/+1
* | minor wordeningTobias Diekershoff2011-01-211-1/+1
* | minor wording correctionTobias Diekershoff2011-01-211-1/+1
* | 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
* | minor thing with the stringsTobias Diekershoff2011-01-211-2/+2
* | german translation of registrations-top.tplTobias Diekershoff2011-01-211-0/+3
* | some more stringsTobias Diekershoff2011-01-211-23/+23
* | 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