Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | server role management, part 1 | redmatrix | 2016-08-22 | 2 | -2/+2 |
| | |||||
* | Merge branch 'dev' of https://github.com/git-marijus/hubzilla into ↵ | redmatrix | 2016-08-21 | 4 | -5/+10 |
|\ | | | | | | | git-marijus-dev | ||||
| * | move jotnets to jot and some cleanup (mostly whitespace) | Mario Vavti | 2016-08-21 | 4 | -5/+9 |
| | | |||||
* | | issue #496 | redmatrix | 2016-08-21 | 2 | -1/+3 |
|/ | |||||
* | remove insecure repository warning. | redmatrix | 2016-08-18 | 1 | -1/+1 |
| | |||||
* | don't set session theme unless logged in. | redmatrix | 2016-08-16 | 1 | -0/+7 |
| | |||||
* | move schema settings into the display settings main so we can set ↵ | redmatrix | 2016-08-15 | 2 | -17/+59 |
| | | | | theme:schema theme selectors in settings | ||||
* | fix attached photo/file permissions on clones | redmatrix | 2016-08-15 | 1 | -134/+2 |
| | |||||
* | Added a disable comments setting to the "Additional features" settings with ↵ | Andrew Manning | 2016-08-14 | 1 | -0/+2 |
| | | | | a corresponding post editor toggle button | ||||
* | string update | redmatrix | 2016-08-12 | 1 | -1/+1 |
| | |||||
* | fix auto-connect setting | zottel | 2016-08-12 | 1 | -3/+0 |
| | |||||
* | more cleanup of api | redmatrix | 2016-08-11 | 1 | -1/+1 |
| | |||||
* | A bit of api cleanup. Don't get excited. This is like a 0.005% cleanup but ↵ | redmatrix | 2016-08-11 | 2 | -32/+47 |
| | | | | you have to start somewhere. | ||||
* | optimise Onepoll so it doesn't try and fetch posts for a channel that we've ↵ | redmatrix | 2016-08-10 | 1 | -0/+9 |
| | | | | not given permission to send us their stream and posts. Currently the posts are fetched, processed, and ultimately discarded. Since we know they are going to be discarded, there's not much point fetching them in the first place. | ||||
* | implement acl for folder creation | Mario Vavti | 2016-08-10 | 2 | -10/+18 |
| | |||||
* | use config system.server_role and deprecate 'UNO' | redmatrix | 2016-08-07 | 4 | -19/+23 |
| | |||||
* | fix cloud path | redmatrix | 2016-08-07 | 1 | -1/+1 |
| | |||||
* | bring back acl for cloud file uploads | Mario Vavti | 2016-08-06 | 1 | -1/+2 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-08-05 | 15 | -18/+83 |
|\ | |||||
| * | multi acl: port /settings | Mario Vavti | 2016-08-05 | 1 | -1/+5 |
| | | |||||
| * | multi acl: port /display | Mario Vavti | 2016-08-05 | 1 | -0/+1 |
| | | |||||
| * | multi acl: port /thing | Mario Vavti | 2016-08-05 | 1 | -0/+8 |
| | | |||||
| * | multi acl: port /rpost | Mario Vavti | 2016-08-05 | 2 | -5/+5 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-08-05 | 1 | -2/+3 |
| |\ | |||||
| | * | Parse bbcode when page loads | Andrew Manning | 2016-08-04 | 1 | -2/+2 |
| | | | |||||
| | * | Convert select bbcode tags including [observer], [baseurl], [sitename] | Andrew Manning | 2016-08-03 | 1 | -0/+1 |
| | | | |||||
| * | | multi acl: port /wiki | Mario Vavti | 2016-08-04 | 1 | -4/+13 |
| | | | |||||
| * | | multi acl: port /webpages and /mitem | Mario Vavti | 2016-08-04 | 3 | -1/+11 |
| | | | |||||
| * | | multi acl: port /chat | Mario Vavti | 2016-08-04 | 1 | -0/+4 |
| | | | |||||
| * | | multi acl: port /cloud and /filestorage | Mario Vavti | 2016-08-04 | 2 | -6/+9 |
| | | | |||||
| * | | multi acl: port photos | Mario Vavti | 2016-08-04 | 1 | -1/+9 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-08-04 | 1 | -1/+1 |
| |\| | |||||
| * | | multi acl: port events | Mario Vavti | 2016-08-03 | 1 | -1/+11 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-08-03 | 8 | -17/+269 |
| |\ \ | |||||
| * | | | multiple acl work | Mario Vavti | 2016-08-03 | 3 | -2/+9 |
| | | | | |||||
* | | | | minor cleanup on ratings - no real functional changes at this time | redmatrix | 2016-08-04 | 2 | -12/+20 |
| |_|/ |/| | | |||||
* | | | issue #473 - unable to delete privacy groups | redmatrix | 2016-08-03 | 1 | -1/+1 |
| |/ |/| | |||||
* | | missing comma in atoken update sql | redmatrix | 2016-08-02 | 1 | -1/+1 |
| | | |||||
* | | this should sort out likes showing up as wall-to-wall posts on diaspora | redmatrix | 2016-08-01 | 1 | -0/+2 |
| | | |||||
* | | This checkin should make all permission modes work correctly with atokens ↵ | redmatrix | 2016-08-01 | 2 | -7/+15 |
| | | | | | | | | (they should be able to post content if allowed to). It also removes the strict linkage between permissions and connections so any individual permission can be set for any xchan; even those for which you have no connections. | ||||
* | | /storeurl/cloudurl/ | redmatrix | 2016-08-01 | 1 | -1/+1 |
| | | |||||
* | | allow individual permissions on atokens | redmatrix | 2016-07-31 | 1 | -5/+59 |
| | | |||||
* | | add a few more path macros to portable menu elements (channelurl, pageurl, ↵ | redmatrix | 2016-07-31 | 2 | -3/+7 |
| | | | | | | | | storeurl and baseurl) | ||||
* | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-31 | 1 | -1/+1 |
|\ \ | |||||
| * | | issue #466, sql typo | redmatrix | 2016-07-28 | 1 | -1/+1 |
| |/ | |||||
* | | Improved UI. Removed logger statements. | Andrew Manning | 2016-07-31 | 1 | -9/+17 |
| | | |||||
* | | Import element selection page added to allow selective importing. | Andrew Manning | 2016-07-30 | 1 | -22/+91 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-30 | 12 | -554/+103 |
|\| | |||||
| * | github didn't accept the last push. Touching the files to force a git revision | redmatrix | 2016-07-27 | 1 | -1/+0 |
| | | |||||
| * | fix italian strings (messed up by rtl variable); and finish removing openid ↵ | redmatrix | 2016-07-27 | 1 | -12/+0 |
| | | | | | | | | from core |