22550 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
zotlabs	61165cbb37	merge	2018-09-06 17:50:45 -07:00
zotlabs	a1cf08ac36	Merge branch 'zap' into dev	2018-09-06 17:44:12 -07:00
zotlabs	4005c484c1	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap	2018-09-06 17:42:01 -07:00
zotlabs	551e7b332a	move xchan_photo import to background	2018-09-06 17:37:09 -07:00
zotlabs	b77eac2ae8	move xchan_photo processing to background	2018-09-06 17:36:35 -07:00
zotlabs	acad5df5dc	typo	2018-09-06 17:01:16 -07:00
zotlabs	3ff96239f6	typo	2018-09-06 17:00:42 -07:00
zotlabs	fc00dfd871	typo	2018-09-06 16:59:49 -07:00
zotlabs	91d629fb8e	typo	2018-09-06 16:59:19 -07:00
zotlabs	d7344aba85	federated emoji support	2018-09-06 16:45:38 -07:00
zotlabs	7b492d2bd3	federated emoji support	2018-09-06 16:40:13 -07:00
Mario Vavti	6a338e28b2	-1 has issues in some browsers	2018-09-06 14:27:56 +02:00
Mario Vavti	f3ce5e73fe	Merge remote-tracking branch 'mike/master' into dev	2018-09-06 12:22:41 +02:00
Mario Vavti	c53d3a4b3a	bump version	2018-09-06 11:44:47 +02:00
Mario Vavti	5135f236c2	improve cover-photo handling	2018-09-06 11:30:50 +02:00
Mario Vavti	78c847ef7d	improve notification handling on small screens	2018-09-06 11:14:08 +02:00
Mario Vavti	673a2f67f1	sticky-kit: improve handling	2018-09-06 10:08:55 +02:00
zotlabs	20448800d8	add federated forum role	2018-09-05 23:14:56 -07:00
zotlabs	2640c49c0e	add federated forum role	2018-09-05 23:13:55 -07:00
zotlabs	b38625aef6	Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into dev	2018-09-05 21:23:49 -07:00
zotlabs	44ca674937	Merge branch 'red' into dev	2018-09-05 21:18:14 -07:00
zotlabs	c5bc4fe245	Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge	2018-09-05 21:02:06 -07:00