22569 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
zotlabs	05a6ce58a5	Merge branch '1.2'	2018-09-23 18:24:02 -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	380f5f0d88	php warning	2018-09-20 17:18:30 -07:00
zotlabs	6221d2b1bb	php warning	2018-09-20 17:17:41 -07:00
zotlabs	a18add6ea2	better handling of masto approve	2018-09-19 23:54:11 -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	1c368e8d7a	Merge branch 'dev'	2018-09-19 22:02:33 -07:00
zotlabs	fd71d6c36c	Merge branch 'zap' into dev	2018-09-19 22:01:26 -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	ee23165208	Merge branch 'dev'	2018-09-19 20:48:38 -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
zotlabs	d6f3867c06	ACTIVITY_CREATE defined twice	2018-09-19 20:45:42 -07:00
Mike Macgirvin	529171de8f	Merge branch 'dev' of https://framagit.org/macgirvin/zap into dev	2018-09-20 12:36:29 +10:00
Mike Macgirvin	8b18c99058	reset version	2018-09-20 12:35:16 +10:00
Mike Macgirvin	ca5c5ac0b0	package update	2018-09-20 12:30:39 +10:00
zotlabs	e74c9b7909	Merge branch 'dev'	2018-09-19 17:55:34 -07: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	4f4e892995	Merge branch 'dev'	2018-09-19 16:28:15 -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	a8b582dd58	this was needed	2018-09-18 23:19:50 -07:00
zotlabs	d3b28b718c	Merge branch 'red' into dev	2018-09-18 20:51:38 -07:00
zotlabs	7756773683	missing autocomplete (e.g. mentions) in mod_photos comments	2018-09-18 19:52:10 -07:00
zotlabs	9da9541871	Merge branch 'dev'	2018-09-18 17:49:37 -07:00
zotlabs	ce70411a6c	Merge branch 'zap' into dev	2018-09-18 17:49:14 -07:00
zotlabs	75a39d5e91	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-18 17:48:58 -07:00
zotlabs	ac51c2ab00	Merge branch 'dev'	2018-09-18 17:47:44 -07:00
zotlabs	f099d0878d	double dbesc in item_store_update	2018-09-18 17:46:46 -07:00
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	6667554916	missing connect link if no xchan_addr	2018-09-17 23:34:33 -07:00
zotlabs	1da3b960bd	Merge branch 'dev'	2018-09-17 22:54:12 -07:00