Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'pull' | Friendika | 2011-06-19 | 8 | -22/+146 |
|\ | |||||
| * | Merge pull request #120 from fabrixxm/dispy | Friendika | 2011-06-19 | 8 | -22/+146 |
| |\ | |||||
| | * | dispy code tag style | fabrixxm | 2011-06-19 | 1 | -0/+10 |
| | * | Update dispy. Add admin link and styles, add help link, other fixes | fabrixxm | 2011-06-19 | 6 | -20/+127 |
| | * | update admin style in loozah | fabrixxm | 2011-06-19 | 1 | -1/+8 |
| | * | fix banner in duepuntozero | fabrixxm | 2011-06-19 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'pull' | Friendika | 2011-06-18 | 1 | -6/+6 |
|\| | |||||
| * | Merge pull request #119 from bufalo1973/patch-1 | Friendika | 2011-06-18 | 1 | -6/+6 |
| |\ | |||||
| | * | Added backslash to $name so it doesn't throws an error. | bufalo1973 | 2011-06-18 | 1 | -6/+6 |
| |/ | |||||
* / | revup | Friendika | 2011-06-18 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #118 from fabrixxm/admin | Friendika | 2011-06-18 | 7 | -30/+82 |
|\ | |||||
| * | admin: fix last item date in users list, fix plugins details template | fabrixxm | 2011-06-18 | 2 | -5/+6 |
| * | Admin: add translatable strings, remove 'rino' settings, invert 'no'-setings... | fabrixxm | 2011-06-18 | 7 | -26/+77 |
* | | tooltip for selecting items | Friendika | 2011-06-17 | 3 | -4/+4 |
* | | improved UI for checked items to be deleted | Friendika | 2011-06-17 | 4 | -7/+20 |
|/ | |||||
* | add pagination to admin/user page to support large numbers of users | Friendika | 2011-06-17 | 2 | -5/+17 |
* | remove debug statements | Friendika | 2011-06-16 | 1 | -2/+2 |
* | fix admin log viewer (will only read the last 5M of the log, and puts the tex... | Friendika | 2011-06-16 | 2 | -1/+23 |
* | imported event should not have wall flag set | Friendika | 2011-06-16 | 1 | -1/+1 |
* | Merge branch 'pull' | Friendika | 2011-06-16 | 45 | -2752/+4264 |
|\ | |||||
| * | Merge pull request #117 from tobiasd/master | Friendika | 2011-06-16 | 3 | -2594/+2790 |
| |\ | |||||
| | * | put the green back in the panel background | Tobias Diekershoff | 2011-06-16 | 1 | -6/+6 |
| | * | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-06-16 | 12 | -130/+228 |
| | |\ | |||||
| | * \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-06-16 | 2 | -0/+3 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-06-15 | 9 | -49/+215 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-06-14 | 45 | -134/+363 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-06-11 | 3 | -2/+21 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-06-10 | 4 | -13/+37 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-06-10 | 6 | -13/+217 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-06-09 | 13 | -56/+149 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-06-08 | 2 | -3/+16 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-06-08 | 17 | -588/+838 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-06-07 | 24 | -57/+426 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-06-05 | 2 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-06-03 | 10 | -34/+183 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-06-03 | 11 | -20/+90 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | Update to the German language files | Tobias Diekershoff | 2011-06-01 | 2 | -2592/+2657 |
| | * | | | | | | | | | | | | | | | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-06-01 | 1 | -0/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-06-01 | 11 | -9/+4640 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-05-31 | 8 | -11/+46 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-05-30 | 7 | -20/+4636 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-05-28 | 19 | -45/+203 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-05-26 | 12 | -1693/+1793 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | typo | Tobias Diekershoff | 2011-05-25 | 2 | -3/+4 |
| | * | | | | | | | | | | | | | | | | | | | | | German translations | Tobias Diekershoff | 2011-05-25 | 1 | -10/+32 |
| | * | | | | | | | | | | | | | | | | | | | | | new german strings | Tobias Diekershoff | 2011-05-25 | 1 | -261/+369 |
| * | | | | | | | | | | | | | | | | | | | | | | Merge pull request #116 from fabrixxm/admin | Friendika | 2011-06-16 | 42 | -158/+1474 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | admin styles to loozah. missing user admin template | Fabio Comuni | 2011-06-16 | 4 | -2/+101 |
| | * | | | | | | | | | | | | | | | | | | | | | Admin users page. some fix to template processor. | Fabio Comuni | 2011-06-16 | 5 | -87/+211 |
| | * | | | | | | | | | | | | | | | | | | | | | fix a small php notice. | Fabio Comuni | 2011-06-16 | 1 | -1/+1 |