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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '4.6RC'4.6	Mario	2019-12-04	1797	-486970/+176979
\|\
\| *	bump version	Mario	2019-12-04	1	-1/+1
\| \|
\| *	update changelog	Mario	2019-12-04	1	-2/+2
\| \| \| \| \| \|	(cherry picked from commit 295c08fcf31e44ed48284768e6df92aaa11ab964)
\| *	Move auto_save_draft to header from thread comment	DM42.Net Hubzilla Development	2019-11-28	5	-11/+5
\| \| \| \| \| \|	(cherry picked from commit c86b35da701674510a97ccc21e46581bd864cc31)
\| *	Update CHANGELOG	Max Kostikov	2019-11-28	1	-0/+1
\| \| \| \| \| \|	(cherry picked from commit 9284b60a79bf226f4fef0e51f6eb58eacdb3973c)
\| *	Update Russian hstrings.php	Max Kostikov	2019-11-28	1	-5/+15
\| \| \| \| \| \|	(cherry picked from commit b69f8a3f298f3c80b75d4085399c4c1f03c0dfb0)
\| *	Update Russian hmessages.po	Max Kostikov	2019-11-28	1	-616/+679
\| \| \| \| \| \|	(cherry picked from commit 8ea7c08f43473560519ab3637022db6c31beec39)
\| *	update changelog	Mario	2019-11-25	1	-0/+1
\| \| \| \| \| \|	(cherry picked from commit fcb065bcb2f8e61d1d9e804f8f251967732ee037)
\| *	Merge branch '4.6RC' of https://framagit.org/hubzilla/core into 4.6RC	Mario	2019-11-25	1	-0/+67
\| \|\
\| \| *	Revert "Add daily cached embedded content cleanup"	Max Kostikov	2019-11-25	1	-6/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 5c47c9ed9579dc97e0a508045fe50264bb96490b (cherry picked from commit 38de059156f9a6ec63727d47a96d1b15e96e3b47)
\| \| *	Add daily cached embedded content cleanup	Max Kostikov	2019-11-25	1	-0/+6
\| \| \| \| \| \| \| \| \|	(cherry picked from commit 5c47c9ed9579dc97e0a508045fe50264bb96490b)
\| \| *	changelog	Mario	2019-11-25	1	-0/+67
\| \| \| \| \| \| \| \| \|	(cherry picked from commit f6f7e7e8d2a9045ac2010ab2308ef7bc5e896efa)
\| * \|	resolve merge conflict	Max Kostikov	2019-11-25	3	-9/+10
\| \|/
\| *	merge opengraph fixes from dev	Mario	2019-11-25	3	-68/+74
\| \|
\| *	no mention notifications from mastodon (and pleroma)	Manuel Jiménez Friaza	2019-11-21	2	-14821/+14871
\| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit ea235c0c6751b682332b968b4c18f905e8ece451) (cherry picked from commit 0159b631fcc2041009cc273b3f5308f06cee0429)
\| *	onepoll: do not update dead feeds	Mario	2019-11-15	2	-5/+11
\| \| \| \| \| \|	(cherry picked from commit 5a6b14f8787927ee6ea99c622d02875811d3a74a)
\| *	make inline pdf a security option, move thumbnail security to security ↵	Mario	2019-11-15	5	-8/+15
\| \| \| \| \| \| \| \| \| \|	options from admin/site (cherry picked from commit de9a7f0fa909792656d26d369f2ff21c57fc1e4d)
\| *	AP fixes	Mario	2019-11-15	1	-1/+7
\| \| \| \| \| \|	(cherry picked from commit 3009c88d246ddcafabf1965f88c5ebd8fe1717fd)
\| *	check if file exists	Mario	2019-11-13	1	-1/+1
\| \| \| \| \| \|	(cherry picked from commit 52bd27a0280c736e563ccc67a9307cd75bd14d3f)
\| *	wildcard tag issue	zotlabs	2019-11-13	1	-0/+3
\| \| \| \| \| \|	(cherry picked from commit 2f4c619d510e64eeda05366e485d50f490cefebe)
\| *	use minified version of jquery	Mario	2019-11-11	1	-10598/+2
\| \| \| \| \| \|	(cherry picked from commit 89342ca9fbf329d5e84839c51f26db19bdd4ac8c)
\| *	update strings	Mario	2019-11-11	1	-8598/+8640
\| \|
\| *	bump version	Mario	2019-11-11	1	-1/+1
\| \|
\| *	Merge branch 'cherry-pick-1affcb80' into 'dev'	Mario	2019-11-10	1	-3/+3
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	fix language tests See merge request hubzilla/core!1782
\| \| *	fix language tests	Mario	2019-11-10	1	-3/+3
\| \| \| \| \| \| \| \| \|	(cherry picked from commit 1affcb80172576dc46e4434cd10e1a534a9bb6c2)
\| * \|	Merge branch 'cherry-pick-6685381f' into 'dev'	Mario	2019-11-10	1618	-435061/+122109
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	another bulk of composer updates See merge request hubzilla/core!1781
\| \| * \|	another bulk of composer updates	Mario	2019-11-10	1618	-435061/+122109
\| \| \|/ \| \| \| \| \| \|	(cherry picked from commit 6685381fd8db507493c3d7c1793f8c05c681bbce)
\| * \|	Merge branch 'cherry-pick-9ad4c652' into 'dev'	Mario	2019-11-10	1	-5/+8
\| \|\ \ \| \| \|/ \| \|/\| \| \| \| \| \| \|	hopefully fix query for postgres See merge request hubzilla/core!1780
\| \| *	hopefully fix query for postgres	Mario	2019-11-10	1	-5/+8
\| \|/ \| \| \| \|	(cherry picked from commit 9ad4c6528cc3ee4e34d2b5d77027a1c33cbadf5c)
\| *	Merge branch 'cherry-pick-971e7eef' into 'dev'	Max Kostikov	2019-11-10	27	-13265/+0
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	remove some old unused javascript libraries See merge request hubzilla/core!1779
\| \| *	Ãremove some old unused javascript libraries	Mario	2019-11-10	27	-13265/+0
\| \| \| \| \| \| \| \| \|	(cherry picked from commit 971e7eef9c415a2ce82eb0cd22eaabee12ae719c)
\| * \|	Merge branch 'cherry-pick-b444bf59' into 'dev'	Max Kostikov	2019-11-10	1	-4/+10597
\| \|\ \ \| \| \|/ \| \|/\| \| \| \| \| \| \|	update jquery to version 3.4.1 See merge request hubzilla/core!1778
\| \| *	update jquery to version 3.4.1	Mario	2019-11-10	1	-4/+10597
\| \|/ \| \| \| \|	(cherry picked from commit b444bf59560b3d918aa13b52035c602b03e8d013)
\| *	Better BBcode to Markdown conversion	Max Kostikov	2019-11-08	1	-2/+5
\| \|
\| *	Merge branch 'dev' into 'dev'	M. Dent	2019-11-08	2	-7/+9
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	exempt svg from tag completion See merge request hubzilla/core!1777
\| \| *	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	zotlabs	2019-11-08	31	-74/+162
\| \| \|\ \| \| \|/ \| \|/\|
\| * \|	Merge branch 'cherry-pick-fa437b79' into 'dev'	Max Kostikov	2019-11-08	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	more fix date header format See merge request hubzilla/core!1776
\| \| * \|	more fix date header format	Mario	2019-11-08	1	-1/+1
\| \|/ / \| \| \| \| \| \|	(cherry picked from commit fa437b7977ba7fffd7368fa5c75e3d57fbf75424)
\| * \|	Merge branch 'cherry-pick-bb11cd15' into 'dev'	Max Kostikov	2019-11-08	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix date header format See merge request hubzilla/core!1775
\| \| * \|	fix date header format	Mario	2019-11-08	1	-1/+1
\| \|/ / \| \| \| \| \| \|	(cherry picked from commit bb11cd15d147ebbcc90b544788c9c2ef4925daa5)
\| * \|	Merge branch 'dev' into 'dev'	Max Kostikov	2019-11-08	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not trim a sufficiently shortened Opengraph description See merge request hubzilla/core!1774
\| \| * \|	Do not trim a sufficiently shortened Opengraph description	Max Kostikov	2019-11-08	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'cherry-pick-2df15f35' into 'dev'	Max Kostikov	2019-11-08	28	-71/+159
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update composer libs See merge request hubzilla/core!1773
\| \| * \| \|	update composr libs	Mario	2019-11-08	28	-71/+159
\| \|/ / / \| \| \| \| \| \| \| \|	(cherry picked from commit 2df15f35d706d4608ff723ce6288391ca774f7ba)
\| * \| \|	Merge branch 'dev' into 'dev'	Mario	2019-11-08	4	-1/+209
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	svg stuff See merge request hubzilla/core!1772
\| \| * \| \|	svg stuff	Zot	2019-11-08	4	-1/+209
\| \|/ / /
\| \| \| *	exempt svg from tag completion	zotlabs	2019-11-08	2	-7/+9
\| \| \| \|
\| \| \| *	svg stuff	zotlabs	2019-11-07	4	-1/+209
\| \| \| \|
\| \| \| *	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	zotlabs	2019-11-07	5	-181/+279
\| \| \| \|\ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Merge branch 'dev' into 'dev'	Max Kostikov	2019-11-07	2	-172/+253
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Russian translation See merge request hubzilla/core!1771