volse-hubzilla.git - Volse Hubzilla -- soft fork of main Hubzilla core for Volse

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'dev' into 'dev'	Max Kostikov	2019-05-02	134	-4456/+4572
\|\ \| \| \| \| \| \|	# Conflicts: # Zotlabs/Lib/ThreadItem.php
\| *	Revert "Merge branch 'dev' into 'dev'"	Max Kostikov	2019-05-02	1	-1/+1
\| \| \| \| \| \|	This reverts merge request !1620
\| *	Merge branch 'dev' into 'dev'	Mario	2019-05-02	1	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Check if 'reply on comment' enabled for this profile See merge request hubzilla/core!1620
\| * \|	calendar merge: use b64 encoded mid for plink	Mario Vavti	2019-05-02	1	-1/+1
\| \| \|
\| * \|	Merge branch 'dev' into 'dev'	Max Kostikov	2019-05-02	1	-0/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Zap threads support See merge request hubzilla/core!1619
\| * \ \	Merge branch 'dev' into 'dev'	Max Kostikov	2019-05-01	1	-2/+2
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add AS threaded comments support See merge request hubzilla/core!1618
\| * \| \| \|	Update Item.php	Max Kostikov	2019-05-01	1	-9/+5
\| \| \| \| \|
\| * \| \| \|	Merge branch 'xmlify' into 'dev'	Max Kostikov	2019-05-01	1	-2/+12
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	address xmlify/unxmlify performance issue See merge request hubzilla/core!1616
\| \| * \| \| \|	address xmlify/unxmlify performance issue	Mario Vavti	2019-05-01	1	-2/+12
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'dev' into 'dev'	Max Kostikov	2019-05-01	3	-11/+8
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use thr_parent tp handle reply on comment feature See merge request hubzilla/core!1617
\| * \| \| \| \| \|	calendar merge: remove deprecated share variable	Mario Vavti	2019-05-01	1	-20/+2
\| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	calendar merge: fix event_xchan mixup	Mario Vavti	2019-05-01	2	-13/+13
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'dev' into 'dev'	Mario	2019-05-01	1	-5/+33
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	a couple of issues with the suggestions when viewing from the directory module See merge request hubzilla/core!1615
\| \| * \ \ \ \	Merge branch 'dev' of ../hz into dev	zotlabs	2019-04-30	1	-5/+33
\| \| \|\ \ \ \ \
\| \| \| * \| \| \| \|	disable directory options when using suggestion mode and only return one ↵	zotlabs	2019-04-30	1	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	page (60 items) so that sorting works correctly
\| \| \| * \| \| \| \|	fix suggestion ordering in directory module	zotlabs	2019-04-30	1	-3/+25
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'dev' into 'dev'	Mario	2019-05-01	7	-13/+47
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add 'reply on comment' feature See merge request hubzilla/core!1614
\| * \| \| \| \| \| \| \|	do not allow editing events that do not belong to us	Mario Vavti	2019-04-30	2	-1/+10
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	select event by event_hash instead of item_id	Mario Vavti	2019-04-30	5	-12/+23
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	remove logging	Mario Vavti	2019-04-30	1	-3/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	calendar merge: implement single event editing UI	Mario Vavti	2019-04-30	5	-8/+71
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'dev' into 'dev'	Mario	2019-04-29	4	-5/+109
\| \|\ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add jot videos inline and with poster if possible See merge request hubzilla/core!1613
\| \| * \| \| \| \| \| \|	Merge branch 'dev' of ../hz into dev	zotlabs	2019-04-28	1	-2/+9
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \|/ / / / / \| \| \| \|/\| \| \| \| \|
\| \| \| * \| \| \| \| \|	event attachments still weren't being delivered to zot6	zotlabs	2019-04-28	1	-2/+9
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	zotlabs	2019-04-28	102	-3792/+2900
\| \| \| \|\ \ \ \ \ \
\| \| * \| \ \ \ \ \ \	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	zotlabs	2019-04-28	2	-12/+8
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \|/ / / / / / \| \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'dev' of ../hz into dev	zotlabs	2019-04-27	3	-3/+100
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \|/ / / / / / \| \| \| \|/\| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Add jot videos inline and with poster if possible	zotlabs	2019-04-27	3	-3/+100
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	zotlabs	2019-04-27	2	-2/+12
\| \| \|\ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	zotlabs	2019-04-26	0	-0/+0
\| \| \|\ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \	Merge branch 'dev' of ../hz into dev	zotlabs	2019-04-26	2	-6/+48
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|/ / / / / / / \| \| \| \|/\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	import/export zot6 hublocs+xchans	zotlabs	2019-04-26	2	-6/+48
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	zotlabs	2019-04-25	98	-3778/+2880
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	update fix_system_urls() to handle zot6 hublocs	zotlabs	2019-04-25	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	compound name warning	zotlabs	2019-04-24	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	hubloc confusion during magic auth where hublocs with more than one network ↵	zotlabs	2019-04-24	6	-28/+90
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	may exist
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	zotlabs	2019-04-24	20	-592/+1242
\| \| \|\ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \	Merge branch 'dev' of ../hm into dev	zotlabs	2019-04-18	1	-1/+1
\| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \ \ \	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	zotlabs	2019-04-18	2	-12/+6
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \| \ \ \ \ \ \ \ \ \ \ \	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	zotlabs	2019-04-16	2	-12/+6
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	zotlabs	2019-04-15	156	-14399/+42049
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	calendar merge: d&d support and some minor cleanup and fixes	Mario Vavti	2019-04-29	3	-39/+91
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'sql_fixes' into 'dev'	Max Kostikov	2019-04-28	2	-12/+8
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	possible sql performance improvement See merge request hubzilla/core!1611
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	improve channel date query	Mario Vavti	2019-04-27	1	-11/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	possible sql performance improvement	Mario Vavti	2019-04-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'dev' into 'dev'	Max Kostikov	2019-04-27	1	-2/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use goaway() base function See merge request hubzilla/core!1612
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update changelog	Mario Vavti	2019-04-26	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'dev' into 'dev'	Mario	2019-04-26	2	-6/+48
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	import/export zot6 hublocs+xchans See merge request hubzilla/core!1610
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	import/export zot6 hublocs+xchans	Zot	2019-04-26	2	-6/+48
\| \|/ / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'dev' into 'dev'	Mario	2019-04-26	1	-3/+4
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update fix_system_urls() to handle zot6 hublocs (recommend cherry-pick to master) See merge request hubzilla/core!1609