aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/dev' into website-import-remoteAndrew Manning2016-07-165-26/+126
|\
| * 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
* | 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
|\|
| * let abconfig specify a familyredmatrix2016-07-131-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
|\|
| * 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
* | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-124-175/+7
|\|
| * move permissiondescription class to zotlabs/libredmatrix2016-07-112-173/+1
| * use the get_hostname function rather than parse the urlredmatrix2016-07-111-1/+1
| * create change_channel hookredmatrix2016-07-111-0/+4
| * more sql fine tuningredmatrix2016-07-091-1/+1
* | Clearer import control interfaceAndrew Manning2016-07-101-2/+6
* | First draft of website import toolsAndrew Manning2016-07-102-0/+38
|/
* 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
* 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
* 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
| * Merge branch 'dev' into sabre32Mario Vavti2016-06-291-0/+38
| |\
| | * identity_export_year() was a bit short-sighted. We really require arbitrary d...redmatrix2016-06-281-0/+38
| * | Merge branch 'dev' into sabre32Mario Vavti2016-06-284-7/+30
| |\|
| | * still working through some issues with curl magic-authredmatrix2016-06-271-0/+7
| | * add letsencrypt x3 intermediate cert and new cert file, improve UX of new reg...redmatrix2016-06-272-3/+19
| | * replace [+] and [-] with chevron iconsredmatrix2016-06-271-4/+4
| * | Merge branch 'dev' into sabre32Mario Vavti2016-06-273-3/+26
| |\|
| | * remove the app $a passed to profile_load, also add profile_load to mod_wiki w...redmatrix2016-06-261-2/+1
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-06-262-12/+42
| | |\
| | * | issue #442, tables contain too much whitespace (there's a definite issue here...redmatrix2016-06-262-1/+25
| * | | Merge branch 'dev' into sabre32Mario Vavti2016-06-262-12/+42
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'dev' into sabre32Mario Vavti2016-06-251-9/+8
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'dev' into sabre32Mario Vavti2016-06-247-104/+62
| |\ \ \