22235 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
zotlabs	9b2ae5396e	Merge branch 'zap'	2018-09-01 15:56:15 -07:00
zotlabs	b3ef8d355a	Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-01 15:53:09 -07:00
zotlabs	8e7fb44896	local compatibility fixes	2018-09-01 15:52:28 -07:00
zotlabs	0954afb321	compatibility fixes	2018-09-01 15:51:44 -07:00
zotlabs	c13c713e19	follow issue	2018-08-30 22:30:58 -07:00
zotlabs	9282a6a40b	Merge branch 'zap'	2018-08-30 21:30:46 -07:00
zotlabs	fc6f5fc320	Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap	2018-08-30 21:29:21 -07:00
zotlabs	d00648f3e1	Merge branch 'red'	2018-08-30 21:27:20 -07:00
zotlabs	adb1f58b59	some edge cases	2018-08-30 19:19:32 -07:00
zotlabs	2b0c512087	re-parent by default unless there's a "go out on the web and find a parent for this post" plugin.	2018-08-30 18:50:21 -07:00
Mario	c5ce9b0699	Merge branch 'call-hooks-optimization' into 'dev' ... Micro-optimization to call_hooks() See merge request hubzilla/core!1267	2018-08-30 10:09:00 +02:00
Mario	c74a7ce4fc	Merge branch 'add-delivery-status-info' into 'dev' ... Add dreport_process hook See merge request hubzilla/core!1266	2018-08-30 10:07:18 +02:00
zotlabs	62e2df4c96	add conversation element and more logging	2018-08-29 23:54:13 -07:00
zotlabs	c48aae55af	more debugging	2018-08-29 22:22:06 -07:00
zotlabs	89d1be0343	better format of like/dislike text, grab object['id'] if inreplyto missing for these activities	2018-08-29 20:02:27 -07:00
Mario Vavti	d98ed68749	html-to-markdown adds a backslash infront of a hash after each new line - manualy remove those	2018-08-29 16:16:17 +02:00
M.Dent	70d6d2f2db	Micro-optimization to call_hooks()	2018-08-29 10:02:04 -04:00
M.Dent	da441c59f6	Add dreport_process hook	2018-08-29 08:58:49 -04:00
Mario Vavti	42093aedcf	db update to get rid of bogus activitypub xchans which got created due to a bug in the pubcrawl addon	2018-08-29 13:57:36 +02:00
Mario Vavti	74d80473df	Merge remote-tracking branch 'mike/master' into dev	2018-08-29 11:50:40 +02:00
zotlabs	ed5146f584	typo	2018-08-29 02:28:13 -07:00
zotlabs	969a68ac36	connect perms	2018-08-29 02:20:43 -07:00
zotlabs	ed4aa90338	connect perms	2018-08-29 02:19:32 -07:00
zotlabs	37f97fc986	mod_nullbox - which we will require for federation outside ActivityPub	2018-08-28 23:36:27 -07:00
zotlabs	7ecb337405	redirect stdout/stderr on cron command	2018-08-28 22:43:37 -07:00
zotlabs	cf8e787427	issues uncovered in federation tests	2018-08-28 19:49:30 -07:00
zotlabs	896d25d7ae	ap discovery issues	2018-08-28 18:37:21 -07:00
Mario Vavti	07792adc56	add paragonie and symfonie since ramsey/uuid appears to require them	2018-08-28 12:06:36 +02:00
Mario Vavti	c0c827d3ad	update composer libs and add ramsey/uuid	2018-08-28 12:00:23 +02:00
zotlabs	32c1942388	Merge branch 'zap'	2018-08-27 20:09:02 -07:00
zotlabs	2e7ed7b09c	Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap	2018-08-27 20:08:51 -07:00
zotlabs	4ed37e3b33	items need to be encoded	2018-08-27 20:08:17 -07:00
zotlabs	d7455e42c9	Merge branch 'zap'	2018-08-27 19:41:12 -07:00
zotlabs	68cc3d3048	Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap	2018-08-27 19:40:59 -07:00
zotlabs	aef7fc5702	use a full array	2018-08-27 19:40:19 -07:00
zotlabs	6cd48cbe83	handling linkid differently, remove this	2018-08-27 19:21:48 -07:00
zotlabs	25466def83	Merge branch 'zap'	2018-08-27 19:14:53 -07:00
zotlabs	fca5df656c	Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap	2018-08-27 19:14:34 -07:00
zotlabs	aeffec1a99	typo	2018-08-27 19:13:55 -07:00
zotlabs	17ed268f9e	Merge branch 'zap'	2018-08-27 19:12:46 -07:00
zotlabs	1da14932e7	Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap	2018-08-27 19:12:28 -07:00
zotlabs	199026bf6d	typo	2018-08-27 19:12:00 -07:00
zotlabs	23d89071b9	Merge branch 'zap'	2018-08-27 19:10:34 -07:00
zotlabs	8b297e7630	Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap	2018-08-27 19:10:20 -07:00
zotlabs	08e8f026f0	typo	2018-08-27 19:09:48 -07:00
zotlabs	bc167e80ee	Merge branch 'zap'	2018-08-27 18:59:52 -07:00
zotlabs	90b02001fa	Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap	2018-08-27 18:59:32 -07:00
zotlabs	b8ee94c00a	id linkage	2018-08-27 18:58:47 -07:00
Mario Vavti	6a2bbed73d	remove distinct from network query again until performance issue is resolved or another fix for the underlying problem is found	2018-08-27 10:19:10 +02:00
Mario	4c1944a08d	Merge branch 'extend-convitems-dropdown' into 'dev' ... Extend cog dropdown & temp fix for feed display of corrupt mids See merge request hubzilla/core!1265	2018-08-27 10:02:58 +02:00