2134 commits

Author	SHA1	Message	Date
zotlabs	9bbad0db91	minor updates	2019-04-26 15:15:15 -07:00
zotlabs	0aa017d242	rework admin page	2019-04-17 21:40:35 -07:00
zotlabs	c4824f6fd5	add photo.expires	2019-04-15 23:03:16 -07:00
zotlabs	fd600a57fa	cleanup	2019-04-15 17:34:29 -07:00
zotlabs	5cb0e7600b	some cleanup	2019-04-11 20:26:38 -07:00
zotlabs	736714decf	repeating event work and some fixes from upstream	2019-04-10 23:45:24 -07:00
zotlabs	0e8f34021e	schema mods for recurring events	2019-04-10 00:20:41 -07:00
zotlabs	74b59450f8	rev update	2019-04-07 18:09:07 -07:00
zotlabs	8f4a3723da	the rest of the stuff to support collections	2019-04-03 16:22:03 -07:00
Mike Macgirvin	e875a2b6a7	fix version	2019-04-02 06:28:11 +11:00
Mike Macgirvin	691ecb4c0b	Merge branch 'master' of https://gitlab.com/macgirvin/zap	2019-03-31 10:01:29 +11:00
Mike Macgirvin	c00f5118a0	Merge branch 'dev' of https://gitlab.com/macgirvin/zap	2019-03-31 10:00:19 +11:00
zotlabs	5bcf392816	add hierarchy to channels for collection support and other purposes	2019-03-29 13:27:23 -07:00
zotlabs	4a98388904	rev update	2019-03-27 21:18:02 -07:00
zotlabs	26f31b9926	Merge branch 'dev'	2019-03-27 21:17:30 -07:00
zotlabs	4d48f5e7bf	make moderation notifications go to the right place	2019-03-27 19:20:35 -07:00
zotlabs	1595bdc2aa	cleanup/remove unused xchan fields	2019-03-24 18:40:33 -07:00
zotlabs	dd2c86aaf9	Merge branch 'dev'	2019-03-19 15:25:32 -07:00
zotlabs	b9c0c4e282	rev update	2019-03-17 17:34:57 -07:00
zotlabs	d4e1c9943b	Merge branch 'dev'	2019-03-17 17:27:38 -07:00
zotlabs	a1af668815	more work to support collections	2019-03-05 17:27:16 -08:00
zotlabs	1aa56aa76b	add moderated permission	2019-02-28 15:14:22 -08:00
zotlabs	725f7e18ed	bump version	2019-02-25 15:44:31 -08:00
zotlabs	25037b579c	bump version	2019-02-25 15:43:50 -08:00
zotlabs	ef078665a0	Merge branch 'dev'	2019-02-25 15:42:28 -08:00
zotlabs	c5b267a21e	rev update	2019-02-24 15:15:44 -08:00
zotlabs	466de65b35	add item uuid	2019-02-19 14:59:22 -08:00
zotlabs	bbee00d47a	update for 2.4RC	2019-02-17 21:07:21 -08:00
zotlabs	8b5bc7303f	more work zot+	2019-02-13 19:55:36 -08:00
zotlabs	23a67081d9	misc fixes from the logs and upstream	2019-02-05 19:01:17 -08:00
zotlabs	75cb386eb6	rev update	2019-01-18 13:18:47 -08:00
zotlabs	bf39206518	store item_level to avoid a lot of recursion during rendering	2019-01-14 14:47:05 -08:00
zotlabs	ff4b1331db	reset system apps	2018-12-29 14:40:10 -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	4deda0c9fe	rev update	2018-12-09 14:16:23 -08:00
zotlabs	67ebc86812	config updates	2018-11-20 19:15:15 -08:00
zotlabs	8f6b1c1239	comment delivery issue	2018-11-18 21:53:09 -08:00
zotlabs	0adf2f3290	rev update	2018-11-11 17:49:38 -08:00
zotlabs	fc63913421	Mastodon notification issues	2018-11-07 18:24:22 -08:00
zotlabs	6378cb8f27	miscellaneous fixes, unset project icon, onepoll feed failure	2018-10-20 02:03:31 -07:00
zotlabs	b40115111d	rev update	2018-10-16 20:59:54 -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
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	551314201c	Merge branch 'zap' into dev	2018-09-19 20:48:14 -07:00
zotlabs	d6f3867c06	ACTIVITY_CREATE defined twice	2018-09-19 20:45:42 -07:00
Mike Macgirvin	8b18c99058	reset version	2018-09-20 12:35:16 +10:00