aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
Commit message (Collapse)AuthorAgeFilesLines
* /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-306-547/+58
|\|
| * 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
| |
| * don't include deleted or orphaned xchans in ratings searchredmatrix2016-07-261-1/+2
| |
| * move openid to addonredmatrix2016-07-252-517/+0
| |
| * make drag/drop work with acl, which bypassed the formredmatrix2016-07-241-0/+2
| |
| * add acl selection to files upload via /cloud (still missing from directory ↵redmatrix2016-07-241-0/+38
| | | | | | | | creation)
| * string update and some minor comment editsredmatrix2016-07-241-2/+2
| |
| * more work on #453redmatrix2016-07-211-16/+15
| |
* | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-2118-183/+177
|\|
| * issue #453 and a bug noted from the logfiles related to the schema change ↵redmatrix2016-07-201-1/+3
| | | | | | | | last month
| * Merge branch 'dev' into permsredmatrix2016-07-206-85/+14
| |\
| | * sort out some of the authentication mess - with luck this may fix the DAV ↵redmatrix2016-07-206-85/+14
| | | | | | | | | | | | auth issue which I simply could not duplicate or find a reason for.
| * | Merge branch 'dev' into permsredmatrix2016-07-201-1/+2
| |\|
| * | fix the forum detection in include/zotredmatrix2016-07-191-2/+2
| | |
| * | permission fixesredmatrix2016-07-192-5/+7
| | |
| * | translate more old perms callsredmatrix2016-07-192-3/+3
| | |
| * | more perms work (a lot more)redmatrix2016-07-182-30/+38
| | |
| * | more perms workredmatrix2016-07-181-0/+9
| | |
| * | Merge branch 'dev' into permsredmatrix2016-07-177-4/+180
| |\ \
| * | | more perms workredmatrix2016-07-132-8/+14
| | | |
| * | | deprecate/remove json_decode_plusredmatrix2016-07-132-4/+4
| | | |
| * | | lots more permission workredmatrix2016-07-133-21/+42
| | | |
| * | | Merge branch 'dev' into permsredmatrix2016-07-132-26/+60
| |\ \ \
| * | | | more work on permsredmatrix2016-07-123-18/+10
| | | | |
| * | | | Merge branch 'dev' into permsredmatrix2016-07-129-22/+10
| |\ \ \ \
| * \ \ \ \ Merge branch 'dev' into permsredmatrix2016-07-115-36/+15
| |\ \ \ \ \
| * | | | | | more perms work - notably the stuff in public_permsredmatrix2016-07-111-7/+13
| | | | | | |
| * | | | | | more permissions workredmatrix2016-07-092-3/+19
| | | | | | |
| * | | | | | more work on permsredmatrix2016-07-091-1/+2
| | | | | | |
| * | | | | | more heavy lifting on xtensible permsredmatrix2016-07-042-5/+8
| | | | | | |
| * | | | | | more heavy lifting on extensible permsredmatrix2016-07-041-3/+8
| | | | | | |
| * | | | | | perms work - settings pageredmatrix2016-07-031-20/+13
| | | | | | |
* | | | | | | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-201-1/+1
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | type m query in Acl.php should probably^Ceturn xchan_hash as hash and not as ↵Mario Vavti2016-07-201-1/+1
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | id. This fixes the issue that autocomplete for mail returns null for data.xid
* | | | | | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-202-0/+4
|\| | | | |
| * | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-07-171-1/+1
| |\ \ \ \ \
| * | | | | | include attach.php at the module level since 2d4b75428a87038 wasn't ↵redmatrix2016-07-172-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | backported to dev and we're about to branch an RC
* | | | | | | 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
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | hide fullscreen button in embedphotos modal album viewMario Vavti2016-07-171-1/+1
| |/ / / / /