23951 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
zotlabs	3ba8c9981e	Merge branch 'dev'	2020-05-31 23:04:36 -07:00
zotlabs	fb46b8494b	wrong callback	2020-05-31 23:04:14 -07:00
zotlabs	23f8243846	Merge branch 'dev'	2020-05-31 20:42:53 -07:00
zotlabs	850712a918	tweaks	2020-05-31 20:42:30 -07:00
zotlabs	8a195ed97b	a third option	2020-05-31 18:01:17 -07:00
zotlabs	be76b3ea46	tag display pref	2020-05-31 17:24:09 -07:00
zotlabs	75459652a3	Merge branch 'dev'	2020-05-27 18:58:47 -07:00
zotlabs	e56d9c9206	Merge branch 'dev' of ../p3 into dev	2020-05-27 18:58:27 -07:00
zotlabs	911df6e91f	rev update	2020-05-27 18:57:56 -07:00
zotlabs	0f7a1baf38	peertube uses markdown content.	2020-05-27 18:56:51 -07:00
zotlabs	12f31a8f1a	cleanup	2020-05-25 23:43:40 -07:00
zotlabs	410fbdbb95	rm include/message	2020-05-19 18:02:28 -07:00
zotlabs	08a69654ae	annual copyright update	2020-05-18 19:48:25 -07:00
zotlabs	376bca62ab	Merge branch 'dev' of ../p3 into dev	2020-05-17 20:26:01 -07:00
zotlabs	b70e4b8526	regression: installer complains about un-writeable store directory	2020-05-17 20:24:39 -07:00
zotlabs	3441738a1c	complete blocking tools integration	2020-05-17 17:23:28 -07:00
zotlabs	0317c9f6d9	Merge branch 'dev'	2020-05-17 16:23:14 -07:00
zotlabs	146a3a0d9f	Just send HTML.	2020-05-17 16:20:11 -07:00
zotlabs	59cb50ae5f	Merge branch 'dev'	2020-05-17 13:18:05 -07:00
zotlabs	4852497f89	revision	2020-05-17 13:17:37 -07:00
zotlabs	bec099b66f	Merge branch 'dev' of ../p3 into dev	2020-05-17 13:03:32 -07:00
zotlabs	9113bba30d	forgery prevention	2020-05-17 13:02:02 -07:00
zotlabs	c9cdfb3d7f	typo	2020-05-17 04:41:03 -07:00
zotlabs	8fe4bf80b9	Merge branch 'dev' of https://framagit.org/zot/zap into dev	2020-05-17 04:34:42 -07:00
zotlabs	3f1cdc118a	connect superblock to connection editor - partially consolidate all block actions	2020-05-17 04:09:12 -07:00
zotlabs	cc78d1e64e	bring superblock back to connections	2020-05-16 23:49:40 -07:00
Zot	4836b5a8e1	Merge branch 'dev' into 'dev' ... Update Spanish See merge request zot/zap!30	2020-05-16 00:52:05 +02:00
mjfriaza	240bff2825	Update Spanish	2020-05-15 11:32:42 +02:00
zotlabs	04724dedca	Merge branch 'dev'	2020-05-14 19:50:46 -07:00
zotlabs	4250002586	wrong url showing up	2020-05-14 19:48:18 -07:00
zotlabs	9a879ee36f	Merge branch 'dev'	2020-05-14 17:48:27 -07:00
zotlabs	cd0d1aef65	revision	2020-05-14 17:48:10 -07:00
zotlabs	37e4649ba5	mention issue	2020-05-14 17:45:56 -07:00
zotlabs	458f66d9d5	Merge branch 'dev' of ../p3 into dev	2020-05-14 17:01:18 -07:00
zotlabs	f1b84459a8	expose the connection sort order	2020-05-14 17:00:49 -07:00
zotlabs	6d7dc00587	Merge branch 'dev' of ../p3 into dev	2020-05-14 13:25:35 -07:00
zotlabs	cf97dae6e1	connections ordering	2020-05-14 13:25:15 -07:00
zotlabs	d4163c590c	Merge branch 'dev'	2020-05-14 13:13:19 -07:00
zotlabs	790878d4e5	Merge branch 'dev' of ../p3 into dev	2020-05-14 13:08:34 -07:00
zotlabs	e2b3646dca	change default connection view to 'active' instead of 'all'.	2020-05-14 13:07:38 -07:00
zotlabs	349eac1027	cleanup	2020-05-13 22:06:01 -07:00
zotlabs	a2fd6320d1	Merge branch 'dev'	2020-05-13 18:53:38 -07:00
zotlabs	a6b103aaab	revision	2020-05-13 18:53:19 -07:00
zotlabs	9608f2af47	potential issue with type matching	2020-05-13 18:48:51 -07:00
zotlabs	03624f7883	prevent or at least reduce duplicate mentions	2020-05-13 18:07:35 -07:00
zotlabs	ce0be41023	hide the automentions in comments.	2020-05-13 17:39:48 -07:00
zotlabs	02d1fbe903	missing summary tags	2020-05-12 20:58:37 -07:00
zotlabs	384f16d2e9	Merge branch 'dev'	2020-05-11 20:40:00 -07:00
zotlabs	26bc1bef1d	strings	2020-05-11 20:39:43 -07:00
zotlabs	9c177e7477	add activitypub addressing to locally created image objects	2020-05-11 19:54:54 -07:00