aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\|
| * issue #473 - unable to delete privacy groupsredmatrix2016-08-031-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
|\|
| * 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
| |\|
| * | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-2126-225/+567
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-202-3/+3
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-204-2/+5
| |\ \ \ \
| * | | | | Starting to make the import selection page after element scan.Andrew Manning2016-07-201-80/+98
| | | | | |
| * | | | | Importing webpage elements from manually entered cloud file path work. All ↵Andrew Manning2016-07-171-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | detected elements are automatically imported.
| * | | | | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-171-1/+1
| |\ \ \ \ \
| * | | | | | Added functions to check cloud files path and return path with hashed namesAndrew Manning2016-07-172-51/+6
| | | | | | |
| * | | | | | Merge remote-tracking branch 'upstream/dev' into website-import-remoteAndrew Manning2016-07-167-5/+197
| |\ \ \ \ \ \
| * | | | | | | Stash changes to merge from devAndrew Manning2016-07-161-13/+43
| | | | | | | |
| * | | | | | | Postpone remote folder import until filesystem mirroring matures.Andrew Manning2016-07-161-2/+36
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-142-27/+63
| |\ \ \ \ \ \ \
| * | | | | | | | Refactored the scan and import functions to reduce redundant code and ↵Andrew Manning2016-07-141-373/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simplify logic. Import of pages, layouts, and blocks works.
| * | | | | | | | Blocks, pages, and layouts import from zip file. Layouts are not applied to ↵Andrew Manning2016-07-131-9/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pages until imported twice though.
| * | | | | | | | Updated import_blocks for database callsAndrew Manning2016-07-131-5/+3
| | | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-131-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-1213-35/+184
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Import blocks from zip file, but needs updates as detailed in ↵Andrew Manning2016-07-121-0/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/zot/hubsites/merge_requests/2
* | | | | | | | | | | multiple acl workMario Vavti2016-08-033-2/+9
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \