aboutsummaryrefslogtreecommitdiffstats
path: root/include/zot.php
Commit message (Collapse)AuthorAgeFilesLines
...
* | check and repair sys channel locations (hublocs) in zot-finger if they are ↵redmatrix2015-09-291-0/+61
| | | | | | | | messed up
* | resolve conflictsredmatrix2015-09-281-7/+0
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-281-0/+6
|\|
| * process_delivery: ignore selfredmatrix2015-09-281-0/+6
| |
* | ignore self delivery in process_deliveryredmatrix2015-09-281-7/+5
| |
* | create site records for all queued sites and check for deathredmatrix2015-09-281-3/+5
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-271-4/+6
|\| | | | | | | | | Conflicts: include/zot.php
| * well there's one problem...redmatrix2015-09-271-4/+4
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-271-5/+13
|\| | | | | | | | | | | Conflicts: include/zot.php util/messages.po
| * add some safety checks on the sending side of syncredmatrix2015-09-271-6/+20
| |
* | import_xchan_photo: check the return headers to ensure it's an image ↵redmatrix2015-09-261-1/+1
| | | | | | | | content-type of some form as imagick chucks a wobbly if you try to initialise an image with an html error page.
* | add plugin hooks to channel sync/import/exportredmatrix2015-09-231-0/+2
| |
* | merge issueredmatrix2015-09-221-4/+2
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-221-2/+4
|\|
| * don't send sync packets to deleted hubloc locationsredmatrix2015-09-221-2/+4
| |
| * inverted logic syncing deleted hublocsredmatrix2015-09-221-1/+1
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-221-1/+3
|\|
| * add names to delivery report for sync deliveryredmatrix2015-09-221-1/+3
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-221-1/+11
|\|
| * report the channel syncredmatrix2015-09-221-1/+11
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-221-0/+9
|\| | | | | | | | | | | Conflicts: include/items.php include/zot.php
| * backport item syncredmatrix2015-09-221-0/+85
| |
* | allow self delivery until we figure out why clone sync of posted items isn't ↵redmatrix2015-09-221-5/+6
| | | | | | | | doing it's thing
* | add one more testredmatrix2015-09-221-1/+1
| |
* | fix foreach warningredmatrix2015-09-221-1/+1
| |
* | delivery reports - crude but mostly functional at least for zot deliveriesredmatrix2015-09-221-3/+4
| |
* | heavy lifting for delivery reportsredmatrix2015-09-221-1/+11
| |
* | more progress on delivery reports. Store the remote results from zot sites ↵redmatrix2015-09-211-0/+15
| | | | | | | | locally.
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-201-13/+34
|\| | | | | | | | | Conflicts: include/zot.php
| * new delivery report formatredmatrix2015-09-201-13/+33
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-201-3/+1
|\| | | | | | | | | Conflicts: include/zot.php
| * improve on the last attemptredmatrix2015-09-201-4/+4
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-201-4/+13
|\| | | | | | | | | Conflicts: include/zot.php
| * catch the timestamp alsoredmatrix2015-09-201-1/+1
| |
| * remove system flags from channel import packetredmatrix2015-09-201-5/+9
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-201-1/+1
|\| | | | | | | | | Conflicts: include/zot.php
| * we need the xchan record alsoredmatrix2015-09-201-1/+1
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-191-0/+1
|\| | | | | | | | | Conflicts: include/zot.php
| * clone new connection requestsredmatrix2015-09-191-18/+19
| |
* | clone new connectionsredmatrix2015-09-191-17/+18
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-181-1/+1
|\|
| * include site identitfier on redmatrix delivery reports alsoredmatrix2015-09-181-0/+2
| |
* | add reporting site to delivery reportredmatrix2015-09-181-0/+2
| |
* | more work on surviving hub re-installsredmatrix2015-09-181-2/+6
| |
* | consolidate zotfinger and webfingerredmatrix2015-09-171-0/+288
| |
* | Merge pull request #38 from MicMee/masterredmatrix2015-09-121-3/+3
|\ \ | | | | | | ensure that living sites are marked as alive
| * | ensure that living sites are marked as aliveMichael Meer2015-09-111-3/+3
| | |
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-111-1/+4
|\ \ \ | | |/ | |/|
| * | log the remote message if there was oneredmatrix2015-09-111-1/+4
| | |
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-111-18/+34
|\| | | |/ |/| | | | | Conflicts: util/messages.po