Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | * | | | | | | | | | | | | | | | | | | | | | Admin: register policy in site page, initial users page. Aside 'Users' link s... | Fabio Comuni | 2011-06-16 | 4 | -27/+95 |
| | * | | | | | | | | | | | | | | | | | | | | | ping updates trigger 'nav-update' custom event from <nav> | Fabio Comuni | 2011-06-16 | 1 | -18/+26 |
| | * | | | | | | | | | | | | | | | | | | | | | {{ if }} {{ else }} support in templates | Fabio Comuni | 2011-06-16 | 1 | -7/+32 |
| | * | | | | | | | | | | | | | | | | | | | | | Update info comments in all plugins | Fabio Comuni | 2011-06-14 | 19 | -30/+151 |
| | * | | | | | | | | | | | | | | | | | | | | | Load plugin info from plugin file. Show README.md or README from plugin dir i... | Fabio Comuni | 2011-06-14 | 5 | -16/+88 |
| | * | | | | | | | | | | | | | | | | | | | | | update styles | Fabio Comuni | 2011-06-14 | 2 | -1/+72 |
| | * | | | | | | | | | | | | | | | | | | | | | simple plugin details and log view in admin | Fabio Comuni | 2011-06-14 | 3 | -2/+80 |
| | * | | | | | | | | | | | | | | | | | | | | | enable/disable plugins from admin page | Fabio Comuni | 2011-06-14 | 3 | -22/+85 |
| | * | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'friendika-master/master' into admin | Fabio Comuni | 2011-06-14 | 45 | -136/+366 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | Initial plugins admin page | Fabio Comuni | 2011-06-14 | 3 | -3/+80 |
| | * | | | | | | | | | | | | | | | | | | | | | fix a typo in site settings page | fabrixxm | 2011-06-13 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | | | | | | Admin site page | Fabio Comuni | 2011-06-13 | 10 | -29/+344 |
| | * | | | | | | | | | | | | | | | | | | | | | Add {{ if a==b }} and {{ if a!=b }} to templates | Fabio Comuni | 2011-06-13 | 1 | -1/+16 |
| | * | | | | | | | | | | | | | | | | | | | | | fix template's {{ for }} variable lookup | Fabio Comuni | 2011-06-13 | 1 | -1/+2 |
| | * | | | | | | | | | | | | | | | | | | | | | Fix it strings | Fabio Comuni | 2011-06-13 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | | | | | | Add admin page in nav | Fabio Comuni | 2011-06-13 | 2 | -2/+9 |
| | * | | | | | | | | | | | | | | | | | | | | | Initial admin page | Fabio Comuni | 2011-06-13 | 3 | -0/+158 |
| | * | | | | | | | | | | | | | | | | | | | | | load $a->config from db | Fabio Comuni | 2011-06-13 | 1 | -1/+14 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | |||||
* | / | | | | | | | | | | | | | | | | | | | | revup | Friendika | 2011-06-16 | 2 | -3/+5 |
|/ / / / / / / / / / / / / / / / / / / / / |