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'	Mario	2018-08-21	6	-1851/+2442
\| \| \| \| \| \| \| \| \|	Update catalan translations for sstrings up to 18th July 2018 See merge request hubzilla/core!1260 (cherry picked from commit 0985adb7701a128966ecff3620624603b1e06449) af31bbeb Update catalan translations for sstrings up to 18th July 2018
*	Merge branch 'patch-17' into 'master'	Mario	2018-08-21	1	-1/+2
\|\ \| \| \| \| \| \| \| \|	Add missed app 'Order Apps' See merge request hubzilla/core!1258
\| *	Add missed app 'Order Apps'	Max Kostikov	2018-08-17	1	-1/+2
\|/
*	Merge branch 'patch-16' into 'dev'	Mario	2018-08-12	1	-1/+1
\| \| \| \| \| \| \| \| \|	Add translation for missed string See merge request hubzilla/core!1253 (cherry picked from commit 5ff0f09a4509955dede91fdb38711e1c389c9ae4) d3362dfa Add translation for missed string
*	search form action for channel search needs the channel address	Mario Vavti	2018-08-09	1	-1/+1
\| \| \|	(cherry picked from commit 054c5da294b5254cde2b0ff3dabff713c5eedb46)
*	Merge branch 'fixactivityorderwithfilters' into 'master'	Mario	2018-08-02	1	-0/+3
\|\ \| \| \| \| \| \| \| \|	Add GET for filtered forums See merge request hubzilla/core!1251
\| *	Add GET for filtered forums	DM42.Net (Matt Dent)	2018-08-01	1	-0/+3
\|/
*	Merge branch 'dev' into 'dev'	Mario	2018-07-31	5	-16/+33
\| \| \| \| \| \| \| \| \|	Update Spanish translation See merge request hubzilla/core!1249 (cherry picked from commit c17f0fb44f44d56e6f98d66eed59cf66b294f3f2) edf83418 Update Spanish translation
*	Merge branch 'patch-9' into 'dev'	Mario	2018-07-30	1	-3/+3
\| \| \| \| \| \| \| \| \|	Respect navbar translations See merge request hubzilla/core!1243 (cherry picked from commit cbd8c07265590d68bedcaa105b860cfed637e49e) 05b3237b Update nav.php
*	Merge branch 'patch-8' into 'dev'	Mario	2018-07-30	1	-1/+5
\| \| \| \| \| \| \| \| \| \|	Fix navbar missed translations See merge request hubzilla/core!1242 (cherry picked from commit 3a6d3cb396746096943c00efade7831317d21bf0) 0fe7004d Update Apps.php 4fd9d1ee Update Apps.php
*	Merge branch 'patch-1' into 'master'	Mario	2018-07-30	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Update network.php See merge request hubzilla/core!1248
\| *	Update network.php	gia vec	2018-07-29	1	-1/+1
\|/
*	fix sql empty query error in db update 12163.6.1	Mario Vavti	2018-07-29	1	-1/+1
\| \| \|	(cherry picked from commit e4a1286aae411023210628d3be306420f7844d22)
*	verrsion bump	Mario Vavti	2018-07-29	1	-1/+1
\|
*	wrong class name	Mario Vavti	2018-07-29	1	-1/+1
\| \| \|	(cherry picked from commit 5dbd11c6edf61f2962a57fa8d4743ba55dfaa5ba)
*	fix unsanitised xchan_name	zotlabs	2018-07-29	2	-1/+20
\| \| \|	(cherry picked from commit 97015162282989913d6b54c373af3b73b8043bad)
*	SECURITY: sanitise vcard fields	zotlabs	2018-07-29	1	-8/+8
\| \| \|	(cherry picked from commit 2367d94a4264b228995e54ab6e1383652f82a2c2)
*	app update and ownership issues	zotlabs	2018-07-28	1	-7/+50
\| \| \|	(cherry picked from commit e28dab17d6b958d6ef76181d23f784d17bc70b5e)
*	fix sql error	Mario Vavti	2018-07-26	1	-1/+1
\| \| \|	(cherry picked from commit ec3a066e4e94ad7c72d1d07371081318a4d5e9ab)
*	version 3.63.6	Mario Vavti	2018-07-25	1	-1/+1
\|
*	Merge branch '3.6RC'	Mario Vavti	2018-07-25	459	-21056/+33775
\|\
\| *	Merge branch '3.6RC' of https://framagit.org/hubzilla/core into 3.6RC	Mario Vavti	2018-07-25	13	-7204/+15883
\| \|\
\| \| *	Merge branch 'patch-2' into 'dev'	Mario	2018-07-23	3	-261/+268
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Escape internal quotes in translation on export See merge request hubzilla/core!1237 (cherry picked from commit 84e57d040b6b7df4b7673d3f6f4974225117e3a4) 64efd07f Escape internal quotes in translation on export 87857fe5 Update hmessages.po 3342fc22 Update hstrings.php
\| \| *	update changelog	Mario Vavti	2018-07-21	1	-0/+94
\| \| \| \| \| \| \| \| \|	(cherry picked from commit 6be66d6df9c35adb48148b791730ec9c6c533988)
\| \| *	Add var to respect current hstrings.php format	kostikov	2018-07-21	1	-2/+2
\| \| \| \| \| \| \| \| \|	(cherry picked from commit 062633d312b4d595e21ac09029f73ca8768508b0)
\| \| *	Update php2po.php	kostikov	2018-07-21	1	-6/+6
\| \| \| \| \| \| \| \| \|	(cherry picked from commit f9b18aa62f30527880377d2c1dd391af4be04a6c)
\| \| *	Update update_fail_eml.tpl	kostikov	2018-07-21	1	-13/+14
\| \| \| \| \| \| \| \| \|	(cherry picked from commit 8fc7f2aca178b170cf23504abdf60dfd6083e2eb)
\| \| *	Update register_verify_eml.tpl	kostikov	2018-07-21	1	-10/+9
\| \| \| \| \| \| \| \| \|	(cherry picked from commit b6c2c8117e4bb778d2dad325398b348969557836)
\| \| *	Update register_open_eml.tpl	kostikov	2018-07-21	1	-14/+12
\| \| \| \| \| \| \| \| \|	(cherry picked from commit 86a42aad16ddc6654c0781847c0e69a71c62a2e4)
\| \| *	Update passchanged_eml.tpl	kostikov	2018-07-21	1	-11/+15
\| \| \| \| \| \| \| \| \|	(cherry picked from commit 8e2e09bb167de47b2171f4698afff3cc472c0fbb)
\| \| *	Update lostpass_eml.tpl	kostikov	2018-07-21	1	-17/+20
\| \| \| \| \| \| \| \| \|	(cherry picked from commit 3713aa210f88bc56289917ed66a853e5eb68652e)
\| \| *	Add new file	kostikov	2018-07-21	1	-0/+14
\| \| \| \| \| \| \| \| \|	(cherry picked from commit a65c23546bafa081a37b239045c6e38d5c2b2fdd)
\| \| *	Update hstrings.php	kostikov	2018-07-21	1	-1633/+3130
\| \| \| \| \| \| \| \| \|	(cherry picked from commit 790a9155d416d52387a1891417d8558ed490ea5d)
\| \| *	Update hmessages.po	kostikov	2018-07-21	1	-5471/+12527
\| \| \| \| \| \| \| \| \|	(cherry picked from commit f141b845fd96ebcd6b893b1289f2693f9f77dfbd)
\| \| *	prevent double file uploads when dropping files into jot	Mario Vavti	2018-07-20	1	-0/+1
\| \| \| \| \| \| \| \| \|	(cherry picked from commit f6de91bf0fe1abf41d9b15a553ba378e42a956d1)
\| \| *	fix jot drag and drop	Mario Vavti	2018-07-20	1	-6/+9
\| \| \| \| \| \| \| \| \|	(cherry picked from commit c72f6e6ea8d363c43de27760a2374230ce521606)
\| \| *	checkjs fix ($page not bin-hex in all cases)	zotlabs	2018-07-20	1	-2/+2
\| \| \| \| \| \| \| \| \|	(cherry picked from commit a94c9d270906136f69156c0e7c0bd2c8a2e63d1a)
\| \| *	fix the filtered query string so it can potentially be re-used as is.	zotlabs	2018-07-20	1	-0/+2
\| \| \| \| \| \| \| \| \|	(cherry picked from commit 6adbb93f0a4990a93c759b0fee580db6891527e2)
\| * \|	RC1	Mario Vavti	2018-07-19	1	-1/+1
\| \|/
\| *	typo	zotlabs	2018-07-19	1	-1/+1
\| \| \| \| \| \|	(cherry picked from commit ec852b0c8d6c8e566b2a5fb279ed359630afb5ee)
\| *	query filter was a bit greedy	zotlabs	2018-07-19	3	-3/+3
\| \| \| \| \| \|	(cherry picked from commit a05c8ff66bd8d09f69f6c59bc49b7627792f4109)
\| *	Merge branch 'cherry-pick-5ce50d0a' into '3.6RC'	Mario	2018-07-19	8	-16/+17
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	mangled urls on redirects See merge request hubzilla/core!1228
\| \| *	mangled urls on redirects	zotlabs	2018-07-19	8	-16/+17
\| \|/ \| \| \| \|	(cherry picked from commit 5ce50d0a2e15ae66765a68ba2785a87ecda57f6a)
\| *	set the correct album name when moving photos	Mario Vavti	2018-07-18	1	-1/+3
\| \| \| \| \| \|	(cherry picked from commit eb322e831297ee8fd773049c1a00c915c49dc93e)
\| *	update composer autoload cache	Mario Vavti	2018-07-18	2	-2/+18
\| \|
\| *	update strings	Mario Vavti	2018-07-18	1	-1568/+2025
\| \|
\| *	version 3.6RC	Mario Vavti	2018-07-18	1	-1/+1
\| \|
\| *	Update hmessages.po	kostikov	2018-07-18	1	-1/+1
\| \| \| \| \| \|	(cherry picked from commit cbab7d215046d999c3f808b3946ea378c4475a72)
\| *	Fix wrong plural function logic	kostikov	2018-07-18	1	-1/+1
\| \| \| \| \| \|	(cherry picked from commit 42840886119420b4efad511da0cb307f74542545)
\| *	when calling timeago() from mod_mail.js it is called before the translations ↵	Mario Vavti	2018-07-13	2	-1/+3
\| \| \| \| \| \| \| \|	are applied - move the call to main.js and be more specific with the selector to not trigger calls for other modules (eg network) which is handled elsewhere to not be to much of an performance hog (to many dates at a time)