aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* 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
|\|
| * update_remote_id - updated to work with iconfigredmatrix2016-07-121-18/+5
| * don't try to send sync packets to dead sites.redmatrix2016-07-121-1/+6
| * move permissiondescription class to zotlabs/libredmatrix2016-07-112-173/+1
| * use the get_hostname function rather than parse the urlredmatrix2016-07-111-1/+1
* | Merge branch 'dev' into permsredmatrix2016-07-113-21/+38
|\|
| * create change_channel hookredmatrix2016-07-111-0/+4
| * more sql fine tuningredmatrix2016-07-091-1/+1
| * some work on the forum widget queriesredmatrix2016-07-091-2/+24
| * reduce the memory usage of the expire query dramatically.redmatrix2016-07-061-19/+10
| * expire crashing on shared hosting from memory exhaustion. Lower the expire li...redmatrix2016-07-061-1/+1
* | more perms work - notably the stuff in public_permsredmatrix2016-07-111-55/+17
* | perms workredmatrix2016-07-101-37/+13
* | change default so we don't have to check for array existence laterredmatrix2016-07-091-1/+1
* | more permissions workredmatrix2016-07-092-2/+4
* | more work on permsredmatrix2016-07-092-7/+9
* | Merge branch 'dev' into permsredmatrix2016-07-054-338/+16
|\|
| * unused fileredmatrix2016-07-051-35/+0
| * merge include/reddav.php into Zotlabs/Storage/Directory.phpredmatrix2016-07-051-299/+0
| * cleanupredmatrix2016-07-051-2/+14
| * regression - save bookmarks no longer present in item menuredmatrix2016-07-051-2/+2
* | more heavy lifting on xtensible permsredmatrix2016-07-041-233/+244
* | more heavy lifting on extensible permsredmatrix2016-07-041-13/+16
|/
* force immediate avatar updateTreer2016-07-031-0/+13
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-07-011-15/+0
|\
| * ditch the change_view widget and make header fixed in fullscreen modeMario Vavti2016-07-011-15/+0
* | delivery invoked twice in mod_tagger, once in post_activity_item() and anothe...redmatrix2016-07-011-5/+1
* | use small photo for Diaspora attribution correction; the medium looks awkward...redmatrix2016-07-011-2/+2
|/
* sync flags even if post has not been editedredmatrix2016-06-301-19/+10
* Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-309-17/+110
|\
| * wiki featured disabled by default in UNO.redmatrix2016-06-291-1/+1
| * provide wiki as a feature (default is on so there aren't any surprises) and a...redmatrix2016-06-293-5/+14
| * stream large photos through buffered I/O if possibleredmatrix2016-06-291-1/+1