Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | 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 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 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | 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 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | 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 ↵ | zotlabs | 2017-04-18 | 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. | |||||
| * | | | | | | | | | | | | 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 ↵ | zotlabs | 2017-03-28 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #navbar-collapse-1 i { font-size 1.0rem; }; FF 52.0.1 on Win7; 0.9rem and 1.1rem both render much better. 1.1 is a bit large so going with 0.9 | |||||
| * | | | | | | | | | | | | | | | | | | | | 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 ↵ | zotlabs | 2017-03-21 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | albums instead of an album basename which may not be unique. Created an 'ellipsify()' function to shorten long names and keep the beginning and end intact | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | more markdown purification | zotlabs | 2017-03-21 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | even more fine tuning of the markdown purifier - especially when used with ↵ | zotlabs | 2017-03-20 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the wiki | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | make redbasic compatible with red 5.x | zotlabs | 2017-03-13 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | remove the unimplemented upload limit site settings | zotlabs | 2017-03-13 | 1 | -3/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dev' into red | zotlabs | 2017-03-13 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | db issues | zotlabs | 2017-03-12 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dev' into red | zotlabs | 2017-03-11 | 1 | -1/+25 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | one role. | zotlabs | 2017-03-09 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | bs-dev, minor css fix and min version | Mario Vavti | 2017-07-03 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | |