aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * | | | | | | | | | | | | | | | | | | | | Admin users page. some fix to template processor.Fabio Comuni2011-06-165-87/+211
| | * | | | | | | | | | | | | | | | | | | | | fix a small php notice.Fabio Comuni2011-06-161-1/+1
| | * | | | | | | | | | | | | | | | | | | | | Admin: register policy in site page, initial users page. Aside 'Users' link s...Fabio Comuni2011-06-164-27/+95
| | * | | | | | | | | | | | | | | | | | | | | ping updates trigger 'nav-update' custom event from <nav>Fabio Comuni2011-06-161-18/+26
| | * | | | | | | | | | | | | | | | | | | | | {{ if }} {{ else }} support in templatesFabio Comuni2011-06-161-7/+32
| | * | | | | | | | | | | | | | | | | | | | | Update info comments in all pluginsFabio Comuni2011-06-1419-30/+151
| | * | | | | | | | | | | | | | | | | | | | | Load plugin info from plugin file. Show README.md or README from plugin dir i...Fabio Comuni2011-06-145-16/+88
| | * | | | | | | | | | | | | | | | | | | | | update stylesFabio Comuni2011-06-142-1/+72
| | * | | | | | | | | | | | | | | | | | | | | simple plugin details and log view in adminFabio Comuni2011-06-143-2/+80
| | * | | | | | | | | | | | | | | | | | | | | enable/disable plugins from admin pageFabio Comuni2011-06-143-22/+85
| | * | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'friendika-master/master' into adminFabio Comuni2011-06-1445-136/+366
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Initial plugins admin pageFabio Comuni2011-06-143-3/+80
| | * | | | | | | | | | | | | | | | | | | | | fix a typo in site settings pagefabrixxm2011-06-131-1/+1
| | * | | | | | | | | | | | | | | | | | | | | Admin site pageFabio Comuni2011-06-1310-29/+344
| | * | | | | | | | | | | | | | | | | | | | | Add {{ if a==b }} and {{ if a!=b }} to templatesFabio Comuni2011-06-131-1/+16
| | * | | | | | | | | | | | | | | | | | | | | fix template's {{ for }} variable lookupFabio Comuni2011-06-131-1/+2
| | * | | | | | | | | | | | | | | | | | | | | Fix it stringsFabio Comuni2011-06-131-1/+1
| | * | | | | | | | | | | | | | | | | | | | | Add admin page in navFabio Comuni2011-06-132-2/+9
| | * | | | | | | | | | | | | | | | | | | | | Initial admin pageFabio Comuni2011-06-133-0/+158
| | * | | | | | | | | | | | | | | | | | | | | load $a->config from dbFabio Comuni2011-06-131-1/+14
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | |
* | / | | | | | | | | | | | | | | | | | | | revupFriendika2011-06-162-3/+5
|/ / / / / / / / / / / / / / / / / / / / /