aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Revert "missing release file"redmatrix2016-08-221-236/+0
* missing release fileredmatrix2016-08-221-0/+236
* Merge branch '1.12RC'redmatrix2016-08-2221-439/+1036
|\
| * public forum fallback checking (when custom/expert permissions are applied) w...redmatrix2016-08-221-5/+4
| * pending flag not being reset when using autoperms from custom roleredmatrix2016-08-121-1/+4
| * embed filter adjustmentsredmatrix2016-08-111-13/+17
| * forum detection was off for forums with custom permsredmatrix2016-08-101-1/+3
| * implement acl for folder creationMario Vavti2016-08-101-0/+16
| * function order reversedredmatrix2016-08-091-2/+2
| * bad code formatredmatrix2016-08-092-2/+27
| * updates to hcard parsingredmatrix2016-08-071-4/+9
| * diaspora vcard updatesredmatrix2016-08-071-0/+1
| * use config system.server_role and deprecate 'UNO'redmatrix2016-08-078-28/+24
| * fix /cloud upload for imagesMario Vavti2016-08-061-1/+1
| * bring back acl for cloud file uploadsMario Vavti2016-08-061-1/+1
| * 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
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* / | | | | | | | | Revert "Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1...redmatrix2016-07-2818-881/+549
|/ / / / / / / / /
* | | | | | | | / 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