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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2018-12-01	7	-12/+52
\|\
\| *	typo	zotlabs	2018-11-30	1	-1/+1
\| \|
\| *	allow notification filtering by name or addr	zotlabs	2018-11-30	4	-8/+16
\| \|
\| *	attached photo permissions regression	zotlabs	2018-11-30	1	-4/+4
\| \|
\| *	prevent incompatible export files (osada/zap) from being imported. This is ↵	zotlabs	2018-11-27	2	-0/+32
\| \| \| \| \| \| \| \|	to keep your DB from getting trashed. We probably need a similar thing for item import since the object formats aren't compatible
* \|	Merge branch 'es-es' into 'dev'	M. Dent	2018-11-28	1	-14/+21
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Revision 1 doc/es-es/about/about.bb See merge request hubzilla/core!1410
\| * \	Merge branch 'cherry-pick-5ac08ec3' into 'es-es'	Manuel Jiménez Friaza	2018-11-26	1	-14/+21
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revision 1 doc/es-es/about/about.bb See merge request mjfriaza/core!3
\| \| * \|	Revision 1 doc/es-es/about/about.bb	Manuel Jiménez Friaza	2018-11-26	1	-14/+21
\| \|/ / \| \| \| \| \| \|	(cherry picked from commit 5ac08ec3aa8ede14141390670a8097a60769e11e)
* \| \|	Merge branch 'default2flex-conversion' into 'dev'	M. Dent	2018-11-28	3	-17/+35
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use flex for the default template See merge request hubzilla/core!1409
\| * \| \|	use flex for the default template	Mario	2018-11-26	3	-17/+35
\| \| \| \|
* \| \| \|	Merge branch 'composer-updates' into 'dev'	M. Dent	2018-11-28	19	-118/+139
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update jquery-file-upload and psr-log via composer See merge request hubzilla/core!1408
\| * \| \| \|	update jquery-file-upload and psr-log via composer	Mario	2018-11-25	21	-175/+164
\| \| \| \| \|
* \| \| \| \|	Merge branch 'update-imagesloaded' into 'dev'	M. Dent	2018-11-28	40	-98/+1870
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update imagesloaded to version 4.1.4 via composer See merge request hubzilla/core!1407
\| * \| \| \| \|	update imagesloaded to version 4.1.4 via composer	Mario	2018-11-25	40	-98/+1870
\| \|/ / / /
* \| \| \| \|	Merge branch 'pg-fixes' into 'dev'	M. Dent	2018-11-28	1	-2/+2
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix db upgrade 1228 for postgres See merge request hubzilla/core!1403
\| * \| \| \|	fix db upgrade 1228 for postgres	Mario	2018-11-22	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'patch-20181120a' into 'dev'	Mario	2018-11-25	1	-0/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not store serialized pconfig value received via to Module/Pconfig.php See merge request hubzilla/core!1402
\| * \| \| \| \|	Do not store serialized pconfig value received via to Module/Pconfig.php	M. Dent	2018-11-25	1	-0/+5
\|/ / / / /
* \| \| \| \|	Merge branch 'es-es' into 'dev'	Mario	2018-11-24	2	-27/+27
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| / / \| \| \|/ / \| \|/\| \|	Update es-es See merge request hubzilla/core!1406
\| * \| \|	Update es-es	Manuel Jiménez Friaza	2018-11-24	2	-27/+27
\| \| \| \|
\| * \| \|	Resolved merge conflicts	Manuel Jiménez Friaza	2018-11-24	54	-1060/+1770
\| \|\ \ \ \| \|/ / / \|/\| \| \|
* \| \| \|	Merge remote-tracking branch 'mike/master' into dev	Mario	2018-11-23	1	-1/+1
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Organization actor type was missing	zotlabs	2018-11-23	1	-1/+1
\| \| \| \|
* \| \| \|	Merge remote-tracking branch 'mike/master' into dev	Mario	2018-11-23	3	-18/+20
\|\\| \| \| \| \|_\|/ \|/\| \|
\| * \|	use uuid in file storage	zotlabs	2018-11-22	2	-3/+3
\| \| \|
\| * \|	fix mastodon tag notifications (again)	zotlabs	2018-11-21	1	-15/+17
\| \| \|
* \| \|	Merge remote-tracking branch 'mike/master' into dev	Mario	2018-11-22	3	-5/+8
\|\\| \|
\| * \|	no mention notifications from mastodon (and pleroma)	zotlabs	2018-11-21	2	-5/+5
\| \| \|
\| * \|	use this form instead	zotlabs	2018-11-19	1	-2/+1
\| \| \|
\| * \|	push recent changes	zotlabs	2018-11-19	3	-2/+6
\| \| \|
* \| \|	fix call to undefined function	Mario Vavti	2018-11-21	1	-1/+1
\| \| \| \| \| \| \| \| \|	(cherry picked from commit 0bba9482dfbcc0fd8bea880ac3820548281ecfc2)
* \| \|	Merge branch 'dev' into 'dev'	Mario	2018-11-20	2	-712/+693
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Russian translation See merge request hubzilla/core!1400
\| * \| \|	Replace hmessages.po	Max Kostikov	2018-11-19	1	-688/+673
\| \| \| \|
\| * \| \|	Replace hstrings.php	Max Kostikov	2018-11-19	1	-24/+20
\| \| \| \|
* \| \| \|	Revert "Fix return on wrong sotred in Content-Length size for full size photos"	Mario	2018-11-19	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 6010b5c6198bf49c39029a657443b5bf1be8b408
* \| \| \|	Revert "Add filesize for streaming content"	Mario	2018-11-19	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 238a616292ad5c6e7be97a4dd763a302729abf80
* \| \| \|	changelog	Mario Vavti	2018-11-19	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit 5cb4cdaa5e42f87e9d26501150d6d689b56a1cd2)
* \| \| \|	update sql schemas to include update column in pconfig table	Mario Vavti	2018-11-19	2	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit ae97649948b8af575441e5a1f5b69db9f627a0e2)
* \| \| \|	Merge branch 'patch-20181118a' into 'dev'	Mario	2018-11-19	1	-2/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Patch 20181118a - fix delayed publication of posts See merge request hubzilla/core!1398
\| * \| \| \|	Fix: delayed items propagate before publication on cloned channels	DM42.Net (Matt Dent)	2018-11-18	1	-2/+0
\| \| \| \| \|
* \| \| \| \|	Merge branch 'mod-zot-fix' into 'dev'	Max Kostikov	2018-11-18	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix typo which prevented propagation of comments See merge request hubzilla/core!1399
\| * \| \| \|	fix typo which prevented propagation of comments	Mario Vavti	2018-11-18	1	-1/+1
\|/ / / /
* \| \| \|	recalculate photo filesize when rotating an image	Mario Vavti	2018-11-17	1	-10/+19
\| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit f15e32d0637fdf84de7cab43b558ec8a383d3cf5)
* \| \| \|	Add filesize for streaming content	Max Kostikov	2018-11-16	1	-0/+1
\| \| \| \|
* \| \| \|	Fix return on wrong sotred in Content-Length size for full size photos	Max Kostikov	2018-11-16	1	-2/+4
\| \| \| \|
* \| \| \|	strlen($this->imageString()) does not return the correct size when dealing ↵	Mario Vavti	2018-11-16	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	with os_storage images. use filesize() instead. (cherry picked from commit afc75af62f759181bbe6a806b523c6ca52126f5f)
* \| \| \|	Merge branch 'dev_homeinstall_raspihub' into 'dev'	Mario	2018-11-16	3	-18/+46
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	localhost, URLs, version updates See merge request hubzilla/core!1396
\| * \ \ \	Merge remote-tracking branch 'official/dev' into dev_homeinstall_raspihub	OJ Random	2018-11-14	1	-1/+1
\| \|\ \ \ \
\| * \| \| \| \|	localhost, URLs, version updates	OJ Random	2018-11-14	3	-18/+46
\| \| \| \| \| \|
* \| \| \| \| \|	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2018-11-16	18	-121/+75
\|\ \ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|