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

	Commit message (Collapse)	Author	Age	Files	Lines
*	use minified version of jquery	Mario	2019-11-11	1	-10598/+2
\|
*	bump version	Mario	2019-11-11	1	-1/+1
\|
*	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
\| * \|	Update hstrings.php	Max Kostikov	2019-11-07	1	-2/+15
\| \| \|
\| * \|	Update hmessages.po	Max Kostikov	2019-11-07	1	-170/+238
\| \| \|
\| * \|	Move title sanitizer code in the right place	Max Kostikov	2019-11-06	1	-12/+12
\| \| \|
\| * \|	Formatting	Max Kostikov	2019-11-06	1	-1/+1
\| \| \|
\| * \|	Update feedutils.php	Max Kostikov	2019-11-06	1	-9/+9
\| \| \|
\| * \|	Sanitize title on Atom/RSS feed import	Max Kostikov	2019-11-06	1	-0/+12
\| \| \|
* \| \|	Merge branch 'dev' into 'dev'	Mario	2019-11-07	1	-0/+12
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sanitize title on Atom/RSS feed import See merge request hubzilla/core!1770
\| * \| \|	Sanitize title on Atom/RSS feed import	Max Kostikov	2019-11-07	1	-0/+12
\|/ / /
* \| \|	Merge branch 'cherry-pick-7cc8c2d1' into 'dev'	M. Dent	2019-11-06	1	-6/+11
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	port fixes from zap to check for arrays See merge request hubzilla/core!1767
\| * \| \|	port fixes from zap to check for arrays	Mario	2019-11-04	1	-6/+11
\| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit 7cc8c2d127b09b7e53c7916c6ea104fa566971db)
* \| \| \|	Merge branch 'cherry-pick-3604220c' into 'dev'	M. Dent	2019-11-06	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add date and request target headers to make pixelfed happy See merge request hubzilla/core!1768
\| * \| \| \|	add date and request target headers to make pixelfed happy	Mario	2019-11-04	1	-2/+2
\| \|/ / / \| \| \| \| \| \| \| \|	(cherry picked from commit 3604220c2a5aedddf25143cc5fd87ed576d34702)
* \| \| \|	Merge branch 'dev' into 'dev'	M. Dent	2019-11-06	1	-1/+1
\|\ \ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	Prefer use Etag on photo modification validation See merge request hubzilla/core!1769
\| * \| \|	Prefer use Etag on photo modification validation	Max Kostikov	2019-11-04	1	-1/+1
\| \| \| \|
\| \| \| *	Merge branch 'dev' of https://framagit.org/hubzilla/core into dev	zotlabs	2019-11-04	30	-92/+15061
\| \| \| \|\ \| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Merge branch 'cherry-pick-4cfb9658' into 'dev'	M. Dent	2019-11-04	2	-7/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix duplicate attachment and regression with audio file upload See merge request hubzilla/core!1766
\| * \| \| \|	fix duplicate attachment and regression with audio file upload	Mario	2019-11-04	2	-7/+2
\| \| \|/ / \| \|/\| \| \| \| \| \|	(cherry picked from commit 4cfb965881df2be181aab6020c9df78c0a86fd9f)
* \| \| \|	Merge branch 'cherry-pick-03317b98' into 'dev'	M. Dent	2019-11-04	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	fix query with protocol prefix not always picking the right xchan See merge request hubzilla/core!1765
\| * \| \|	fix query with protocol prefix not always picking the right xchan	Mario	2019-11-04	1	-1/+1
\|/ / / \| \| \| \| \| \|	(cherry picked from commit 03317b9864c0d7c99e144404c647b9923d8d29ea)