aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-141-2/+2
| |\ \ \ \ \ \
| * | | | | | | Refactored the scan and import functions to reduce redundant code and ↵Andrew Manning2016-07-141-0/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simplify logic. Import of pages, layouts, and blocks works.
| * | | | | | | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-132-19/+11
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-124-175/+7
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Clearer import control interfaceAndrew Manning2016-07-101-2/+6
| | | | | | | | | |
| * | | | | | | | | First draft of website import toolsAndrew Manning2016-07-102-0/+38
| | | | | | | | | |
* | | | | | | | | | multiple acl workMario Vavti2016-08-032-0/+12
| |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | translate mime types to icons, update some icons, move file preview (upload ↵Mario Vavti2016-07-282-16/+18
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | progress) below table header
* | | | | | | | missing sredmatrix2016-07-261-1/+1
| | | | | | | |
* | | | | | | | issue #460 - remove reference to $a which was passed by value since it ↵redmatrix2016-07-261-53/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doesn't exist. Ultimately $a needs to be removed completely but that's a bit messier.
* | | | | | | | issue #460redmatrix2016-07-251-1/+3
| | | | | | | |
* | | | | | | | string update and some minor comment editsredmatrix2016-07-241-0/+1
| | | | | | | |
* | | | | | | | fix birthday addtocalredmatrix2016-07-211-3/+3
| | | | | | | |
* | | | | | | | zat URL auth updated to match changes to the atoken_login interfaceredmatrix2016-07-212-3/+12
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | fail oembed if it is attempted and less than 80% of the original content is ↵redmatrix2016-07-211-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | left after html filtering. For the original poster, this will fall back to linkinfo results. If the embed gets through their site but is filtered downstream (with more than 20% of the content removed), it will result in just a link.
* | | | | | | typoredmatrix2016-07-211-1/+1
| | | | | | |
* | | | | | | issue #453 and a bug noted from the logfiles related to the schema change ↵redmatrix2016-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | last month
* | | | | | | Merge branch 'dev' into permsredmatrix2016-07-206-85/+105
|\ \ \ \ \ \ \
| * | | | | | | fix vevent multi-line formattingredmatrix2016-07-201-1/+3
| | | | | | | |
| * | | | | | | sort out some of the authentication mess - with luck this may fix the DAV ↵redmatrix2016-07-205-84/+102
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | auth issue which I simply could not duplicate or find a reason for.
* | | | | | | fix the forum detection in include/zotredmatrix2016-07-192-5/+16
| | | | | | |
* | | | | | | another couple of minor perms fixesredmatrix2016-07-192-8/+10
| | | | | | |
* | | | | | | permission fixesredmatrix2016-07-192-7/+7
| | | | | | |
* | | | | | | fixes to permsredmatrix2016-07-191-3/+3
| | | | | | |
* | | | | | | translate more old perms callsredmatrix2016-07-192-2/+2
| | | | | | |
* | | | | | | Merge branch 'dev' into permsredmatrix2016-07-191-0/+1
|\| | | | | |
| * | | | | | issue #411redmatrix2016-07-191-0/+1
| | | | | | |
* | | | | | | yet more grungy perms work.redmatrix2016-07-191-37/+36
| | | | | | |
* | | | | | | missing bracketredmatrix2016-07-181-1/+2
| | | | | | |
* | | | | | | more perms work (a lot more)redmatrix2016-07-183-40/+83
| | | | | | |
* | | | | | | move legacy code inside the legacy checkredmatrix2016-07-181-2/+3
| | | | | | |
* | | | | | | more perms workredmatrix2016-07-183-0/+16
| | | | | | |
* | | | | | | Merge branch 'dev' into permsredmatrix2016-07-181-1/+1
|\| | | | | |
| * | | | | | do not transform hashes to tags in [code=xxx] or [code] blocksMario Vavti2016-07-181-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | more perms workredmatrix2016-07-182-5/+103
| | | | | |
* | | | | | export/import channel permissionsredmatrix2016-07-172-9/+39
| | | | | |
* | | | | | clone channel permsredmatrix2016-07-172-1/+71
| | | | | |
* | | | | | Merge branch 'dev' into permsredmatrix2016-07-176-26/+190
|\| | | | |
| * | | | | Here's the basic UI for the Zot Access Tokens, requires some minor cleanupredmatrix2016-07-141-0/+9
| | | | | |
| * | | | | make the xchan_hash for the access token location independentredmatrix2016-07-141-12/+15
| | | | | |
| * | | | | more ZAT workredmatrix2016-07-143-2/+29
| | | | | |
| * | | | | first cut at zot access tokensredmatrix2016-07-142-24/+85
| | |_|_|/ | |/| | |
* | | | | more perms workredmatrix2016-07-133-25/+34
| | | | |
* | | | | deprecate/remove json_decode_plusredmatrix2016-07-134-29/+21
| | | | |
* | | | | rework perm_is_allowedredmatrix2016-07-131-4/+8
| | | | |
* | | | | Merge branch 'dev' into permsredmatrix2016-07-131-3/+2
|\| | | |
| * | | | let abconfig specify a familyredmatrix2016-07-131-2/+2
| | |_|/ | |/| |
* | | | lots more permission workredmatrix2016-07-131-2/+7
| | | |
* | | | more work on permsredmatrix2016-07-122-18/+34
| | | |
* | | | Merge branch 'dev' into permsredmatrix2016-07-125-193/+13
|\| | |