aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Merge branch 'deadsite'redmatrix2015-09-287-14/+56
|\ \
| * | typoredmatrix2015-09-281-2/+2
| | |
| * | create site records for all queued sites and check for deathredmatrix2015-09-284-9/+47
| | |
| * | add site_type to queries, first few - several more to go.redmatrix2015-09-283-5/+9
| | |
* | | private mail: bring additional inbox/outbox views and ajaxify single message ↵Mario Vavti2015-09-281-1/+3
|/ / | | | | | | drop
* | 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
| |
| * problems with extended item import and signaturesredmatrix2015-09-221-3/+62
| |
* | move string files to hmessages.po and hstrings.php for hubzilla to avoid ↵redmatrix2015-09-262-5/+15
| | | | | | | | endless merge conflicts.
* | import_xchan_photo: check the return headers to ensure it's an image ↵redmatrix2015-09-262-46/+64
| | | | | | | | content-type of some form as imagick chucks a wobbly if you try to initialise an image with an html error page.
* | remove redundant coderedmatrix2015-09-241-7/+1
| |
* | delivery optimisationsredmatrix2015-09-242-8/+54
| |
* | add Diaspora (actually any external service which uses the queue) to ↵redmatrix2015-09-241-0/+8
| | | | | | | | delivery reports
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-09-243-19/+120
|\ \
| * | some heavy private mail restructuring - work in progressMario Vavti2015-09-243-19/+120
| | |
* | | Document the additional content export optionsredmatrix2015-09-241-1/+4
|/ /
* | timezone tweaksredmatrix2015-09-231-6/+10
| |
* | add plugin hooks to channel sync/import/exportredmatrix2015-09-232-0/+6
| |
* | 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-222-0/+10
|\| | | | | | | | | | | Conflicts: include/items.php include/zot.php
| * backport item syncredmatrix2015-09-222-2/+91
| |
* | 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-222-3/+6
| |
* | heavy lifting for delivery reportsredmatrix2015-09-224-2/+56
| |
* | more progress on delivery reports. Store the remote results from zot sites ↵redmatrix2015-09-211-0/+15
| | | | | | | | locally.
* | issue #51redmatrix2015-09-211-0/+12
| |
* | looks like chat has been neglected a bit recentlyredmatrix2015-09-202-4/+3
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-202-13/+43
|\| | | | | | | | | Conflicts: include/zot.php
| * new delivery report formatredmatrix2015-09-202-13/+42
| |
* | 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
| |