3094 commits

Author	SHA1	Message	Date
zotlabs	ee0cdbc61a	debug x-zot: protocol requests	2019-02-18 17:28:29 -08:00
zotlabs	82a85d13c9	fixes from upstream - cryptolocker protect and urlencode entries in the category widget(s)	2019-02-18 15:25:41 -08:00
zotlabs	0563c714a7	infrastructure for resolving portable zot urls	2019-02-18 14:40:46 -08:00
zotlabs	e108b7c223	fixes from upstream	2019-02-17 21:45:31 -08:00
zotlabs	4b96c88e50	more removal of unnecessary legacy stuff, string update	2019-02-17 15:00:08 -08:00
zotlabs	e3a5b2fdf8	php warnings	2019-02-14 20:44:34 -08:00
zotlabs	9b36994ef1	Merge ../p3 into dev	2019-02-14 17:08:44 -08:00
zotlabs	db9eae39b8	more string changes	2019-02-14 17:06:17 -08:00
zotlabs	a7ba84e6f2	fix forum detection	2019-02-14 16:25:06 -08:00
zotlabs	f25a48c54a	accesscontrol rename	2019-02-14 16:01:40 -08:00
zotlabs	63a75cc7d5	rename privacy groups to access lists, forums to groups	2019-02-14 15:26:37 -08:00
zotlabs	c72d19dbf2	profile photo edit date weirdness	2019-02-13 21:07:27 -08:00
zotlabs	8b5bc7303f	more work zot+	2019-02-13 19:55:36 -08:00
zotlabs	154b0e96d5	start zot+/zap+	2019-02-13 15:33:45 -08:00
DM42 - Usezot	fbd277b314	Return all listeners	2019-02-11 21:33:41 -05:00
zotlabs	880579f249	change repo locations	2019-02-11 15:55:07 -08:00
zotlabs	329f441fec	remove hyperdrive setting as it does not work reliably in all cases	2019-02-11 15:15:12 -08:00
zotlabs	4bc9620597	expose setting to block public search	2019-02-07 21:05:42 -08:00
zotlabs	e1c82b4e99	suppress duplicates arriving via legacy zot (probably during polling) with legacy message-ids	2019-02-06 20:35:14 -08:00
zotlabs	23a67081d9	misc fixes from the logs and upstream	2019-02-05 19:01:17 -08:00
zotlabs	da09048a7d	linkify_tags fixes from upstream	2019-02-03 16:57:07 -08:00
zotlabs	25c160655f	fix for missing authors and a permission fix from upstream	2019-02-03 11:45:29 -08:00
zotlabs	342f6effe1	regression in latest queue work	2019-02-03 11:21:25 -08:00
zotlabs	9c1159db0a	missing paren	2019-02-01 13:11:20 -08:00
zotlabs	ec88b2e1fa	Merge branch 'dev' of https://framagit.org/macgirvin/osada into dev	2019-02-01 12:48:25 -08:00
zotlabs	77e84a70a9	better handling of tombstones	2019-02-01 12:47:34 -08:00
zotlabs	f31749d4ec	change privacy hover message when $privacy_warning in effect	2019-01-31 16:28:14 -08:00
zotlabs	0f2e991c56	rename the sharing options and update the license for 2019	2019-01-31 15:54:37 -08:00
Mike Macgirvin	002d900514	Merge branch 'patch-20190110a' into 'dev' ... FIX: memory exhaustion on exceptionally large message queues & multiple... See merge request macgirvin/osada!12	2019-01-31 01:31:32 +01:00
zotlabs	ec6297c60b	federation issues with embedded posts	2019-01-29 21:48:45 -08:00
zotlabs	8f861659d2	post embed	2019-01-29 21:26:52 -08:00
zotlabs	9eb9e10712	cache embeds on storage	2019-01-29 15:18:35 -08:00
zotlabs	f5125b51f1	add ical link to activitystreams event objects	2019-01-28 14:58:18 -08:00
zotlabs	3c0d9522b1	issue with fix to reshares	2019-01-27 14:53:24 -08:00
zotlabs	9355ceb526	fn not found	2019-01-27 14:46:57 -08:00
zotlabs	f7f8416477	share fixes	2019-01-27 12:39:28 -08:00
zotlabs	1c3d26fe83	remove unused zot6 'request' verb support	2019-01-26 12:30:18 -08:00
zotlabs	a07ef38902	typo	2019-01-24 19:05:43 -08:00
zotlabs	c43173109e	minor fixes from upstream	2019-01-24 19:03:14 -08:00
zotlabs	0bee1bdb49	missing file	2019-01-23 17:55:39 -08:00
zotlabs	ab9f1ae33c	wordsmithing	2019-01-23 16:18:05 -08:00
zotlabs	045debd26f	issues with autoperms, rewrite owa, upstream fixes to main.js	2019-01-23 14:27:51 -08:00
zotlabs	a4f638124b	content filter app	2019-01-22 19:11:53 -08:00
zotlabs	df5e298628	remove backtrace on zlib/webfinger, no longer needed for troubleshooting	2019-01-21 21:19:41 -08:00
zotlabs	1d3540ac6c	refactor include/follow (Connect::connect()) and update strings	2019-01-21 17:31:24 -08:00
zotlabs	c40a502b0c	provide tracking for errant double json encoding on zot6 transmissions (infrequent)	2019-01-20 19:37:39 -08:00
zotlabs	35f1cee50b	more comment policy work	2019-01-20 15:52:44 -08:00
zotlabs	4350a64f8d	be more specific about hubloc_network	2019-01-20 14:59:43 -08:00
zotlabs	1bdd8b6c52	comment perm issue	2019-01-20 14:39:52 -08:00
zotlabs	289150a21a	updates	2019-01-18 13:04:05 -08:00
zotlabs	f81d2f08d1	cleanup	2019-01-17 15:12:58 -08:00
zotlabs	bf39206518	store item_level to avoid a lot of recursion during rendering	2019-01-14 14:47:05 -08:00
zotlabs	40eb338db5	move ActivityStreams::fetch to Activity::fetch as it now has structural platform dependencies and may require porting.	2019-01-13 21:22:45 -08:00
zotlabs	a611a1cecc	send signed fetches over AP, requeue (queue::update) AP messages on fail, set ajaxasync flag on updates, upstream fixes to mail import	2019-01-13 16:08:26 -08:00
M. Dent	366f7c3fe6	use db_getfunc().	2019-01-11 14:13:56 +01:00
DM42.Net (Matt Dent)	2003e0dbdc	Fix for difference between PGSQL and MYSQL	2019-01-10 15:23:22 -05:00
ZotSocial Admin	35a7fe1994	FIX: memory exhaustion on exceptionally large message queues & multiple Queue.php invocations duplicate work	2019-01-10 13:38:14 -05:00
zotlabs	d3121763f3	make base apps pluggable	2019-01-08 20:34:39 -08:00
zotlabs	66e0c61ebb	separate blacklisting availability for public streams and general communications	2019-01-05 14:47:21 -08:00
zotlabs	7d3c1bd947	wrong variable	2019-01-05 12:46:20 -08:00
zotlabs	64462c9d0d	enable activitypub for encoding collections	2019-01-05 12:42:41 -08:00
zotlabs	c3ab068607	comment policy work	2019-01-05 12:39:19 -08:00
zotlabs	c0e1a03996	crypto issue - undefined variable	2019-01-05 11:17:51 -08:00
zotlabs	921313f0c8	remaining work on slider conversion	2018-12-30 14:36:23 -08:00
zotlabs	4ba9257b9c	slider value updates	2018-12-29 15:40:07 -08:00
zotlabs	77f43d4c4e	fix db update	2018-12-29 14:44:30 -08:00
zotlabs	ff4b1331db	reset system apps	2018-12-29 14:40:10 -08:00
zotlabs	ad55860b00	slider work	2018-12-28 15:13:22 -08:00
zotlabs	a001507577	assorted issues	2018-12-26 15:33:01 -08:00
zotlabs	4dc31a5fc7	allow bypass for hyperdrive setting on announce activities	2018-12-18 23:39:31 -08:00
zotlabs	ad5381545a	affinity slider issues after approving connections	2018-12-17 01:59:17 -08:00
zotlabs	7e4fc5c438	completion of crypto cleanup	2018-12-16 20:37:43 -08:00
zotlabs	8ffbf543c4	upstream fixes	2018-12-15 14:03:20 -08:00
zotlabs	e47bc21034	crypto: switch to Keyutils - please review	2018-12-14 12:46:03 -08:00
zotlabs	b290a631d2	crypto - split off key conversion functions, review required	2018-12-13 17:53:09 -08:00
zotlabs	cb42507e1f	crypto: migration please review	2018-12-13 17:16:01 -08:00
gia vec	cb51317028	Update Activity.php forgot one more ':'	2018-12-13 14:58:41 -08:00
zotlabs	97d051337c	Begin rewrite of crypto library. As I reside in Australia, this is being re-written in stages to allow easy verification by non-Australian developers. Please review this work. It is currently not linked to running code.	2018-12-13 14:47:48 -08:00
zotlabs	ccb6d409fb	provide override	2018-12-13 14:35:14 -08:00
zotlabs	bbc90c4b4f	ebs	2018-12-13 14:14:01 -08:00
zotlabs	b9d1ccbbc3	issues with app ordering	2018-12-12 19:04:59 -08:00
zotlabs	1fa2d111ba	wrong varname	2018-12-12 16:26:30 -08:00
zotlabs	a66c72127a	missing arg in pconfig_get	2018-12-12 15:39:17 -08:00
zotlabs	42fa248f81	prefer zot6 hublocs and xchans when there's a choice.	2018-12-11 21:42:15 -08:00
zotlabs	334bec0f40	strip titles on response activities	2018-12-11 21:03:50 -08:00
zotlabs	c4b3ad8c76	try to gracefully handle multi-protocol xchans/hublocs with the same url	2018-12-11 20:30:47 -08:00
zotlabs	50ad168ad0	issues with language filtering	2018-12-11 15:57:15 -08:00
zotlabs	0a2eae6612	configurable hyperdrive	2018-12-10 23:53:03 -08:00
zotlabs	74d1b11961	use modulus differentiation between thread levels to aid quick comparisons	2018-12-10 21:01:57 -08:00
zotlabs	49f9d5076f	fix home ping results when large number of network posts is present	2018-12-09 14:15:35 -08:00
zotlabs	437b40b04c	code modernisation	2018-12-06 21:54:06 -08:00
zotlabs	bd424cd2dd	change the rules slightly for converting notes to articles. We got a lot of false positives	2018-12-05 15:27:07 -08:00
zotlabs	52e5cee217	dilithium crystals were 2nd quality	2018-12-04 21:51:56 -08:00
zotlabs	9166c0cc87	re-use of wrong query result	2018-12-04 19:57:28 -08:00
zotlabs	963d799144	not needed	2018-12-04 16:26:21 -08:00
zotlabs	c163ebcf8b	new dimensions in hyperspace	2018-12-04 16:20:54 -08:00
zotlabs	a516b82cef	update inbox location if it changes	2018-12-04 03:24:41 -08:00
zotlabs	643214917d	misc fixes, plus add cover photo and profile "about" to AP actor document	2018-12-03 21:45:35 -08:00
zotlabs	a47aae22d0	more work on zap missing parents	2018-12-02 21:51:45 -08:00
zotlabs	b3d36b0c7c	thread issues	2018-12-02 20:24:12 -08:00
zotlabs	580642a8a0	issues with conversation completion which included AP messages	2018-12-02 16:46:52 -08:00
zotlabs	7ebf204b53	change reply label	2018-12-02 15:52:20 -08:00
zotlabs	cb59d4a144	thread support	2018-12-02 14:39:58 -08:00
zotlabs	4cd565930c	allow notification filtering by name or addr	2018-11-30 19:01:10 -08:00
zotlabs	f4cfa8876f	prevent update 1223 from exhausting mysql data limits	2018-11-26 18:29:26 -08:00
zotlabs	ee4c181801	fix comment policy for zot6 delivery of AP messages	2018-11-26 16:16:07 -08:00
zotlabs	d67392ff26	remove post_wall permission from the Osada side since those messages will not federate over AP	2018-11-25 14:20:34 -08:00
zotlabs	2ee719abc0	actor type = Organization wasn't being recognised.	2018-11-23 12:18:19 -08:00
zotlabs	b722b87041	new activitypub forum implementation (compatible with mastodon)	2018-11-22 17:04:28 -08:00
zotlabs	00fb137164	more tag stuff	2018-11-21 21:05:08 -08:00
zotlabs	686585c703	consistency in iconfig names	2018-11-21 19:04:42 -08:00
zotlabs	a21d412409	typo	2018-11-21 18:27:19 -08:00
zotlabs	530a377982	more forum work	2018-11-21 18:24:45 -08:00
zotlabs	e253a25025	forum work	2018-11-21 17:46:08 -08:00
zotlabs	6dc45a9644	fix wildcard blacklist checking	2018-11-20 21:50:41 -08:00
zotlabs	7b23312af7	config rework fixes	2018-11-20 19:32:15 -08:00
zotlabs	67ebc86812	config updates	2018-11-20 19:15:15 -08:00
zotlabs	f10ed01fac	hardening	2018-11-20 18:55:33 -08:00
zotlabs	69ebb48efa	some actor records not updated after cache timeout	2018-11-19 20:50:58 -08:00
zotlabs	6f098fdc74	typo	2018-11-19 18:52:10 -08:00
zotlabs	7cc762dcea	add more schema validation to clone sync activities	2018-11-19 17:30:22 -08:00
zotlabs	8f6b1c1239	comment delivery issue	2018-11-18 21:53:09 -08:00
zotlabs	e86d864bab	datetime_convert wrong args	2018-11-15 21:12:59 -08:00
zotlabs	af6a52ffe3	misc cleanup from hubzilla	2018-11-15 20:52:08 -08:00
zotlabs	1f29a86580	update missing addr's on actor_store, send Page urls through linkinfo to make the content more interesting	2018-11-13 17:23:09 -08:00
zotlabs	c9c26fba1c	parsing issue with prismo	2018-11-12 19:38:21 -08:00
zotlabs	5604952809	mention issue	2018-11-11 19:16:22 -08:00
zotlabs	8fb97e9e16	php warning	2018-11-11 19:13:11 -08:00
zotlabs	30b5902496	regression	2018-11-11 18:51:05 -08:00
zotlabs	0e124bb0da	change directory default	2018-11-11 18:31:48 -08:00
zotlabs	a4088ec4bf	more repair of malformed xchan storage	2018-11-08 17:02:04 -08:00
zotlabs	bc688da078	incorrect ids on some Mastodon xchans	2018-11-08 15:00:33 -08:00
zotlabs	1bf150398e	implement update-person activity	2018-11-07 20:29:14 -08:00
zotlabs	fc63913421	Mastodon notification issues	2018-11-07 18:24:22 -08:00
zotlabs	b58c032b8f	osada issue #6 - enforce Mastodon advisory privacy on hyper-drive imported items	2018-11-07 15:31:11 -08:00
zotlabs	b590ad1b3f	minor warning	2018-11-05 18:47:21 -08:00
zotlabs	ced3fe7aa5	Merge branch 'dev' of https://framagit.org/macgirvin/osada into dev	2018-11-04 17:19:23 -08:00
zotlabs	cb9e81a1d3	route mismatch for comments between osada and zap	2018-11-04 17:18:12 -08:00
Mike Macgirvin	709da04938	Merge branch 'patch-20181103c' into 'dev' ... Fix spurrious error for sites without images See merge request macgirvin/osada!8	2018-11-04 08:51:41 +01:00
Mike Macgirvin	e40d3fcaf7	Merge branch 'patch-20181103b' into 'dev' ... Fix array_key_exists with non-array error See merge request macgirvin/osada!7	2018-11-04 08:50:44 +01:00
DM42.Net (Matt Dent)	8a2e9ec9e6	Fix spurrious error for sites without images	2018-11-03 12:11:17 -04:00
DM42.Net (Matt Dent)	4157a0b52f	Fix missing paren	2018-11-03 10:26:20 -04:00
DM42.Net (Matt Dent)	916a2e0d0e	Fix array_key_exists with non-array error	2018-11-03 10:20:18 -04:00
M.Dent	35aa253ff0	Fix not array, is hash	2018-11-03 10:08:09 -04:00
zotlabs	b20032a61d	compatibility fix for prismo 'Page' types and fix from upstream for scaled images	2018-11-01 16:53:45 -07:00
zotlabs	8c860d04ce	updates from upstream	2018-10-30 15:42:52 -07:00
zotlabs	d9170c6617	more photo object work	2018-10-28 21:01:58 -07:00
zotlabs	7e3c8e46e7	turn photos into proper AS objects (still need to fix the places where they were turned into Note for short-term compatibility)	2018-10-28 20:39:01 -07:00
zotlabs	516a375fff	fix embed photos from albums and phase1 of the forum count bug from hubzilla and the edit post breaking delivery chain bug also from hubzilla	2018-10-27 14:30:07 -07:00
zotlabs	5c58abd801	superblock leaking through enotify::format	2018-10-25 22:12:47 -07:00
zotlabs	df1000a8a0	add tag_deliver permission to discovered activitypub groups	2018-10-24 22:43:00 -07:00
zotlabs	d2cc723e11	separate pubsites page into separate projects	2018-10-23 17:49:08 -07:00
zotlabs	1898ca3216	strings	2018-10-23 15:36:48 -07:00
Mike Macgirvin	441b65c030	mv blueimp library to composer, remove duplicate copy in library	2018-10-23 11:00:33 +11:00
zotlabs	55a4fa44a2	secondary delivery issue	2018-10-21 18:05:32 -07:00
zotlabs	8993466023	wrong verb on announce notifications	2018-10-20 15:12:23 -07:00
zotlabs	6378cb8f27	miscellaneous fixes, unset project icon, onepoll feed failure	2018-10-20 02:03:31 -07:00
zotlabs	699cd0de85	remove singleton code on activitypub	2018-10-18 17:37:34 -07:00
zotlabs	dabd21008f	fix branding in email notifications	2018-10-17 21:11:29 -07:00
zotlabs	aeb282d9c1	share improvements	2018-10-17 16:08:43 -07:00
zotlabs	cd2c3f7127	share issue on zot6 side	2018-10-17 15:51:23 -07:00
zotlabs	6b1f3eeae6	still some mention url weirdness but this might get past pleroma's parser	2018-10-17 01:26:23 -07:00
zotlabs	89130e78b7	also block upstream swimmers to the source_xchan in a downstream flow	2018-10-16 22:33:45 -07:00
zotlabs	48363c2cab	event AP endpoint update	2018-10-16 20:42:44 -07:00
zotlabs	134dd8d653	setup fixes	2018-10-16 20:25:37 -07:00
zotlabs	8c74cfb6a9	better formatting of rsvp reactions	2018-10-16 20:07:45 -07:00
zotlabs	21301adfd3	owa issue	2018-10-16 19:32:17 -07:00
zotlabs	38b54f55d1	event formatting and rsvp parenting	2018-10-16 13:56:46 -07:00
zotlabs	5c456461cf	bug - regression	2018-10-15 19:41:17 -07:00
zotlabs	eda156a5bb	regression in socgraph	2018-10-15 19:29:32 -07:00
zotlabs	79ab759d58	php warnings	2018-10-15 18:52:55 -07:00
zotlabs	4ee5755bc6	peertube improvements, missing host in dreport	2018-10-15 18:27:03 -07:00
zotlabs	986f385bdd	wrong content for announce activities when the object originated on osada	2018-10-15 01:21:47 -07:00
zotlabs	8dd30c5f7a	php warning removing ap connnection	2018-10-14 22:42:55 -07:00
zotlabs	c82d1b03fa	missing quote	2018-10-14 19:02:15 -07:00
zotlabs	7fca42bec6	better response handling	2018-10-14 15:47:57 -07:00
zotlabs	23256b5b1a	update banner	2018-10-13 17:53:17 -07:00
zotlabs	8119fe2e5a	merge bbcode summary with actual summary	2018-10-13 00:37:22 -07:00
zotlabs	4af3f25c15	remove nav link override, turn announce activities into sourced items	2018-10-11 21:05:30 -07:00
zotlabs	63faaa1b55	improve check for media inclusion	2018-10-11 16:54:31 -07:00
zotlabs	d9bdd894af	missing content-length for sigs	2018-10-11 01:02:34 -07:00
zotlabs	4ad47bae64	typo	2018-10-10 21:46:33 -07:00
zotlabs	9238ec9f68	don't auto-insert mentions in Zap comments	2018-10-10 21:39:33 -07:00
zotlabs	9f5520325f	multiple photo issue	2018-10-10 21:36:55 -07:00
zotlabs	31fd804c6b	regression found in auto author mention	2018-10-10 21:27:15 -07:00
zotlabs	c998a084da	auto mention comment authors; up to 6 total. If more, select the first and last 3 and always exclude yourself.	2018-10-10 20:24:28 -07:00
zotlabs	84552ef9d5	better handling of tombstones, schema changes from upstream	2018-10-10 18:53:26 -07:00
zotlabs	c9bcde817a	the rest of the bits	2018-10-10 17:58:51 -07:00
zotlabs	c5a886ffea	missed a fix	2018-10-09 22:32:20 -07:00
zotlabs	3a8d916702	better signature handling	2018-10-09 21:08:57 -07:00
zotlabs	b66312e408	status editor hook	2018-10-08 21:27:35 -07:00
zotlabs	c2b8829f9d	hubzilla core issue #1278	2018-10-07 22:15:46 -07:00
zotlabs	1dc002c4fd	wrong mime type	2018-10-07 20:37:34 -07:00
zotlabs	87587c40d3	rework the banner code	2018-10-07 19:54:25 -07:00
zotlabs	4d76e4a99f	default icon	2018-10-07 19:44:27 -07:00
zotlabs	a5455fa049	add personal filter and fix api zot-auth	2018-10-07 15:51:52 -07:00
zotlabs	d39fd52f16	one more try altering content so it will get through Mastodon's content mangler	2018-10-04 21:40:16 -07:00
zotlabs	d64e67b18c	fix affinity settings, use export var on bbcode destined for ActivityPub recipients to strip out map and embed scripts	2018-10-04 21:16:20 -07:00
zotlabs	9424a7f56b	app updates from red/hubzilla	2018-10-04 20:29:41 -07:00
zotlabs	be7cb76651	group support	2018-10-04 18:40:57 -07:00
zotlabs	2f48679fef	fix import/export after project merger	2018-10-04 13:45:20 -07:00
zotlabs	02d0256449	fix masto images (again)	2018-10-04 02:19:08 -07:00
zotlabs	6a71ffe2c2	correct the servername	2018-10-03 19:31:47 -07:00
zotlabs	bd5d6158a1	zap/osada repo merger	2018-10-03 19:10:52 -07:00
M.Dent	404b7d48dc	Fix import_xchan function not found	2018-09-27 23:13:00 -04:00
zotlabs	cdee25ea1b	sql error	2018-09-25 23:50:35 -07:00
zotlabs	0460814158	channel signing issue	2018-09-25 20:41:06 -07:00
zotlabs	290b8b58ec	rename groups and group_members tables	2018-09-25 17:50:59 -07:00
zotlabs	6f6d54d378	cleanup	2018-09-25 17:50:12 -07:00
zotlabs	cd8150f20d	push version	2018-09-23 18:23:28 -07:00
zotlabs	f1ed64efe4	fixes	2018-09-23 17:03:10 -07:00
zotlabs	54bfc4a88d	delivery issues	2018-09-21 16:29:13 -07:00
zotlabs	382551e4b4	strip bbcode from event titles	2018-09-20 22:50:12 -07:00
zotlabs	6221d2b1bb	php warning	2018-09-20 17:17:41 -07:00
zotlabs	1a3d9ca91b	better handling of masto approve	2018-09-19 23:53:26 -07:00
zotlabs	d69b88e793	Merge branch 'zap' into dev	2018-09-19 22:50:47 -07:00
zotlabs	8b123f57ad	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-19 22:47:25 -07:00
zotlabs	e76d2201bf	better handling of media objects	2018-09-19 22:47:03 -07:00
zotlabs	7d8cbb01bb	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-19 22:01:11 -07:00
zotlabs	8e4f5007b4	button to add conversation mentions in comments	2018-09-19 22:00:29 -07:00
zotlabs	3b688d678e	typo	2018-09-19 21:42:54 -07:00
zotlabs	551314201c	Merge branch 'zap' into dev	2018-09-19 20:48:14 -07:00
zotlabs	202c96eb77	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-19 20:48:00 -07:00
zotlabs	14ad70c587	thread author mentioning (begin)	2018-09-19 20:47:31 -07:00
Mike Macgirvin	529171de8f	Merge branch 'dev' of https://framagit.org/macgirvin/zap into dev	2018-09-20 12:36:29 +10:00
zotlabs	92b2d17297	Merge branch 'zap' into dev	2018-09-19 17:55:15 -07:00
zotlabs	b95f41571c	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-19 17:54:07 -07:00
zotlabs	45ece3c6c5	item fix	2018-09-19 17:53:49 -07:00
zotlabs	e98ca4af20	fix item, setup	2018-09-19 17:52:21 -07:00
zotlabs	9725e55eb9	Merge branch 'dev'	2018-09-19 16:29:29 -07:00
zotlabs	0bc76e85e4	Merge branch 'zap' into dev	2018-09-19 16:26:36 -07:00
zotlabs	fd0de5fc12	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-19 16:26:05 -07:00
zotlabs	c0f8940b60	indicate cached records	2018-09-19 16:25:05 -07:00
zotlabs	d3b28b718c	Merge branch 'red' into dev	2018-09-18 20:51:38 -07:00
zotlabs	0709d0f08e	Merge branch 'zap' into dev	2018-09-17 23:41:03 -07:00
zotlabs	ab3d3b029e	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-17 23:40:45 -07:00
zotlabs	9f14cd4b3c	missing connect link if no xchan_addr	2018-09-17 23:40:17 -07:00
zotlabs	6667554916	missing connect link if no xchan_addr	2018-09-17 23:34:33 -07:00
zotlabs	f2d3fd0f1a	Merge branch 'zap' into dev	2018-09-17 22:53:51 -07:00
zotlabs	f6c5e9e610	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-17 22:53:38 -07:00
zotlabs	b16e5716b7	Merge branch '1.0'	2018-09-17 22:53:19 -07:00
zotlabs	5c21236dc1	Merge branch 'dev' into 1.0	2018-09-17 22:53:04 -07:00
zotlabs	f2c99480f0	generate better photo and event activities	2018-09-17 22:51:27 -07:00
zotlabs	f0b6952585	generate full actor record on follow json	2018-09-17 22:50:06 -07:00
zotlabs	dfdf11d461	Merge branch 'dev'	2018-09-17 19:38:40 -07:00
zotlabs	cc5ef57843	fix listeners table create and expire federation had a syntax error	2018-09-17 18:40:49 -07:00
zotlabs	fdc89d1b89	pdo install check requires namespacing	2018-09-17 13:03:17 -07:00
zotlabs	390a570b51	Merge branch 'zap' into dev	2018-09-17 13:00:40 -07:00
zotlabs	926c63ee84	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-17 13:00:02 -07:00
zotlabs	79af06d6e1	Merge branch 'dev'	2018-09-17 12:58:54 -07:00