Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-06-14 | 2 | -0/+24 |
|\ | |||||
| * | Added Portfolio widget | Haakon Meland Eriksen | 2017-06-13 | 2 | -0/+24 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-06-11 | 2 | -102/+106 |
|\| | |||||
| * | css fixes | Mario Vavti | 2017-06-10 | 2 | -102/+106 |
| | | |||||
| * | give the item_obscured flag a new lease on life by using it to designate ↵ | zotlabs | 2017-06-10 | 1 | -0/+3 |
| | | | | | | | | third party client-side e2ee or binary content which can only be downloaded and not viewed directly on the web (as a side effect this also allows binary files to be submitted as activities/content). The content display is suppressed and replaced with a download button. This is unfinished but harmless to backport while work is in progress unless told otherwise. Future development will take care of the remaining loose ends. | ||||
* | | clean up the warnings about connections on unclonable networks | zotlabs | 2017-06-09 | 1 | -2/+3 |
| | | |||||
* | | put unreachable federated connections in the archived tab of the connections ↵ | zotlabs | 2017-06-08 | 1 | -0/+5 |
| | | | | | | | | list page | ||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-06-07 | 8 | -38/+50 |
|\| | |||||
| * | update bs-dev | Mario Vavti | 2017-06-07 | 2 | -0/+7 |
| | | |||||
| * | remove text_highlight css load from core | zotlabs | 2017-06-07 | 1 | -1/+0 |
| | | |||||
| * | fix nav-tabs for dark scheme | git-marijus | 2017-06-04 | 1 | -14/+8 |
| | | |||||
| * | fix allow setting a default schema for the hub (issue #797) and allow ↵ | git-marijus | 2017-06-04 | 2 | -6/+16 |
| | | | | | | | | selecting of focus (hubzilla default) schema if a default is set. | ||||
| * | class mixup | git-marijus | 2017-06-04 | 1 | -1/+1 |
| | | |||||
| * | rewrite wiki pages widget - no need for ajax on pageload, show the pages to ↵ | git-marijus | 2017-06-03 | 2 | -17/+18 |
| | | | | | | | | not authenticated people. | ||||
| * | hubzilla issue #795 | zotlabs | 2017-05-27 | 1 | -1/+1 |
| | | |||||
| * | apporder style improvement and add to nav menu, also add language awareness ↵ | zotlabs | 2017-05-23 | 2 | -2/+4 |
| | | | | | | | | to webpages | ||||
| * | some issues with the app order template logic | zotlabs | 2017-05-23 | 1 | -5/+6 |
| | | |||||
| * | apporder module and all the associated backend stuff to make it work; ↵ | zotlabs | 2017-05-23 | 2 | -1/+13 |
| | | | | | | | | probably needs a bit of UI cleanup and a link to it from somewhere | ||||
* | | active nav-link was white on white | zotlabs | 2017-05-31 | 1 | -0/+4 |
| | | |||||
* | | remove text_highlight css load from core | zotlabs | 2017-05-30 | 1 | -1/+0 |
| | | |||||
* | | move disapora xrd stuff to plugin | zotlabs | 2017-05-30 | 2 | -7/+1 |
| | | |||||
* | | remove server role from language configs | zotlabs | 2017-05-29 | 10 | -78/+0 |
| | | |||||
* | | more deprecate server_role | zotlabs | 2017-05-29 | 2 | -6/+1 |
| | | |||||
* | | start deprecation of server_role | zotlabs | 2017-05-29 | 2 | -9/+3 |
| | | |||||
* | | hubzilla issue #795 | zotlabs | 2017-05-26 | 1 | -1/+1 |
| | | |||||
* | | apporder style improvement and add to nav menu, also add language awareness ↵ | zotlabs | 2017-05-22 | 2 | -2/+4 |
| | | | | | | | | to webpages | ||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-22 | 3 | -12/+18 |
|\| | |||||
| * | some styling for system notifications | Mario Vavti | 2017-05-18 | 2 | -12/+12 |
| | | |||||
| * | css first aid for mod setup | Mario Vavti | 2017-05-17 | 1 | -0/+6 |
| | | |||||
* | | 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; ↵ | zotlabs | 2017-05-21 | 2 | -1/+13 |
| | | | | | | | | probably needs a bit of UI cleanup and a link to it from somewhere | ||||
* | | 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 ↵ | zotlabs | 2017-05-11 | 1 | -6/+1 |
| | | | | | | | | couple more fields hoping eventually Mastodon will accept legal follow activities without choking on them. Requires an update of plugins also. | ||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-10 | 5 | -11074/+10557 |
|\| | |||||
| * | missing clearfix | Mario Vavti | 2017-05-10 | 3 | -3/+3 |
| | | |||||
| * | Update DE translation strings | phellmes | 2017-05-09 | 2 | -11071/+10554 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-09 | 3 | -545/+565 |
|\| | |||||
| * | make all label bold | Mario Vavti | 2017-05-09 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #762 from mjfriaza/dev | git-marijus | 2017-05-09 | 2 | -544/+564 |
| |\ | | | | | | | Updated the Spanish translation | ||||
| | * | Updated the Spanish translation | Manuel Jiménez Friaza | 2017-05-08 | 2 | -544/+564 |
| | | | |||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-05 | 5 | -7/+54 |
|\| | | |||||
| * | | collapse sysapps if viewing a remote channel | Mario Vavti | 2017-05-05 | 2 | -6/+31 |
| | | | |||||
| * | | css hack to make remote channel menu header look in line with the rest if in ↵ | Mario Vavti | 2017-05-05 | 1 | -0/+6 |
| | | | | | | | | | | | | collapsed state | ||||
| * | | css fix | Mario Vavti | 2017-05-05 | 1 | -1/+1 |
| | | | |||||
| * | | German translations for demohub | Andrew Manning | 2017-05-03 | 1 | -0/+16 |
| | | | |||||
* | | | more cleanup | zotlabs | 2017-05-02 | 1 | -0/+3 |
| | | | |||||
* | | | 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/+0 |
| | | | | | | | | | | | | This reverts commit e332d1074f1b663ec66d37b0f575df2e41d5535c. | ||||
* | | | move theme specific files to theme dir | zotlabs | 2017-05-01 | 277 | -0/+0 |
| | | | |||||
* | | | add cdav files | zotlabs | 2017-05-01 | 4 | -0/+998 |
| | | |