1694 commits

Author	SHA1	Message	Date
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	d3b28b718c	Merge branch 'red' into dev	2018-09-18 20:51:38 -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	dfdf11d461	Merge branch 'dev'	2018-09-17 19:38:40 -07:00
zotlabs	fdc89d1b89	pdo install check requires namespacing	2018-09-17 13:03:17 -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
Mario Vavti	a9853e6033	seperate settings for mod network	2018-09-17 11:36:11 +02:00
Mario Vavti	dcacfc1124	Merge remote-tracking branch 'mike/master' into dev	2018-09-17 10:31:13 +02:00
Mario Vavti	2f6cb764a4	prepare submodule to interact with route	2018-09-17 10:30:47 +02: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	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	593a5072d9	Some improvements to setup checks: image library and pdo support	2018-09-16 20:00:20 -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
Mario Vavti	07cd1d1272	appification of the lang module	2018-09-16 09:30:07 +02:00
Mario Vavti	791ff25d52	appify poke	2018-09-15 11:09:16 +02:00
Mario Vavti	299eb469f8	appify mood	2018-09-15 11:00:41 +02:00
Mario Vavti	0f9a8a43e4	appify invite	2018-09-15 10:48:51 +02:00
Mario Vavti	7856f5882b	appify cdav stuff. WARNING: if you use caldav or carddav from a client or the webinterface you will need to enable those apps to make things work again	2018-09-15 10:10:43 +02:00
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	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
Mario Vavti	869534fafa	remove network_tabs() which has been deprecated and replaced by activity_{order, filters} widgets	2018-09-13 11:53:59 +02:00
Mario Vavti	56f88f2e30	move chat from feature to apps	2018-09-13 11:32:43 +02:00
Mario Vavti	a1d5ce3716	remove profile_tabs() which has been deprecated and replaced by channel_apps()	2018-09-13 10:59:37 +02:00
Mario Vavti	2651eae663	mpre feature to app transition	2018-09-12 11:08:53 +02: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	67ae00ae2f	it's alive	2018-09-11 03:36:31 -07:00
Mario Vavti	28e4977c33	include item.title in /network and /channel search	2018-09-11 11:16:58 +02: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
Mario Vavti	c6abe87ec2	move cards from features to apps	2018-09-10 13:34:05 +02:00
zotlabs	c960c91a8d	wrong mimetype	2018-09-09 23:29:14 -07:00