Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge red into hubzilla | Mario Vavti | 2017-07-03 | 18 | -108/+1018 |
|\ | |||||
| * | diaspora hcard wasn't being rendered | zotlabs | 2017-06-28 | 1 | -2/+2 |
| | | |||||
| * | missing space in nav tpl | zotlabs | 2017-06-28 | 2 | -2/+2 |
| | | |||||
| * | provide a gender icon on the profile sidebar within reason | zotlabs | 2017-06-27 | 1 | -1/+1 |
| | | |||||
| * | provide more comprehensible information on the admin summary page | zotlabs | 2017-06-26 | 1 | -2/+2 |
| | | |||||
| * | minor usability enhancements with the connections list - label the edit icon ↵ | zotlabs | 2017-06-25 | 1 | -2/+2 |
| | | | | | | | | so it's more obvious; the intuitive action is to click the photo or name which isn't what we usually want. Also move the Delete button over just a bit more so it's harder to accidentally click on small screens with big thumbs. | ||||
| * | allow moderated comments like wordpress if permissions are compatible | zotlabs | 2017-06-18 | 2 | -3/+15 |
| | | |||||
| * | brainstorming a comment moderation system | zotlabs | 2017-06-17 | 1 | -0/+7 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-06-14 | 2 | -0/+24 |
| |\ | |||||
| * \ | 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 |
| | | | | | | | | | | | | | | | | list page | ||||
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-06-07 | 3 | -18/+19 |
| |\ \ \ | |||||
| * | | | | move disapora xrd stuff to plugin | zotlabs | 2017-05-30 | 2 | -7/+1 |
| | | | | | |||||
| * | | | | 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 | 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; ↵ | 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 | 3 | -3/+3 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-05 | 2 | -6/+30 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e332d1074f1b663ec66d37b0f575df2e41d5535c. | ||||
| * | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | 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 | 3 | -7/+7 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | 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-29 | 2 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-28 | 4 | -30/+30 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-27 | 4 | -36/+26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-26 | 3 | -5/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-25 | 106 | -1165/+1171 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | |