22599 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
zotlabs	c4ea93e6a6	better signature handling	2018-10-09 21:11:29 -07:00
zotlabs	2e9e82662a	Merge branch 'master' of https://framagit.org/macgirvin/osada	2018-10-04 22:10:34 -07:00
zotlabs	4ac89e0dd2	version	2018-10-04 22:04:45 -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	4c758c73aa	define platform_name after reading htconfig	2018-10-03 19:23:59 -07:00
zotlabs	bd5d6158a1	zap/osada repo merger	2018-10-03 19:10:52 -07:00
M.Dent	dff1f12e05	Fix import_xchan function not found	2018-09-27 22:05:27 -07:00
Mike Macgirvin	aa76164fa2	Merge branch 'magicauth' into 'dev' ... Fix import_xchan function not found See merge request macgirvin/osada!3	2018-09-28 07:03:38 +02:00
M.Dent	404b7d48dc	Fix import_xchan function not found	2018-09-27 23:13:00 -04:00
zotlabs	efb0a4d4f2	postgres pgrp fix	2018-09-27 17:14:42 -07:00
zotlabs	f82bb1695d	postgres pgrp fix	2018-09-27 17:13:58 -07:00
zotlabs	6277969cd6	Merge branch '1.2'	2018-09-26 16:37:23 -07:00
zotlabs	04ef99964a	reset version	2018-09-26 16:37:02 -07:00
zotlabs	8adc613ae4	Merge branch 'dev' into 1.2	2018-09-26 16:36:27 -07:00
zotlabs	951e56194a	sql error	2018-09-25 23:51:51 -07:00
zotlabs	0d0b4e8a6b	sql error	2018-09-25 23:51:15 -07:00
zotlabs	cdee25ea1b	sql error	2018-09-25 23:50:35 -07:00
zotlabs	b990758e5c	channel signing issue	2018-09-25 20:41:45 -07:00
zotlabs	9bec428297	channel signing issue	2018-09-25 20:41:37 -07:00
zotlabs	0460814158	channel signing issue	2018-09-25 20:41:06 -07:00
zotlabs	ac9f5b4e77	rename groups and group_members tables	2018-09-25 17:51:27 -07:00
zotlabs	cf0df9a507	rename groups and group_members tables	2018-09-25 17:51:17 -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	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