23697 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
zotlabs	f7efbfc7c2	more emojireaction work and a config setting to allow messages where you are mentioned, over-riding normal permissions.	2020-02-04 15:44:26 -08:00
zotlabs	35a378c1d4	provide a way to generate pleroma style emoji reactions	2020-02-03 19:55:52 -08:00
zotlabs	0a2f655b30	emoji reaction compatibility work	2020-02-03 17:51:42 -08:00
Mike Macgirvin	e878414816	add emoji-detector	2020-02-04 09:58:32 +11:00
zotlabs	39f971609a	Merge branch 'dev' of ../p3 into dev	2020-02-02 21:04:57 -08:00
zotlabs	ee0d093392	fix_attached .... incorrect id	2020-02-02 21:04:04 -08:00
zotlabs	9788c03d7b	updated	2020-02-02 17:43:01 -08:00
zotlabs	009af64b16	rev update	2020-02-02 16:07:38 -08:00
zotlabs	6f25715186	more ocap refactor	2020-02-02 16:01:07 -08:00
zotlabs	46df791b76	improved integration of OCAP with existing ACL file permissions, refactor fix_attached_photo_permissions() and permissions_sql()	2020-02-02 15:12:20 -08:00
zotlabs	7ad5e1c3aa	photo permissions edge case - when including private photo from albums the new token was not added to the acl	2020-02-01 15:14:03 -08:00
zotlabs	661c2304d5	Merge branch 'master' into dev	2020-02-01 15:09:59 -08:00
zotlabs	15d51ac49e	minor adjustment	2020-02-01 13:34:21 -08:00
zotlabs	4cebd0fcaa	ocap photo permissions issue with edited private posts that have uploaded photos	2020-02-01 13:32:12 -08:00
zotlabs	01a89ca035	typo	2020-01-31 12:20:02 -08:00
zotlabs	66ee4036f8	typo	2020-01-31 12:19:28 -08:00
Mike Macgirvin	43bd54a3d1	package update	2020-01-31 15:02:59 +11:00
zotlabs	5b1a9241e6	rev update	2020-01-30 19:50:46 -08:00
Zot	146f33c04d	Merge branch 'patch-1' into 'dev' ... fix function call See merge request zot/zap!21	2020-01-31 04:48:35 +01:00
zotlabs	c021f5499f	performance issue with t()	2020-01-30 16:12:41 -08:00
zotlabs	376e2ec359	let's use value	2020-01-29 19:22:43 -08:00
zotlabs	71ef29ab0d	multiple poll issue	2020-01-29 18:03:53 -08:00
zotlabs	44bdd38403	cleanup	2020-01-28 21:20:22 -08:00
zotlabs	3773aad428	cleanup warnings	2020-01-28 20:13:08 -08:00
zotlabs	9f1560482e	more poll testing	2020-01-28 18:17:47 -08:00
zotlabs	6443cf1c45	more poll work	2020-01-28 16:42:38 -08:00
zotlabs	eea407114c	poll debugging	2020-01-27 20:46:14 -08:00
zotlabs	14af391bf8	php warning	2020-01-27 18:32:13 -08:00
zotlabs	e687609713	update the bb autocompleter for polls	2020-01-27 18:16:59 -08:00
zotlabs	16df0712f0	poll update	2020-01-27 18:11:28 -08:00
zotlabs	de3af43e05	Merge branch 'dev' of https://framagit.org/zot/zap into dev	2020-01-27 17:21:12 -08:00
zotlabs	e8023a6271	rev update	2020-01-27 17:19:44 -08:00
zotlabs	69f9cfeb64	more polls dev	2020-01-27 15:54:43 -08:00
Mario	f1b3c61401	fix function call	2020-01-26 15:23:53 +01:00
Zot	8b97844e2a	Merge branch 'dev' into 'dev' ... Fix typo See merge request zot/zap!20	2020-01-22 07:35:57 +01:00
zotlabs	8572cf1650	Merge branch 'dev' of ../z into dev	2020-01-21 20:54:30 -08:00
zotlabs	b4bb336fd5	more work on polls	2020-01-21 20:54:05 -08:00
zotlabs	f63733a131	fix z_dns_check for ipv6, map poll objects	2020-01-21 13:07:41 -08:00
mjfriaza	3eb7821b62	Fix typo	2020-01-18 14:35:26 +01:00
zotlabs	d83bdf8b22	more event and poll work	2020-01-16 17:22:32 -08:00
zotlabs	01a1804b02	Merge branch 'dev' of https://framagit.org/zot/zap into dev	2020-01-15 13:56:42 -08:00
Zot	851f37725f	Merge branch 'dev' into 'dev' ... Update Spanish strings See merge request zot/zap!19	2020-01-15 22:55:31 +01:00
zotlabs	7a8f9670c0	allow inline svgs to federate as data urls	2020-01-14 21:48:28 -08:00
zotlabs	2695bded8f	provide activitypub rendering of inline svg doodles	2020-01-14 20:02:13 -08:00
zotlabs	1f2bc909fa	Merge branch 'dev'	2020-01-14 13:25:51 -08:00
zotlabs	3b2eabf0fd	minor php warning	2020-01-14 13:25:22 -08:00
zotlabs	81b15e9331	rev update	2020-01-14 13:22:16 -08:00
zotlabs	fa8b5c7d5a	cleanup	2020-01-14 12:14:34 -08:00
zotlabs	8190ba06b5	event testing - we require a zot6 handler for the /activity endpoint	2020-01-14 12:11:23 -08:00
zotlabs	e9719a2359	event federation testing zap/hubzilla	2020-01-13 17:30:13 -08:00