Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | remove obsolete template | Friendika | 2011-03-29 | 5 | -359/+0 |
| | |||||
* | optionally set article title | Friendika | 2011-03-29 | 6 | -24/+51 |
| | |||||
* | update comment count as new comments come in | Friendika | 2011-03-29 | 1 | -8/+12 |
| | |||||
* | cleanup untracked files | Friendika | 2011-03-29 | 3 | -0/+1 |
| | |||||
* | more templates gone | Friendika | 2011-03-29 | 24 | -1488/+1309 |
| | |||||
* | another template | Friendika | 2011-03-29 | 7 | -133/+30 |
| | |||||
* | Merge branch 'fabrixxm-master' | Friendika | 2011-03-29 | 3 | -166/+378 |
|\ | |||||
| * | Updated IT strings | fabrixxm | 2011-03-29 | 1 | -3/+3 |
| | | |||||
| * | Merge remote-tracking branch 'friendika/master' | fabrixxm | 2011-03-29 | 34 | -353/+608 |
| |\ | |||||
| * | | Updated IT strings | fabrixxm | 2011-03-28 | 2 | -163/+375 |
| | | | |||||
* | | | revup | Friendika | 2011-03-29 | 1 | -1/+1 |
| |/ |/| | |||||
* | | off by one | Friendika | 2011-03-28 | 1 | -2/+2 |
| | | |||||
* | | small wording change | Friendika | 2011-03-28 | 4 | -4/+4 |
| | | |||||
* | | added comments, make typo checker work with redefined plural string functions | Friendika | 2011-03-28 | 3 | -3/+59 |
| | | |||||
* | | util/README updated | Friendika | 2011-03-28 | 1 | -0/+5 |
| | | |||||
* | | Merge branch 'omigeot-master' | Friendika | 2011-03-28 | 25 | -343/+537 |
|\ \ | |||||
| * | | French translation considered done, yet not fully tested. | Olivier Migeot | 2011-03-28 | 9 | -255/+449 |
| | | | |||||
| * | | Some more templates for french translation | Olivier Migeot | 2011-03-28 | 4 | -42/+42 |
| | | | |||||
| * | | More french templates (except emails, everything should be ok now) | Olivier Migeot | 2011-03-28 | 9 | -27/+27 |
| | | | |||||
| * | | Some more templates translated to french. | Olivier Migeot | 2011-03-28 | 3 | -21/+21 |
| | | | |||||
| * | | Merge remote branch 'mike/master' | Olivier Migeot | 2011-03-28 | 64 | -825/+1248 |
| |\| | |||||
| * | | Defined plurals (as explained by Fabio) | Olivier Migeot | 2011-03-22 | 2 | -2/+2 |
| | | | |||||
* | | | revup | Friendika | 2011-03-28 | 1 | -1/+1 |
| |/ |/| | |||||
* | | author collapse: close off before pagination | Friendika | 2011-03-28 | 2 | -0/+9 |
| | | |||||
* | | tweaks to author collapsing | Friendika | 2011-03-27 | 1 | -3/+2 |
| | | |||||
* | | collapse posts by same author (but not you). | Friendika | 2011-03-27 | 2 | -2/+21 |
| | | |||||
* | | wrong date order profile page | Friendika | 2011-03-27 | 1 | -1/+1 |
| | | |||||
* | | comment collapsing, pagination wasn't advancing past 16 | Friendika | 2011-03-27 | 3 | -20/+121 |
| | | |||||
* | | info page | Friendika | 2011-03-27 | 2 | -1/+48 |
| | | |||||
* | | Merge branch 'tobiasd-master' | Friendika | 2011-03-25 | 2 | -2/+2 |
|\ \ | |||||
| * | | fixed wrong colors for links | Tobias Diekershoff | 2011-03-25 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-03-25 | 61 | -806/+1070 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-03-22 | 1 | -2/+2 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-03-22 | 54 | -2348/+3691 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-03-19 | 6 | -153/+282 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-03-18 | 87 | -1356/+7987 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-03-17 | 21 | -12/+184 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge github.com:tobiasd/friendika | Tobias Diekershoff | 2011-03-16 | 1 | -4/+0 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | resolved some local git quirks | Tobias Diekershoff | 2011-03-13 | 1 | -4/+0 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-03-16 | 28 | -65/+380 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-03-13 | 41 | -128/+1675 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: addon/twitter/twitter.php | ||||
| * | | | | | | | | | | fixed wrong library path | Tobias Diekershoff | 2011-03-08 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | revup | Friendika | 2011-03-25 | 1 | -1/+1 |
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
* | | | | | | | | | | change link to project website | Friendika | 2011-03-24 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | repair duplicate nickname accounts caused by race condition | Friendika | 2011-03-24 | 2 | -1/+19 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'erikl-master' | Friendika | 2011-03-24 | 40 | -497/+502 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/erikl/friendika into erikl-master | Friendika | 2011-03-24 | 44 | -503/+507 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Edited view/sv/strings.php via GitHub | erik | 2011-03-22 | 1 | -56/+119 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Edited view/sv/wall_received_eml.tpl via GitHub | erik | 2011-03-22 | 1 | -7/+5 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Edited view/sv/settings_nick_unset.tpl via GitHub | erik | 2011-03-22 | 1 | -6/+4 |
| | | | | | | | | | | | |