aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Moved popup logic in boot.php, added 'item_photo_menu' hookFabio Comuni2011-03-317-12/+72
* first workFabio Comuni2011-03-304-3/+50
* Merge remote-tracking branch 'friendika-master/master'Fabio Comuni2011-03-3055-2022/+1506
|\
| * undo last commitFriendika2011-03-301-1/+1
| * increase suhosin $_GET length limitFriendika2011-03-301-0/+2
| * placeholder arg in dfrn conversationsFriendika2011-03-304-5/+5
| * secure profile failureFriendika2011-03-304-5/+5
| * oexchangeFriendika2011-03-295-4/+95
| * remove obsolete templateFriendika2011-03-295-359/+0
| * optionally set article titleFriendika2011-03-296-24/+51
| * update comment count as new comments come inFriendika2011-03-291-8/+12
| * cleanup untracked filesFriendika2011-03-293-0/+1
| * more templates goneFriendika2011-03-2924-1488/+1309
| * another templateFriendika2011-03-297-133/+30
| * Merge branch 'fabrixxm-master'Friendika2011-03-293-166/+378
| |\
| * | revupFriendika2011-03-291-1/+1
* | | Merge remote-tracking branch 'origin/master'Fabio Comuni2011-03-301-3/+3
|\ \ \ | | |/ | |/|
| * | Updated IT stringsfabrixxm2011-03-291-3/+3
| * | Merge remote-tracking branch 'friendika/master'fabrixxm2011-03-2934-353/+608
| |\|
* | | Merge remote-tracking branch 'friendika-master/master'Fabio Comuni2011-03-2934-353/+608
|\ \ \ | |/ / |/| / | |/
| * off by oneFriendika2011-03-281-2/+2
| * small wording changeFriendika2011-03-284-4/+4
| * added comments, make typo checker work with redefined plural string functionsFriendika2011-03-283-3/+59
| * util/README updatedFriendika2011-03-281-0/+5
| * Merge branch 'omigeot-master'Friendika2011-03-2825-343/+537
| |\
| | * French translation considered done, yet not fully tested.Olivier Migeot2011-03-289-255/+449
| | * Some more templates for french translationOlivier Migeot2011-03-284-42/+42
| | * More french templates (except emails, everything should be ok now)Olivier Migeot2011-03-289-27/+27
| | * Some more templates translated to french.Olivier Migeot2011-03-283-21/+21
| | * Merge remote branch 'mike/master'Olivier Migeot2011-03-2864-825/+1248
| | |\
| | * | Defined plurals (as explained by Fabio)Olivier Migeot2011-03-222-2/+2
| * | | revupFriendika2011-03-281-1/+1
| | |/ | |/|
* / | Updated IT stringsfabrixxm2011-03-282-163/+375
|/ /
* | author collapse: close off before paginationFriendika2011-03-282-0/+9
* | tweaks to author collapsingFriendika2011-03-271-3/+2
* | collapse posts by same author (but not you).Friendika2011-03-272-2/+21
* | wrong date order profile pageFriendika2011-03-271-1/+1
* | comment collapsing, pagination wasn't advancing past 16Friendika2011-03-273-20/+121
* | info pageFriendika2011-03-272-1/+48
* | Merge branch 'tobiasd-master'Friendika2011-03-252-2/+2
|\ \
| * | fixed wrong colors for linksTobias Diekershoff2011-03-251-1/+1
| * | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-03-2561-806/+1070
| |\ \
| * \ \ Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-03-221-2/+2
| |\ \ \
| * \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-03-2254-2348/+3691
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-03-196-153/+282
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-03-1887-1356/+7987
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-03-1721-12/+184
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ 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
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |