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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \|	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
\| \|\ \ \ \
\| * \ \ \ \	Merge remote-tracking branch 'mike/master' into dev	Mario	2018-11-23	3	-18/+20
\| \|\ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'mike/master' into dev	Mario	2018-11-22	3	-5/+8
\| \|\ \ \ \ \
\| * \| \| \| \| \|	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
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	fix update 1228	Mario Vavti	2018-11-15	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| \| * \|	fix call to undefined function	Mario Vavti	2018-11-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| \| * \|	fix typo which prevented propagation of comments	Mario Vavti	2018-11-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit 0c94747ab1c740f47e5a796f5c60efcdfcd29ba1)
\| \| \| \| \| \| \| \| \| * \|	version 3.8.53.8.5	Mario Vavti	2018-11-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| \| * \|	Merge branch 'master' of https://framagit.org/hubzilla/core	Mario Vavti	2018-11-19	1	-2/+0
\| \| \| \| \| \| \| \| \| \|\ \
\| \| \| \| \| \| \| \| \| \| * \|	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 (cherry picked from commit f34af496ec82555a0e070e91260dc6edb17f2d5a) 3787c490 Fix: delayed items propagate before publication on cloned channels
\| \| \| \| \| \| \| \| \| * \| \|	changelog	Mario Vavti	2018-11-19	1	-0/+9
\| \| \| \| \| \| \| \| \| \|/ /
\| \| \| \| \| \| \| \| \| * \|	update sql schemas to include update column in pconfig table	Mario Vavti	2018-11-19	2	-5/+5
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| \| * \|	recalculate photo filesize when rotating an image	Mario Vavti	2018-11-17	1	-10/+19
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| \| * \|	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.
\| \| \| \| \| \| \| \| \| * \|	Merge branch 'master' into 'master'	Mario	2018-11-16	1	-3/+3
\| \| \| \| \|_\|_\|_\|_\|/\| \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	delivery issue See merge request hubzilla/core!1397
\| \| \| \| \| \| \| \| \| * \|	delivery issue	zotlabs	2018-11-15	1	-3/+3
\| \| \| \| \|_\|_\|_\|_\|/ / \| \| \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	more merging	zotlabs	2018-12-03	1	-9/+67
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	more work on z6 commenting	zotlabs	2018-12-03	3	-64/+268
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	fix generated plink	zotlabs	2018-12-03	1	-3/+3
\| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	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
* \| \| \| \| \| \| \|	Organization actor type was missing	zotlabs	2018-11-23	1	-1/+1
\| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	use uuid in file storage	zotlabs	2018-11-22	2	-3/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	fix mastodon tag notifications (again)	zotlabs	2018-11-21	1	-15/+17
\| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
* \| \| \| \| \|	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
\| \| \| \| \| \|