5087 commits

Author	SHA1	Message	Date
redmatrix	8d5556764c	add one more level of parentheses to ensure operator precedence is correctly evaluated	2015-09-28 20:03:11 -07:00
redmatrix	f965209eee	check public scopes against visitor in item_permissions_sql()	2015-09-28 19:45:57 -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	3b53cd56ef	Merge branch 'deadsite'	2015-09-28 17:15:34 -07:00
redmatrix	30e88a4f6b	typo	2015-09-28 17:15:04 -07:00
redmatrix	e5f47cd14b	create site records for all queued sites and check for death	2015-09-28 17:13:11 -07:00
Mario Vavti	b97102da01	private mail: bring additional inbox/outbox views and ajaxify single message drop	2015-09-28 17:40:38 +02:00
redmatrix	dbeae16dc1	add site_type to queries, first few - several more to go.	2015-09-28 04:21:29 -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	cd2b811555	move string files to hmessages.po and hstrings.php for hubzilla to avoid endless merge conflicts.	2015-09-26 23:44:30 -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	8aec437c23	remove redundant code	2015-09-24 23:02:41 -07:00
redmatrix	98f656cfcb	delivery optimisations	2015-09-24 22:51:47 -07:00
redmatrix	2c665e5e4c	add Diaspora (actually any external service which uses the queue) to delivery reports	2015-09-24 17:41:05 -07:00
redmatrix	2fe3d16bbe	Merge https://github.com/redmatrix/hubzilla into pending_merge	2015-09-24 16:58:32 -07:00
redmatrix	2844f276b9	Document the additional content export options	2015-09-24 16:57:17 -07:00
Mario Vavti	b9723aa85b	some heavy private mail restructuring - work in progress	2015-09-24 14:07:44 +02:00
redmatrix	b553ffd55d	timezone tweaks	2015-09-23 20:59:19 -07:00
redmatrix	e45958b967	add plugin hooks to channel sync/import/export	2015-09-23 18:27:04 -07:00
redmatrix	7734bbfe4d	problems with extended item import and signatures	2015-09-22 22:30:09 -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	9baaa6fa56	issue #51	2015-09-21 20:05:54 -07:00
redmatrix	d2565d0f61	looks like chat has been neglected a bit recently	2015-09-20 21:37:18 -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