24212 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
zotlabs	fb6c83a213	add iconfig to zot6 objects	2020-02-23 15:27:39 -08:00
zotlabs	7ff5403535	swipe triggering at unfortunate times - disable for now	2020-02-23 11:49:17 -08:00
zotlabs	3b81989aff	swipe detection - first cut, needs work	2020-02-21 21:15:06 -08:00
zotlabs	f75fd1a25a	theme_attachments() leaking OCAP token	2020-02-20 19:56:37 -08:00
zotlabs	bbdbd50b87	Merge branch 'dev'	2020-02-20 18:18:24 -08:00
zotlabs	5a26132369	rev update	2020-02-20 18:18:01 -08:00
zotlabs	3dcc88303a	namespace confusion	2020-02-20 18:17:16 -08:00
zotlabs	ddce711da0	Merge branch 'dev'	2020-02-19 11:01:07 -08:00
zotlabs	f141bd9f57	fix follow autocomplete	2020-02-19 11:00:26 -08:00
zotlabs	06582f4b3a	Merge branch 'master' of https://framagit.org/zot/zap	2020-02-18 21:23:30 -08:00
zotlabs	066e3c5f72	Merge branch 'dev'	2020-02-18 21:22:15 -08:00
zotlabs	cbb9711d48	rev update	2020-02-18 21:20:19 -08:00
zotlabs	e5038f1c89	wait longer than 3 seconds (but not more than 15) for a video thumbnail to be created after uploading	2020-02-18 16:18:19 -08:00
zotlabs	d7e273d105	add autocomplete to connect/follow input box	2020-02-18 11:21:29 -08:00
zotlabs	44ecc1ba25	backport MR 22 to dev	2020-02-17 15:07:19 -08:00
Mike Macgirvin	bc77952e10	remove simplepie	2020-02-18 10:03:45 +11:00
zotlabs	a8b7e73662	deprecate simplepie and RSS connections	2020-02-17 14:58:21 -08:00
Zot	f325906f23	Merge branch 'master' into 'master' ... Update Connections.php See merge request zot/zap!22	2020-02-17 23:14:04 +01:00
gia vec	74719e1dcc	Update Connections.php	2020-02-17 19:18:58 +01:00
zotlabs	c245ee79b6	php warning	2020-02-13 21:08:28 -08:00
zotlabs	d934e27f3d	Merge branch 'dev'	2020-02-12 21:51:56 -08:00
zotlabs	71d2d75cf2	app translations	2020-02-12 21:51:32 -08:00
zotlabs	f913bfcce3	Merge branch 'dev'	2020-02-12 21:48:26 -08:00
zotlabs	a9b8755e32	whitespace	2020-02-12 21:48:10 -08:00
zotlabs	04ae664c92	network -> stream	2020-02-12 21:36:21 -08:00
zotlabs	fda9be31aa	Merge branch 'dev'	2020-02-12 15:25:37 -08:00
zotlabs	da46f493a4	rev update	2020-02-12 15:25:21 -08:00
zotlabs	a14474a135	support binary content	2020-02-12 15:21:39 -08:00
zotlabs	331dac12d3	issue with multi-line questions	2020-02-12 14:14:08 -08:00
zotlabs	bb812302fd	mention permission tweak	2020-02-11 21:52:52 -08:00
Mike Macgirvin	eb7938d952	cleanup images directory	2020-02-12 14:08:03 +11:00
zotlabs	2afebf305b	Merge branch 'dev'	2020-02-11 11:16:01 -08:00
zotlabs	4480cf331b	rev update	2020-02-11 11:13:43 -08:00
zotlabs	156fa62700	update activity filter widget to include polls	2020-02-11 02:32:19 -08:00
zotlabs	6333f7a796	whitespace	2020-02-10 18:19:32 -08:00
zotlabs	e5eb258c6c	fix log warnings	2020-02-10 16:35:30 -08:00
zotlabs	9c7cbcbdfa	Merge branch 'dev'	2020-02-09 21:39:48 -08:00
zotlabs	926f2c9c47	wrong var	2020-02-09 21:39:26 -08:00
zotlabs	c9c3494b3e	Merge branch 'dev'	2020-02-09 19:52:05 -08:00
zotlabs	dea5e872a5	string updates	2020-02-09 17:29:04 -08:00
zotlabs	627013f77b	rev update	2020-02-09 15:35:35 -08:00
zotlabs	7103d28569	issues from watching the logs	2020-02-09 15:34:49 -08:00
zotlabs	076ec59cf6	Merge branch 'dev'	2020-02-06 21:53:11 -08:00
zotlabs	818e08b097	php warning	2020-02-06 21:51:36 -08:00
zotlabs	920f9ea507	signature validation issue with posted data	2020-02-06 21:43:39 -08:00
zotlabs	5cd6c6cc0b	missing function	2020-02-06 20:25:33 -08:00
zotlabs	8ed915918c	missing function	2020-02-06 20:25:09 -08:00
zotlabs	6e416316a9	add poll ending date to displayed post	2020-02-06 19:58:23 -08:00
zotlabs	46262c693a	add poll ending date to displayed post	2020-02-06 19:57:27 -08:00
zotlabs	d4a7d436c2	rev update	2020-02-06 19:13:21 -08:00