| Commit message (Expand) | Author | Age | Files | Lines |
* | apporder style improvement and add to nav menu, also add language awareness t... | zotlabs | 2017-05-22 | 2 | -2/+4 |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-22 | 2 | -12/+12 |
|\ |
|
| * | some styling for system notifications | Mario Vavti | 2017-05-18 | 2 | -12/+12 |
* | | some issues with the app order template logic | zotlabs | 2017-05-21 | 1 | -5/+6 |
* | | apporder module and all the associated backend stuff to make it work; probabl... | zotlabs | 2017-05-21 | 2 | -1/+13 |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-16 | 1 | -6/+1 |
|\| |
|
| * | consolidate and simplify the generation of activitystreams persons, add a cou... | zotlabs | 2017-05-11 | 1 | -6/+1 |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-10 | 3 | -3/+3 |
|\| |
|
| * | missing clearfix | Mario Vavti | 2017-05-10 | 3 | -3/+3 |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-05 | 2 | -6/+30 |
|\| |
|
| * | collapse sysapps if viewing a remote channel | Mario Vavti | 2017-05-05 | 1 | -5/+29 |
| * | css fix | Mario Vavti | 2017-05-05 | 1 | -1/+1 |
* | | profile_sidebar hook ignored the updated html content | zotlabs | 2017-05-02 | 1 | -69/+0 |
* | | Revert "move theme specific files to theme dir" | zotlabs | 2017-05-02 | 277 | -0/+12312 |
* | | move theme specific files to theme dir | zotlabs | 2017-05-01 | 277 | -12312/+0 |
* | | add cdav files | zotlabs | 2017-05-01 | 4 | -0/+998 |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-26 | 1 | -0/+1 |
|\| |
|
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-04-26 | 1 | -0/+1 |
| |\ |
|
| | * | When template "none" is used in a webpage layout, then the contents of the pa... | Andrew Manning | 2017-04-23 | 1 | -0/+1 |
| * | | provide a broken feed for services which require a broken feed | zotlabs | 2017-04-26 | 1 | -5/+2 |
| |/ |
|
* | | provide a broken feed for services which require a broken feed | zotlabs | 2017-04-25 | 1 | -5/+2 |
* | | give the item_obscured flag a new lease on life by using it to designate thir... | zotlabs | 2017-04-18 | 1 | -0/+3 |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-18 | 7 | -7/+7 |
|\| |
|
| * | more lock carets | Mario Vavti | 2017-04-18 | 4 | -4/+4 |
| * | the caret beside the lock seems a little overkill | Mario Vavti | 2017-04-18 | 3 | -3/+3 |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-17 | 3 | -7/+7 |
|\| |
|
| * | missing clearfix | Mario Vavti | 2017-04-16 | 1 | -1/+1 |
| * | :arrow_up: Update SimplePie library. | Klaus Weidenbach | 2017-04-15 | 1 | -5/+5 |
| * | missing includes | Mario Vavti | 2017-04-13 | 1 | -1/+1 |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-07 | 1 | -14/+6 |
|\| |
|
| * | the string was there but the template var was wrong | Mario Vavti | 2017-04-07 | 1 | -1/+1 |
| * | css fixes and missing string | Mario Vavti | 2017-04-07 | 1 | -14/+6 |
* | | fix from downstream | zotlabs | 2017-04-07 | 1 | -1/+1 |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-31 | 10 | -35/+29 |
|\| |
|
| * | various form css fixes | Mario Vavti | 2017-03-31 | 8 | -29/+26 |
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-03-31 | 2 | -7/+2 |
| |\ |
|
| | * | Merge pull request #710 from dawnbreak/importcsrf | git-marijus | 2017-03-31 | 2 | -7/+2 |
| | |\ |
|
| * | | | css fixes | Mario Vavti | 2017-03-31 | 1 | -6/+2 |
| |/ / |
|
| * | | add max height to #navbar-collapse-2 | Mario Vavti | 2017-03-31 | 1 | -0/+1 |
* | | | Merge branch 'importcsrf' of https://github.com/dawnbreak/hubzilla into csrf | zotlabs | 2017-03-30 | 2 | -7/+2 |
|\ \ \
| | |/
| |/| |
|
| * | | :lock: Add CSRF protection for import and import_items. | Klaus Weidenbach | 2017-03-30 | 2 | -7/+2 |
| |/ |
|
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-29 | 2 | -4/+4 |
|\| |
|
| * | allow setting the system email name/address/reply | zotlabs | 2017-03-29 | 1 | -0/+5 |
| * | begin the process of using the relevant attach directory/path for photo album... | zotlabs | 2017-03-29 | 1 | -3/+3 |
| * | more markdown purification | zotlabs | 2017-03-29 | 1 | -2/+1 |
| * | even more fine tuning of the markdown purifier - especially when used with th... | zotlabs | 2017-03-29 | 1 | -1/+1 |
| * | various input filter fixes | zotlabs | 2017-03-29 | 1 | -1/+2 |
| * | dim class was un-themed | zotlabs | 2017-03-29 | 1 | -3/+3 |
| * | remove the unimplemented upload limit site settings | zotlabs | 2017-03-29 | 1 | -3/+0 |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-28 | 4 | -30/+30 |
|\| |
|