Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | add the hidden flag also | redmatrix | 2016-07-27 | 1 | -1/+2 |
| | | |||||
| * | rework drag and drop to drag directly into files area, implement the default ↵ | Mario Vavti | 2016-07-27 | 1 | -75/+0 |
| | | | | | | | | upload button to work with the same mechanism as drag and drop, revert 560af7a5b8e30001ea6bf9a6d2ea36e94ae904d0 since it did not work so well with the new cloud upload mechanism | ||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-07-26 | 1 | -0/+75 |
| |\ | |||||
| | * | Merge pull request #463 from git-marijus/dev | hubzilla | 2016-07-27 | 1 | -0/+75 |
| | |\ | | | | | | | | | allow multiple-file cloud upload | ||||
| | | * | allow multiple-file cloud upload | Mario Vavti | 2016-07-26 | 1 | -0/+75 |
| | | | | |||||
| * | | | don't include deleted or orphaned xchans in ratings search | redmatrix | 2016-07-26 | 1 | -1/+2 |
| |/ / | |||||
| * | | restrict url cache to 254 maxlen | redmatrix | 2016-07-26 | 1 | -0/+5 |
| | | | |||||
| * | | missing s | redmatrix | 2016-07-26 | 1 | -1/+1 |
| | | | |||||
| * | | set App::$error on 404 so we don't get two 'Page not found.' page bodies. | redmatrix | 2016-07-26 | 1 | -0/+1 |
| |/ | |||||
| * | URLUtil path has changed since sabredav 1.8 - fixes renaming issue in dav ↵ | Mario Vavti | 2016-07-26 | 1 | -1/+2 |
| | | | | | | | | clients | ||||
| * | move openid to addon | redmatrix | 2016-07-25 | 2 | -517/+0 |
| | | |||||
| * | make drag/drop work with acl, which bypassed the form | redmatrix | 2016-07-24 | 1 | -0/+2 |
| | | |||||
| * | trace log pconfig cache if for some reason it isn't an array | redmatrix | 2016-07-24 | 1 | -0/+8 |
| | | |||||
| * | add acl selection to files upload via /cloud (still missing from directory ↵ | redmatrix | 2016-07-24 | 2 | -1/+58 |
| | | | | | | | | creation) | ||||
| * | string update and some minor comment edits | redmatrix | 2016-07-24 | 1 | -2/+2 |
| | | |||||
| * | Multiple file upload by drag and drop with progress indicators and auto page ↵ | Andrew Manning | 2016-07-24 | 1 | -1/+2 |
| | | | | | | | | reload | ||||
| * | more work on #453 | redmatrix | 2016-07-21 | 1 | -16/+15 |
| | | |||||
| * | PConfig : Check for is_null($uid) as well as false. We actually allow $uid = ↵ | redmatrix | 2016-07-21 | 1 | -3/+6 |
| | | | | | | | | 0 though it shouldn't normally happen. |