Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'pull' | Friendika | 2011-06-16 | 19 | -2595/+3242 |
|\ | |||||
| * | Merge pull request #117 from tobiasd/master | Friendika | 2011-06-16 | 3 | -2594/+2790 |
| |\ | | | | | | | german strings and green background for the greenzero theme | ||||
| | * | 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 | 5 | -0/+73 |
| | |\ | |||||
| | * \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-06-15 | 3 | -0/+56 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-06-14 | 3 | -1/+63 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-06-11 | 1 | -0/+7 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-06-10 | 2 | -0/+67 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-06-09 | 1 | -0/+19 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-06-08 | 5 | -512/+709 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-06-07 | 7 | -8/+58 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | 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 | 6 | -3/+4611 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-05-31 | 1 | -0/+3 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-05-30 | 2 | -0/+4575 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-05-28 | 2 | -0/+18 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-05-26 | 3 | -8/+20 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | 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 | 16 | -1/+452 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | Admin pages | ||||
| | * | | | | | | | | | | | | | | 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 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Admin: register policy in site page, initial users page. Aside 'Users' link ↵ | Fabio Comuni | 2011-06-16 | 3 | -12/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show pending registrations. | ||||
| | * | | | | | | | | | | | | | | Update info comments in all plugins | Fabio Comuni | 2011-06-14 | 2 | -3/+4 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Load plugin info from plugin file. Show README.md or README from plugin dir ↵ | Fabio Comuni | 2011-06-14 | 2 | -6/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in plugin details page | ||||
| | * | | | | | | | | | | | | | | update styles | Fabio Comuni | 2011-06-14 | 2 | -1/+72 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | simple plugin details and log view in admin | Fabio Comuni | 2011-06-14 | 2 | -0/+24 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Merge remote-tracking branch 'friendika-master/master' into admin | Fabio Comuni | 2011-06-14 | 3 | -3/+66 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Initial plugins admin page | Fabio Comuni | 2011-06-14 | 2 | -1/+31 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Admin site page | Fabio Comuni | 2011-06-13 | 9 | -26/+156 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Fix it strings | Fabio Comuni | 2011-06-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Add admin page in nav | Fabio Comuni | 2011-06-13 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Initial admin page | Fabio Comuni | 2011-06-13 | 2 | -0/+53 |
| | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | |||||
* | / | | | | | | | | | | | | | revup | Friendika | 2011-06-16 | 1 | -2/+4 |
|/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | avoid race condition on delete checked items | Friendika | 2011-06-16 | 1 | -3/+3 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | delete selected items | Friendika | 2011-06-15 | 5 | -0/+73 |
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | event theming | Friendika | 2011-06-14 | 2 | -1/+39 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | event calendar links, editing | Friendika | 2011-06-14 | 3 | -0/+18 |
| |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | link events + personal notes to profile tabs | Friendika | 2011-06-13 | 3 | -1/+63 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | / | reduce visibility of lang-select flag (duepuntozero) | Friendika | 2011-06-10 | 1 | -0/+7 |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
* | | | | | | | | | | event publish | Friendika | 2011-06-09 | 2 | -0/+67 |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
* | | | | | | | | | events | Friendika | 2011-06-09 | 1 | -0/+4 |
| | | | | | | | | | |||||
* | | | | | | | | | more calendar work, undo strict_privacy flag to use different approach | Friendika | 2011-06-08 | 1 | -0/+15 |
| |_|_|_|_|_|_|/ |/| | | | | | | | |||||
* | | | | | | | | more progress on events | Friendika | 2011-06-07 | 3 | -0/+93 |
| | | | | | | | | |||||
* | | | | | | | | update it strings | fabrixxm | 2011-06-07 | 2 | -512/+616 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | event listings | Friendika | 2011-06-06 | 1 | -0/+3 |
| | | | | | | | |||||
* | | | | | | | Add 'attach' and 'language' icons and enable file upload in dispy template | Fabio Comuni | 2011-06-06 | 4 | -5/+21 |
| | | | | | | | |||||
* | | | | | | | add flag for experimental themes | Friendika | 2011-06-05 | 1 | -0/+0 |
| | | | | | | | |||||
* | | | | | | | position language selector in dispy | Friendika | 2011-06-05 | 1 | -0/+15 |
| | | | | | | |