aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Stash changes to merge from devAndrew Manning2016-07-163-30/+52
|
* Postpone remote folder import until filesystem mirroring matures.Andrew Manning2016-07-163-6/+55
|
* Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-147-32/+80
|\
| * markdown is whitespace sensitiveredmatrix2016-07-141-1/+1
| |
| * who are weredmatrix2016-07-141-0/+12
| |
| * let abconfig specify a familyredmatrix2016-07-132-4/+6
| |
| * document mod_acl a bit better and try to remove some redundancies and ↵redmatrix2016-07-134-28/+62
| | | | | | | | consolidate the various options
* | Refactored the scan and import functions to reduce redundant code and ↵Andrew Manning2016-07-142-373/+223
| | | | | | | | simplify logic. Import of pages, layouts, and blocks works.
* | Blocks, pages, and layouts import from zip file. Layouts are not applied to ↵Andrew Manning2016-07-131-9/+190
| | | | | | | | pages until imported twice though.
* | Updated import_blocks for database callsAndrew Manning2016-07-131-5/+3
| |
* | Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-133-20/+12
|\|
| * missing namespace prefix \redmatrix2016-07-121-1/+1
| |
| * 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-1227-56/+54
|\|
| * the abconfig defaults weren't changed in the schema files when they were ↵redmatrix2016-07-122-2/+2
| | | | | | | | changed in the code
| * move permissiondescription class to zotlabs/libredmatrix2016-07-1111-26/+12
| |
| * use the get_hostname function rather than parse the urlredmatrix2016-07-111-1/+1
| |
| * document the new change_channel hookredmatrix2016-07-112-0/+14
| |
| * create change_channel hookredmatrix2016-07-111-0/+4
| |
| * force non-null sess_dataredmatrix2016-07-111-1/+2
| |
| * use the profile_uid here.redmatrix2016-07-111-7/+2
| |
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-07-118-18/+16
| |\
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-07-111-5/+0
| | |\
| | | * Merge pull request #451 from git-marijus/devhubzilla2016-07-111-5/+0
| | | |\ | | | | | | | | | | remove check for mcrypt
| | | | * remove check for mcryptMario Vavti2016-07-101-5/+0
| | | | |
| | | | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-07-105-1284/+1313
| | | | |\ | | | | |/ | | | |/|
| | | | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-07-072-19/+10
| | | | |\
| | * | | | do not use visibility for fullscreen button and move fullscreen button to ↵Mario Vavti2016-07-117-13/+16
| | |/ / / | | | | | | | | | | | | | | | the right
| * / / / more sql fine tuningredmatrix2016-07-091-1/+1
| |/ / /
* | | | Import blocks from zip file, but needs updates as detailed in ↵Andrew Manning2016-07-122-2/+224
| | | | | | | | | | | | | | | | https://gitlab.com/zot/hubsites/merge_requests/2
* | | | Clearer import control interfaceAndrew Manning2016-07-102-8/+28
| | | |
* | | | First draft of website import toolsAndrew Manning2016-07-104-0/+46
| | | |
* | | | Set max-width for embedded imagesAndrew Manning2016-07-091-0/+4
| | | |
* | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-07-0922-1674/+1724
|\| | |
| * | | some work on the forum widget queriesredmatrix2016-07-092-1273/+1292
| | | |
| * | | gak one more typoredmatrix2016-07-071-1/+1
| | | |
| * | | typoredmatrix2016-07-071-1/+1
| | | |
| * | | duplicate supression SQL query was horribly inefficient and could cause ↵redmatrix2016-07-071-11/+13
| | | | | | | | | | | | | | | | issues in resource deprived environments.
| * | | Merge pull request #450 from git-marijus/devhubzilla2016-07-083-14/+2
| |\| | | | | | | | | | fix /cloud after recent changes
| | * | more fixes for /cloud and /davMario Vavti2016-07-073-13/+2
| | | |
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-07-0610-345/+386
| | |\ \
| | * | | fix /cloud after recent changesMario Vavti2016-07-061-2/+1
| | | | |
| * | | | hide the redeliver option one level down since it should rarely be needed by ↵redmatrix2016-07-072-1/+9
| | |_|/ | |/| | | | | | | | | | folks outside of shared hosting.
| * | | 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 ↵redmatrix2016-07-062-2/+2
| | |/ | |/| | | | | | | limit. Also the sys channel was being expired with everybody else due to a flag change regression.
| * | unused fileredmatrix2016-07-051-35/+0
| | |
| * | merge include/reddav.php into Zotlabs/Storage/Directory.phpredmatrix2016-07-052-303/+280
| | |
| * | cleanupredmatrix2016-07-051-2/+14
| | |
| * | regression - save bookmarks no longer present in item menuredmatrix2016-07-052-3/+3
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-13 15:22:03 +0000