22425 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
zotlabs	9bbaa17b80	Merge branch 'dev'	2018-09-17 23:41:27 -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	0b71807ffe	don't deliver to non-deliverable hosts	2018-09-17 23:38:50 -07:00
zotlabs	1da3b960bd	Merge branch 'dev'	2018-09-17 22:54:12 -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	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	60d2fc097a	Merge branch 'dev'	2018-09-17 13:01:21 -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	01d38494d9	fix install check	2018-09-17 12:58:05 -07:00
zotlabs	d6841635ff	Merge branch 'dev'	2018-09-16 22:08:00 -07:00
zotlabs	30154b0f0b	Merge branch 'zap' into dev	2018-09-16 22:07:35 -07:00
zotlabs	ea2db5d7aa	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-16 22:07:18 -07:00
zotlabs	6d9b38dad8	discover issue	2018-09-16 22:05:04 -07:00
zotlabs	cf64349379	usort : use class function	2018-09-16 22:04:11 -07:00
zotlabs	a94481c73d	Merge branch 'dev'	2018-09-16 21:46:14 -07:00
zotlabs	0eb1752ed5	duplicate	2018-09-16 21:45:44 -07:00
zotlabs	f9c264400b	Merge branch 'dev'	2018-09-16 21:44:09 -07:00
zotlabs	f0266b4837	Merge branch 'zap' into dev	2018-09-16 21:43:20 -07:00
zotlabs	8d565a8305	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-16 21:43:06 -07:00
zotlabs	943edb4c14	simplify AP discovery	2018-09-16 21:42:41 -07:00
zotlabs	0aaaa882ad	simplify activitypub discovery	2018-09-16 21:41:24 -07:00
zotlabs	c3a74b3ece	setup and channel sync fixes from upstream	2018-09-16 20:01:53 -07:00
zotlabs	e38adcef70	Merge branch 'zap'	2018-09-16 18:42:25 -07:00
zotlabs	a8f4091551	Merge branch 'zap' into dev	2018-09-16 18:42:07 -07:00
zotlabs	ee8cdafd92	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-16 18:41:56 -07:00
zotlabs	29f4230474	resolve naming dispute over network app	2018-09-16 18:35:43 -07:00
zotlabs	3c3f395d24	Merge branch 'zap' into dev	2018-09-16 17:06:34 -07:00
zotlabs	72f098e1c0	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-16 17:05:54 -07:00
zotlabs	1856d39237	correct owner attribution	2018-09-16 17:05:39 -07:00
zotlabs	a3e3c93902	consistency	2018-09-16 01:17:25 -07:00
zotlabs	c57e8519dc	Merge branch 'zap' into dev	2018-09-15 16:44:27 -07:00
zotlabs	ac0020979c	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-15 16:44:06 -07:00
zotlabs	cebfeabc41	logic issue	2018-09-15 16:43:44 -07:00
zotlabs	df7605435f	Merge branch 'zap' into dev	2018-09-15 16:21:00 -07:00
zotlabs	34e8a36019	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-15 16:14:52 -07:00
zotlabs	f58c244ba0	refactor include/follow	2018-09-15 16:13:44 -07:00
zotlabs	d67d26564d	bookmark links are deprecated in zap	2018-09-14 16:49:08 -07:00
zotlabs	291f493457	update install guide	2018-09-14 15:23:36 -07:00
zotlabs	cfbb7960c7	revert change to std_version after merging from master	2018-09-14 14:48:29 -07:00
zotlabs	8dd9028654	Merge branch 'master' of https://framagit.org/macgirvin/osada into dev	2018-09-14 14:47:57 -07:00
Mike Macgirvin	771faa04ad	Merge branch 'fix-install-from-url' into 'master' ... Fix Framagit URLs in INSTALL.txt See merge request macgirvin/osada!1	2018-09-14 23:45:49 +02:00
M. Dent	cdd7d75459	Update INSTALL.txt	2018-09-14 23:39:19 +02:00
zotlabs	f08195687b	Merge branch 'zap'	2018-09-14 14:38:50 -07:00
zotlabs	ca752cfb1f	Merge branch 'zap' into dev	2018-09-14 14:38:23 -07:00
zotlabs	d725f9d97f	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-14 14:38:10 -07:00