aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-03-196-153/+282
|\
| * stuff to make connecting to diaspora profiles easierFriendika2011-03-193-7/+21
| * Merge branch 'fabrixxm-master'Friendika2011-03-183-145/+260
| |\
| | * Updated IT languageFabio Comuni2011-03-182-144/+247
| | * Fix to po2php with '$' in stringsFabio Comuni2011-03-181-1/+13
| * | revupFriendika2011-03-181-1/+1
| |/
* | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-03-1887-1356/+7987
|\|
| * Merge branch 'gettext' of https://github.com/fabrixxm/friendika into fabrixxm...Friendika2011-03-1828-1267/+5979
| |\
| | * Updated utils/READMEFabio Comuni2011-03-181-0/+72
| | * Fix to po2php on multiline msgstrFabio Comuni2011-03-181-5/+20
| | * Update IT stringsFabio Comuni2011-03-182-2760/+2130
| | * php2po scriptFabio Comuni2011-03-181-0/+71
| | * Update po2php scriptFabio Comuni2011-03-181-11/+27
| | * Update more stringsFabio Comuni2011-03-185-1038/+1034
| | * extract.php extract tt(). Updated strings.phpfabrixxm2011-03-132-87/+99
| | * Fix spaces around t() and tt()fabrixxm2011-03-138-10/+10
| | * updated stringsfabrixxm2011-03-113-1247/+723
| | * it messagesfabrixxm2011-03-111-0/+3135
| | * update sh scriptfabrixxm2011-03-111-14/+24
| | * Changed 'mo' with 'po'.....fabrixxm2011-03-111-6/+6
| | * extract string can update existing po filefabrixxm2011-03-111-2/+9
| | * update source stringsfabrixxm2011-03-1118-46/+2458
| | * Convert .mo file to strings.phpfabrixxm2011-03-111-0/+72
| | * script sh to run xgettext on code and prepare messages.mo filefabrixxm2011-03-111-0/+19
| | * Move translation functions. Add tt() for plural cases.fabrixxm2011-03-112-22/+51
| * | rework post editing a bitFriendika2011-03-181-77/+79
| * | edit to display pageFriendika2011-03-181-0/+4
| * | edit posting after submissionFriendika2011-03-189-1/+159
| * | more thorough cleanup on account/contact removalFriendika2011-03-172-0/+6
| * | better colour matching on toolbar, replace "share" with "recycle"Friendika2011-03-173-1/+1
| * | incorrect slinky paramFriendika2011-03-171-1/+1
| * | updated swedish templatesFriendika2011-03-173-6/+47
| * | swedush string update via eriklFriendika2011-03-171-143/+0
| * | Merge branch 'master' of http://github.com/erikl/friendika into erikl-masterFriendika2011-03-1744-1/+1846
| |\ \
| | * | commit001erik2011-03-1145-0/+2925
| * | | revupFriendika2011-03-171-1/+1
| * | | condense birthday displayFriendika2011-03-171-2/+8
* | | | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-03-1721-12/+184
|\| | |
| * | | no birthdays for nonexistent contactsFriendika2011-03-161-0/+2
| * | | no sharing icon for private msgsFriendika2011-03-162-2/+4
| * | | no sharing from thread display pageFriendika2011-03-161-1/+1
| * | | vorbis audio/video link buttonsFriendika2011-03-1611-6/+93
| * | | small position adjustmentFriendika2011-03-161-1/+1
| * | | protect tags from double expansion during RTFriendika2011-03-161-0/+4
| * | | share,retweet,relay,forward, whateverFriendika2011-03-1617-3/+80
* | | | Merge github.com:tobiasd/friendikaTobias Diekershoff2011-03-161-4/+0
|\ \ \ \
| * | | | resolved some local git quirksTobias Diekershoff2011-03-131-4/+0
* | | | | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-03-1628-65/+380
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | facebook parses out punctuation on the left of links but not on rightFriendika2011-03-151-1/+1
| * | | content expirationFriendika2011-03-1515-20/+165