aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* make zid() do the right things when confronted with url fragmentsredmatrix2016-08-211-0/+10
* Merge branch 'dev' of https://github.com/git-marijus/hubzilla into git-mariju...redmatrix2016-08-212-9/+8
|\
| * move jotnets to jot and some cleanup (mostly whitespace)Mario Vavti2016-08-212-9/+8
* | block backdoor delivery of bulk imported itemsredmatrix2016-08-191-4/+31
|/
* import anomalyredmatrix2016-08-171-4/+6
* don't set session theme unless logged in.redmatrix2016-08-161-1/+1
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-08-161-1/+1
|\
| * rename limited -> customMario Vavti2016-08-161-1/+1
* | get rid of ugly code constructredmatrix2016-08-161-8/+1
|/
* Merge pull request #487 from git-marijus/devhubzilla2016-08-161-107/+12
|\
| * provide group options serverside and minor cleanupMario Vavti2016-08-151-107/+12
* | fix attached photo/file permissions on clonesredmatrix2016-08-152-0/+138
* | event_store_event hookredmatrix2016-08-141-0/+7
|/
* Context help for settings/features pageAndrew Manning2016-08-141-1/+1
* Change text for submenu on small screens to be static toggle statementAndrew Manning2016-08-141-0/+1
* Replace hardcoded button title in javascript to translatable textAndrew Manning2016-08-141-0/+2
* Added a disable comments setting to the "Additional features" settings with a...Andrew Manning2016-08-142-0/+8
* pending flag not being reset when using autoperms from custom roleredmatrix2016-08-121-1/+4
* better method of dealing with api versionsredmatrix2016-08-111-23/+29
* more cleanup of apiredmatrix2016-08-111-109/+109
* move error processing back inside the functionredmatrix2016-08-111-22/+22
* embed filter adjustmentsredmatrix2016-08-111-13/+17
* A bit of api cleanup. Don't get excited. This is like a 0.005% cleanup but yo...redmatrix2016-08-112-85/+126
* 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