aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Collapse)AuthorAgeFilesLines
* bring back acl for cloud file uploadsMario Vavti2016-08-061-1/+2
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-08-0515-18/+83
|\
| * multi acl: port /settingsMario Vavti2016-08-051-1/+5
| |
| * multi acl: port /displayMario Vavti2016-08-051-0/+1
| |
| * multi acl: port /thingMario Vavti2016-08-051-0/+8
| |
| * multi acl: port /rpostMario Vavti2016-08-052-5/+5
| |
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-08-051-2/+3
| |\
| | * Parse bbcode when page loadsAndrew Manning2016-08-041-2/+2
| | |
| | * Convert select bbcode tags including [observer], [baseurl], [sitename]Andrew Manning2016-08-031-0/+1
| | |
| * | multi acl: port /wikiMario Vavti2016-08-041-4/+13
| | |
| * | multi acl: port /webpages and /mitemMario Vavti2016-08-043-1/+11
| | |
| * | multi acl: port /chatMario Vavti2016-08-041-0/+4
| | |
| * | multi acl: port /cloud and /filestorageMario Vavti2016-08-042-6/+9
| | |
| * | multi acl: port photosMario Vavti2016-08-041-1/+9
| | |
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-08-041-1/+1
| |\|
| * | multi acl: port eventsMario Vavti2016-08-031-1/+11
| | |
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-08-038-17/+269
| |\ \
| * | | multiple acl workMario Vavti2016-08-033-2/+9
| | | |
* | | | minor cleanup on ratings - no real functional changes at this timeredmatrix2016-08-042-12/+20
| |_|/ |/| |
* | | issue #473 - unable to delete privacy groupsredmatrix2016-08-031-1/+1
| |/ |/|
* | missing comma in atoken update sqlredmatrix2016-08-021-1/+1
| |
* | this should sort out likes showing up as wall-to-wall posts on diasporaredmatrix2016-08-011-0/+2
| |
* | This checkin should make all permission modes work correctly with atokens ↵redmatrix2016-08-012-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/redmatrix2016-08-011-1/+1
| |
* | allow individual permissions on atokensredmatrix2016-07-311-5/+59
| |
* | add a few more path macros to portable menu elements (channelurl, pageurl, ↵redmatrix2016-07-312-3/+7
| | | | | | | | storeurl and baseurl)
* | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-311-1/+1
|\ \
| * | issue #466, sql typoredmatrix2016-07-281-1/+1
| |/
* | Improved UI. Removed logger statements.Andrew Manning2016-07-311-9/+17
| |
* | Import element selection page added to allow selective importing.Andrew Manning2016-07-301-22/+91
| |
* | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-3012-554/+103
|\|
| * github didn't accept the last push. Touching the files to force a git revisionredmatrix2016-07-271-1/+0
| |
| * fix italian strings (messed up by rtl variable); and finish removing openid ↵redmatrix2016-07-271-12/+0
| | | | | | | | from core
| * add the hidden flag alsoredmatrix2016-07-271-1/+2
| |
| * rework drag and drop to drag directly into files area, implement the default ↵Mario Vavti2016-07-271-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_mergeredmatrix2016-07-261-0/+75
| |\
| | * Merge pull request #463 from git-marijus/devhubzilla2016-07-271-0/+75
| | |\ | | | | | | | | allow multiple-file cloud upload
| | | * allow multiple-file cloud uploadMario Vavti2016-07-261-0/+75
| | | |
| * | | don't include deleted or orphaned xchans in ratings searchredmatrix2016-07-261-1/+2
| |/ /
| * | restrict url cache to 254 maxlenredmatrix2016-07-261-0/+5
| | |
| * | missing sredmatrix2016-07-261-1/+1
| | |
| * | set App::$error on 404 so we don't get two 'Page not found.' page bodies.redmatrix2016-07-261-0/+1
| |/
| * URLUtil path has changed since sabredav 1.8 - fixes renaming issue in dav ↵Mario Vavti2016-07-261-1/+2
| | | | | | | | clients
| * move openid to addonredmatrix2016-07-252-517/+0
| |
| * make drag/drop work with acl, which bypassed the formredmatrix2016-07-241-0/+2
| |
| * trace log pconfig cache if for some reason it isn't an arrayredmatrix2016-07-241-0/+8
| |
| * add acl selection to files upload via /cloud (still missing from directory ↵redmatrix2016-07-242-1/+58
| | | | | | | | creation)
| * string update and some minor comment editsredmatrix2016-07-241-2/+2
| |
| * Multiple file upload by drag and drop with progress indicators and auto page ↵Andrew Manning2016-07-241-1/+2
| | | | | | | | reload
| * more work on #453redmatrix2016-07-211-16/+15
| |