aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * add array support to set_config and get_configfabrixxm2011-06-191-5/+10
| |/
* / revupFriendika2011-06-191-1/+1
|/
* Merge branch 'pull'Friendika2011-06-198-22/+146
|\
| * Merge pull request #120 from fabrixxm/dispyFriendika2011-06-198-22/+146
| |\
| | * dispy code tag stylefabrixxm2011-06-191-0/+10
| | * Update dispy. Add admin link and styles, add help link, other fixesfabrixxm2011-06-196-20/+127
| | * update admin style in loozahfabrixxm2011-06-191-1/+8
| | * fix banner in duepuntozerofabrixxm2011-06-191-1/+1
| |/
* | Merge branch 'pull'Friendika2011-06-181-6/+6
|\|
| * Merge pull request #119 from bufalo1973/patch-1Friendika2011-06-181-6/+6
| |\
| | * Added backslash to $name so it doesn't throws an error. bufalo19732011-06-181-6/+6
| |/
* / revupFriendika2011-06-181-1/+1
|/
* Merge pull request #118 from fabrixxm/adminFriendika2011-06-187-30/+82
|\
| * admin: fix last item date in users list, fix plugins details templatefabrixxm2011-06-182-5/+6
| * Admin: add translatable strings, remove 'rino' settings, invert 'no'-setings...fabrixxm2011-06-187-26/+77
* | tooltip for selecting itemsFriendika2011-06-173-4/+4
* | improved UI for checked items to be deletedFriendika2011-06-174-7/+20
|/
* add pagination to admin/user page to support large numbers of usersFriendika2011-06-172-5/+17
* remove debug statementsFriendika2011-06-161-2/+2
* fix admin log viewer (will only read the last 5M of the log, and puts the tex...Friendika2011-06-162-1/+23
* imported event should not have wall flag setFriendika2011-06-161-1/+1
* Merge branch 'pull'Friendika2011-06-1645-2752/+4264
|\
| * Merge pull request #117 from tobiasd/masterFriendika2011-06-163-2594/+2790
| |\
| | * put the green back in the panel backgroundTobias Diekershoff2011-06-161-6/+6
| | * Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-06-1612-130/+228
| | |\
| | * \ Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-06-162-0/+3
| | |\ \
| | * \ \ Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-06-159-49/+215
| | |\ \ \
| | * \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-06-1445-134/+363
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-06-113-2/+21
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-06-104-13/+37
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-06-106-13/+217
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-06-0913-56/+149
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-06-082-3/+16
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-06-0817-588/+838
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-06-0724-57/+426
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-06-052-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-06-0310-34/+183
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-06-0311-20/+90
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Update to the German language filesTobias Diekershoff2011-06-012-2592/+2657
| | * | | | | | | | | | | | | | | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-06-011-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-06-0111-9/+4640
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-05-318-11/+46
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-05-307-20/+4636
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-05-2819-45/+203
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-05-2612-1693/+1793
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | typoTobias Diekershoff2011-05-252-3/+4
| | * | | | | | | | | | | | | | | | | | | | | German translationsTobias Diekershoff2011-05-251-10/+32
| | * | | | | | | | | | | | | | | | | | | | | new german stringsTobias Diekershoff2011-05-251-261/+369
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #116 from fabrixxm/adminFriendika2011-06-1642-158/+1474
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | admin styles to loozah. missing user admin templateFabio Comuni2011-06-164-2/+101