22572 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Mario Vavti	28e4977c33	include item.title in /network and /channel search	2018-09-11 11:16:58 +02:00
zotlabs	adc164b825	Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge	2018-09-10 22:11:26 -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
Max Kostikov	66bf55710e	Update network.php	2018-09-10 15:13:28 +02:00
Mario Vavti	c6abe87ec2	move cards from features to apps	2018-09-10 13:34:05 +02:00
Mario Vavti	4bb16b18ed	cover photo: mior issue and more cleanup	2018-09-10 12:12:05 +02:00
Mario Vavti	4cc413cdaf	cover photo: some code cleanup and fix height issue when photo was not cached	2018-09-10 11:12:15 +02: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
Mario Vavti	677ad71b96	fix some issues with latest notification improvements	2018-09-09 19:44:27 +02:00
Mario Vavti	9607bb29fd	missing text	2018-09-07 14:58:16 +02:00
Mario Vavti	d29415a6e2	provide a noscript_content switch for mod channel and display	2018-09-07 14:23:16 +02:00
zotlabs	20520b2ecc	merge from downstream	2018-09-07 04:47:53 -07:00
zotlabs	39d295462e	merge from downstream	2018-09-07 04:46:57 -07:00
zotlabs	9444677be0	like parents	2018-09-07 04:45:39 -07:00
zotlabs	0a36bc3eab	like parents	2018-09-07 04:44:49 -07:00
Mario Vavti	54fa28441c	install bootstrap via composer	2018-09-07 11:26:02 +02:00
Mario Vavti	bb42ec2bfc	apps: change page title to available/installed, display install action label in button and use different icons for installable and updateable apps	2018-09-07 10:39:15 +02:00
Mario Vavti	d31251c54e	overflow should be auto not visible	2018-09-07 10:07:29 +02:00
zotlabs	df608fd24d	undeclared var	2018-09-06 22:53:33 -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	966ca0666a	missing observer	2018-09-06 21:54:40 -07:00
zotlabs	6f2284ba18	missing observer	2018-09-06 21:51:52 -07:00
zotlabs	589fbdb71a	optimise	2018-09-06 21:27:43 -07:00
zotlabs	017f1a3c79	optimise	2018-09-06 21:27:09 -07:00
zotlabs	a403852d89	delivery optimisations	2018-09-06 21:25:38 -07:00
zotlabs	667f8ed920	delivery optimisations	2018-09-06 21:24:56 -07:00
zotlabs	7dc4f64616	use uuid4	2018-09-06 20:22:31 -07:00
zotlabs	75ecacd88c	use uuid4	2018-09-06 20:21:52 -07:00
zotlabs	4bfc438d9f	use uuid4, not uuid5	2018-09-06 20:20:29 -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