aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-08-051-0/+39
|\
| * Parse bbcode when page loadsAndrew Manning2016-08-041-0/+6
| * Convert select bbcode tags including [observer], [baseurl], [sitename]Andrew Manning2016-08-031-0/+33
* | multi acl: port eventsMario Vavti2016-08-031-2/+0
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-08-0312-24/+494
|\|
| * comment policy permissions typoredmatrix2016-08-021-1/+1
| * This checkin should make all permission modes work correctly with atokens (th...redmatrix2016-08-014-16/+121
| * /storeurl/cloudurl/redmatrix2016-08-012-3/+3
| * add a few more path macros to portable menu elements (channelurl, pageurl, st...redmatrix2016-07-313-12/+18
| * make guest access tokens work with PERMS_NETWORK, PERMS_SITE, PERMS_PENDING, ...redmatrix2016-07-312-0/+37
| * Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-311-1/+1
| |\
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-07-302-16/+18
| | |\
| | * | issue #466, sql typoredmatrix2016-07-281-1/+1
| * | | Improved UI. Removed logger statements.Andrew Manning2016-07-312-8/+5
| * | | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-307-77/+91
| |\ \ \ | | | |/ | | |/|
| * | | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-2121-566/+913
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-202-1/+2
| |\ \ \ \
| * | | | | Importing webpage elements from manually entered cloud file path work. All de...Andrew Manning2016-07-172-5/+5
| * | | | | Added functions to check cloud files path and return path with hashed namesAndrew Manning2016-07-172-5/+85
| * | | | | Merge remote-tracking branch 'upstream/dev' into website-import-remoteAndrew Manning2016-07-165-26/+126
| |\ \ \ \ \
| * | | | | | Stash changes to merge from devAndrew Manning2016-07-161-4/+3
| * | | | | | Postpone remote folder import until filesystem mirroring matures.Andrew Manning2016-07-161-1/+5
| * | | | | | 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 simplif...Andrew Manning2016-07-141-0/+200
| * | | | | | | 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 p...Mario Vavti2016-07-282-16/+18
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | missing sredmatrix2016-07-261-1/+1
* | | | | | | | issue #460 - remove reference to $a which was passed by value since it doesn'...redmatrix2016-07-261-53/+53
* | | | | | | | 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 l...redmatrix2016-07-211-0/+11
* | | | | | | typoredmatrix2016-07-211-1/+1
* | | | | | | issue #453 and a bug noted from the logfiles related to the schema change las...redmatrix2016-07-201-1/+1
* | | | | | | 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 aut...redmatrix2016-07-205-84/+102
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | 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