22359 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
zotlabs	3bd1df52bf	Merge branch 'zap' into dev	2018-09-14 02:19:23 -07:00
zotlabs	097a0e5adc	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-14 02:19:05 -07:00
zotlabs	8505ae4ab2	zot6 import authors in hyperdrive mode	2018-09-14 02:18:07 -07:00
zotlabs	c16fa755a8	Merge branch 'zap' into dev	2018-09-13 22:40:23 -07:00
zotlabs	4b7770f28c	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-13 22:40:11 -07:00
zotlabs	048c5f65e2	old protocol string still showing	2018-09-13 22:39:05 -07:00
zotlabs	26e419e032	hardwire group widget = enabled	2018-09-13 21:25:37 -07:00
zotlabs	55d4973439	Merge commit 'decf21c' into dev	2018-09-13 20:36:13 -07:00
zotlabs	b253aa9f9c	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-13 20:35:54 -07:00
zotlabs	decf21c78b	add privacy groups link	2018-09-13 20:32:44 -07:00
zotlabs	2b39a93e0f	Merge branch 'zap' into dev	2018-09-13 18:44:24 -07:00
zotlabs	980ccf0876	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-13 18:44:05 -07:00
zotlabs	767d1f9889	missing call to actor_store	2018-09-13 18:42:29 -07:00
zotlabs	5cee677014	Merge branch 'zap' into dev	2018-09-13 18:23:00 -07:00
zotlabs	71cc526f7d	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-13 18:22:43 -07:00
zotlabs	abeb19416e	chanview not redirecting properly for z6	2018-09-13 18:19:54 -07:00
zotlabs	1d9c5eb821	Merge branch 'zap' into dev	2018-09-11 22:23:48 -07:00
zotlabs	3fdb9f3cfd	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-11 22:23:32 -07:00
zotlabs	73ae895e5c	abook sync issue	2018-09-11 22:21:31 -07:00
zotlabs	363aba90fb	Merge branch 'zap' into dev	2018-09-11 18:03:38 -07:00
zotlabs	8500c2fb21	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-11 18:03:16 -07:00
zotlabs	acec460c1c	remove linkid for the time being	2018-09-11 18:02:25 -07:00
zotlabs	fda9a36505	Merge branch 'zap' into dev	2018-09-11 17:41:22 -07:00
zotlabs	eb3a5349db	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-11 17:37:54 -07:00
zotlabs	f9b344ac4d	runtime errors	2018-09-11 17:35:31 -07:00
zotlabs	66cd2dc7e4	cleanup	2018-09-11 16:58:26 -07:00
zotlabs	67ae00ae2f	it's alive	2018-09-11 03:36:31 -07:00
zotlabs	04a5ebf8c0	Merge branch 'zap' into dev	2018-09-10 18:39:15 -07:00
zotlabs	e45583c794	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-10 18:37:51 -07:00
zotlabs	f2e8d9f032	more hyperdrive	2018-09-10 18:36:52 -07:00
zotlabs	c960c91a8d	wrong mimetype	2018-09-09 23:29:14 -07:00
zotlabs	44df4d785e	Merge branch 'zap' into dev	2018-09-09 23:23:42 -07:00
zotlabs	ddb50b8de4	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-09 23:17:23 -07:00
zotlabs	44af74af3b	tweaks	2018-09-09 23:16:58 -07:00
zotlabs	c4dc8b9cca	hyperdrive stuff	2018-09-09 23:15:59 -07:00
zotlabs	b837f0b8fc	Merge branch 'red' into dev	2018-09-09 20:59:13 -07:00
zotlabs	abfb17ef33	hyperdrive work	2018-09-09 20:55:51 -07:00
zotlabs	be3b630474	important hyperdrive component	2018-09-09 20:53:20 -07:00
zotlabs	e1b0570690	assorted fixes	2018-09-09 18:28:13 -07:00
zotlabs	39d295462e	merge from downstream	2018-09-07 04:46:57 -07:00
zotlabs	0a36bc3eab	like parents	2018-09-07 04:44:49 -07:00
zotlabs	5079b44d08	undeclared var	2018-09-06 22:52:48 -07:00
zotlabs	235c0a2865	signature changes	2018-09-06 21:55:30 -07:00
zotlabs	6f2284ba18	missing observer	2018-09-06 21:51:52 -07:00
zotlabs	017f1a3c79	optimise	2018-09-06 21:27:09 -07:00
zotlabs	667f8ed920	delivery optimisations	2018-09-06 21:24:56 -07:00
zotlabs	75ecacd88c	use uuid4	2018-09-06 20:21:52 -07:00
zotlabs	176fd2339d	use uuid4, not uuid5	2018-09-06 20:19:44 -07:00
zotlabs	00eeb680d9	set a process timeout for fetching remote xchan photos	2018-09-06 18:33:27 -07:00
zotlabs	61165cbb37	merge	2018-09-06 17:50:45 -07:00