Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-06-11 | 2 | -102/+106 | |
| |\ \ \ \ | ||||||
| * | | | | | 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 | |
| * | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-06-07 | 8 | -38/+50 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | 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 t... | zotlabs | 2017-05-22 | 2 | -2/+4 | |
| * | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-22 | 3 | -12/+18 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | 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 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-10 | 5 | -11074/+10557 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-09 | 3 | -545/+565 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-05 | 5 | -7/+54 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | 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 | |
| * | | | | | | | | | | | move theme specific files to theme dir | zotlabs | 2017-05-01 | 277 | -0/+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 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-17 | 7 | -11230/+10653 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-07 | 3 | -11094/+10565 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | fix from downstream | zotlabs | 2017-04-07 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | revert grid and bars icon size change | zotlabs | 2017-04-05 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-04-05 | 4 | -10/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-31 | 13 | -59/+57 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'importcsrf' of https://github.com/dawnbreak/hubzilla into csrf | zotlabs | 2017-03-30 | 2 | -7/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-30 | 3 | -48/+22 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-29 | 4 | -7/+15 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | scaling issue with fa-th and fa-bars icons when using boostrap-red.css:37 #na... | zotlabs | 2017-03-28 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-28 | 11 | -41/+61 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-27 | 9 | -78/+40 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-26 | 8 | -204/+33 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-25 | 130 | -2100/+1529 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | allow setting the system email name/address/reply | zotlabs | 2017-03-22 | 1 | -0/+5 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | begin the process of using the relevant attach directory/path for photo album... | zotlabs | 2017-03-21 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | more markdown purification | zotlabs | 2017-03-21 | 1 | -2/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | even more fine tuning of the markdown purifier - especially when used with th... | zotlabs | 2017-03-20 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | create channel_store_lowlevel() and remove more diaspora stuff from core. | zotlabs | 2017-03-20 | 2 | -7/+0 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | various input filter fixes | zotlabs | 2017-03-18 | 1 | -1/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | use dim for the button border also | zotlabs | 2017-03-14 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | dim class was un-themed | zotlabs | 2017-03-14 | 2 | -2/+2 |