504 commits

Author	SHA1	Message	Date
redmatrix	4b984f9819	filter delivery reports	2015-10-17 13:26:55 -07:00
redmatrix	b33a9a71f6	more work on import & sync of private mail and conversations	2015-10-14 17:40:50 -07:00
redmatrix	dd45e7b4eb	Merge https://github.com/redmatrix/redmatrix into pending_merge	2015-10-01 17:30:15 -07:00
redmatrix	63eb0e3a38	allow additional uses for xtags	2015-10-01 17:28:03 -07:00
redmatrix	986244eeea	issue #63 - missing table fields in db query	2015-09-30 21:38:21 -07:00
redmatrix	9bdb7bef5d	add delivery reports to mail (not backported to redmatrix)	2015-09-30 19:27:53 -07:00
redmatrix	54e7d5d260	Merge https://github.com/redmatrix/redmatrix into pending_merge ... Conflicts: include/zot.php view/de/messages.po view/de/strings.php	2015-09-30 16:31:06 -07:00
redmatrix	5265c190d4	document the issue with cloned delivery to self vs normal delivery to self	2015-09-30 16:27:24 -07:00
redmatrix	4b7c052ed8	undo self deliver check	2015-09-30 12:59:13 -07:00
redmatrix	fd290882fd	undo self-deliver check	2015-09-30 12:57:02 -07:00
redmatrix	e769fbaffb	another error from the db logs	2015-09-29 22:56:29 -07:00
redmatrix	a795f03c48	improve the sys channel location repair to check key issues and re-installs and/or site moves	2015-09-29 17:21:14 -07:00
redmatrix	c5294f994e	check and repair sys channel locations (hublocs) in zot-finger if they are messed up	2015-09-29 16:55:51 -07:00
redmatrix	5c526995d8	resolve conflicts	2015-09-28 19:07:31 -07:00
redmatrix	50ee82e8bd	Merge https://github.com/redmatrix/redmatrix into pending_merge	2015-09-28 19:06:10 -07:00
redmatrix	8a3c909c74	ignore self delivery in process_delivery	2015-09-28 19:05:45 -07:00
redmatrix	3a8e1e0484	process_delivery: ignore self	2015-09-28 19:04:36 -07:00
redmatrix	e5f47cd14b	create site records for all queued sites and check for death	2015-09-28 17:13:11 -07:00
redmatrix	ed876a9c52	Merge https://github.com/redmatrix/redmatrix into pending_merge ... Conflicts: include/zot.php	2015-09-27 18:03:40 -07:00
redmatrix	67fe8fc4a7	well there's one problem...	2015-09-27 18:00:37 -07:00
redmatrix	55b530f0fd	Merge https://github.com/redmatrix/redmatrix into pending_merge ... Conflicts: include/zot.php util/messages.po	2015-09-27 17:00:41 -07:00
redmatrix	aae51a9b23	add some safety checks on the sending side of sync	2015-09-27 16:47:25 -07:00
redmatrix	9ab335626c	import_xchan_photo: check the return headers to ensure it's an image content-type of some form as imagick chucks a wobbly if you try to initialise an image with an html error page.	2015-09-26 13:25:34 -07:00
redmatrix	e45958b967	add plugin hooks to channel sync/import/export	2015-09-23 18:27:04 -07:00
redmatrix	d35c5bcb2f	merge issue	2015-09-22 19:16:13 -07:00
redmatrix	c699d3a17a	Merge https://github.com/redmatrix/redmatrix into pending_merge	2015-09-22 19:14:21 -07:00
redmatrix	d16ac62a51	don't send sync packets to deleted hubloc locations	2015-09-22 19:13:10 -07:00
redmatrix	15feeb7bfe	inverted logic syncing deleted hublocs	2015-09-22 18:40:03 -07:00
redmatrix	02ecc93998	Merge https://github.com/redmatrix/redmatrix into pending_merge	2015-09-22 16:50:55 -07:00
redmatrix	34291d5938	add names to delivery report for sync delivery	2015-09-22 16:50:08 -07:00
redmatrix	e726adc27b	Merge https://github.com/redmatrix/redmatrix into pending_merge	2015-09-22 16:45:14 -07:00
redmatrix	642f460dca	report the channel sync	2015-09-22 16:43:36 -07:00
redmatrix	1d7d9818fa	Merge https://github.com/redmatrix/redmatrix into pending_merge ... Conflicts: include/items.php include/zot.php	2015-09-22 16:26:28 -07:00
redmatrix	c2dcc68803	backport item sync	2015-09-22 16:19:08 -07:00
redmatrix	7dd61c05dc	allow self delivery until we figure out why clone sync of posted items isn't doing it's thing	2015-09-22 04:39:36 -07:00
redmatrix	1c1155513a	add one more test	2015-09-22 04:28:05 -07:00
redmatrix	f84151e1fe	fix foreach warning	2015-09-22 04:24:54 -07:00
redmatrix	2869ccfe39	delivery reports - crude but mostly functional at least for zot deliveries	2015-09-22 04:04:51 -07:00
redmatrix	0b1b11ea53	heavy lifting for delivery reports	2015-09-22 02:32:04 -07:00
redmatrix	146ff6f703	more progress on delivery reports. Store the remote results from zot sites locally.	2015-09-21 22:30:28 -07:00
redmatrix	4fde0bf62e	Merge https://github.com/redmatrix/redmatrix into pending_merge ... Conflicts: include/zot.php	2015-09-20 20:58:55 -07:00
redmatrix	a679081993	new delivery report format	2015-09-20 20:21:54 -07:00
redmatrix	177292de13	Merge https://github.com/redmatrix/redmatrix into pending_merge ... Conflicts: include/zot.php	2015-09-20 18:10:25 -07:00
redmatrix	efcb4abfd0	improve on the last attempt	2015-09-20 18:08:06 -07:00
redmatrix	1501d1c570	Merge https://github.com/redmatrix/redmatrix into pending_merge ... Conflicts: include/zot.php	2015-09-20 18:03:41 -07:00
redmatrix	59a56ac77f	catch the timestamp also	2015-09-20 17:47:41 -07:00
redmatrix	35f09f4f74	remove system flags from channel import packet	2015-09-20 17:45:23 -07:00
redmatrix	b240c15014	Merge https://github.com/redmatrix/redmatrix into pending_merge ... Conflicts: include/zot.php	2015-09-20 16:55:24 -07:00
redmatrix	9de8df496a	we need the xchan record also	2015-09-20 16:52:21 -07:00
redmatrix	ce064188c6	Merge https://github.com/redmatrix/redmatrix into pending_merge ... Conflicts: include/zot.php	2015-09-19 22:48:22 -07:00