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	2	-4/+27
\|\
\| *	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	1	-0/+23
\| \| \| \| \| \| \| \|	to keep your DB from getting trashed. We probably need a similar thing for item import since the object formats aren't compatible
* \|	Merge remote-tracking branch 'mike/master' into dev	Mario	2018-11-23	2	-17/+19
\|\\|
\| *	use uuid in file storage	zotlabs	2018-11-22	1	-2/+2
\| \|
\| *	fix mastodon tag notifications (again)	zotlabs	2018-11-21	1	-15/+17
\| \|
* \|	Merge remote-tracking branch 'mike/master' into dev	Mario	2018-11-22	1	-4/+4
\|\\|
\| *	no mention notifications from mastodon (and pleroma)	zotlabs	2018-11-21	1	-4/+4
\| \|
* \|	Fix: delayed items propagate before publication on cloned channels	DM42.Net (Matt Dent)	2018-11-18	1	-2/+0
\| \|
* \|	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)
*	datetime_convert wrong args	zotlabs	2018-11-15	1	-1/+1
\|
*	delivery report issue	zotlabs	2018-11-15	1	-2/+3
\|
*	add item.uuid to relevant places	zotlabs	2018-11-15	7	-13/+28
\|
*	fixes to old z6 delivery	zotlabs	2018-11-14	1	-4/+3
\|
*	more logging	zotlabs	2018-11-14	1	-0/+2
\|
*	more logging	zotlabs	2018-11-14	1	-0/+1
\|
*	check keyid	zotlabs	2018-11-14	1	-1/+1
\|
*	filter by network	zotlabs	2018-11-14	1	-2/+2
\|
*	crypto fix	zotlabs	2018-11-14	1	-1/+1
\|
*	Merge branch 'master' into zvi	zotlabs	2018-11-14	2	-21/+1
\|\
\| *	Merge branch 'patch-20181113b' into 'dev'	Mario	2018-11-14	1	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Patch 20181113b See merge request hubzilla/core!1395
\| \| *	Revert "Filter search box before display"	DM42.Net (Matt Dent)	2018-11-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 35e66770be6ca93c9090cdab221e6c33a410a569.
\| * \|	Merge branch 'dev' into 'dev'	Mario	2018-11-14	1	-20/+0
\| \|\ \ \| \| \|/ \| \|/\| \| \| \| \| \| \|	Remove unneccessary fetch_image_from_url() function See merge request hubzilla/core!1393
\| \| *	Remove fetch_image_from_url() because of functions duplicate	Max Kostikov	2018-11-13	1	-20/+0
\| \| \|
* \| \|	Merge branch 'master' into zvi	zotlabs	2018-11-13	4	-152/+198
\|\\| \|
\| * \|	Filter search box before display	DM42.Net (Matt Dent)	2018-11-13	1	-1/+1
\| \| \|
\| * \|	fix css issues in bbcode conversion and focus-light schema	Mario Vavti	2018-11-12	1	-6/+6
\| \|/
\| *	Merge branch 'dev' into 'dev'	Max Kostikov	2018-11-10	1	-9/+9
\| \|\ \| \| \| \| \| \| \| \| \|	# Conflicts: # include/photo/photo_driver.php
\| \| *	Merge branch 'dev' into 'dev'	Mario	2018-11-10	1	-9/+9
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove DNS check for database connection during installation... See merge request hubzilla/core!1384
\| \| \| *	Remove DNS check for database connection during installation. Causes ↵	Andrew Manning	2018-11-09	1	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	friction with Docker deployment.
\| \| * \|	Fixed wrong value assign on compare with 0	Max Kostikov	2018-11-10	1	-1/+1
\| \| \| \|
\| * \| \|	Update photo_driver.php	Max Kostikov	2018-11-10	1	-1/+1
\| \| \| \|
\| * \| \|	Fixed wrong value assign on compare with 0	Max Kostikov	2018-11-10	1	-1/+1
\| \|/ /
\| * \|	Do not return default images from vCard	Max Kostikov	2018-11-10	1	-1/+0
\| \| \|
\| * \|	Preserve received image modification date on caching	Max Kostikov	2018-11-09	1	-11/+16
\| \| \|
\| * \|	Merge branch 'patch-1' into 'dev'	Mario	2018-11-09	1	-128/+156
\| \|\ \ \| \| \|/ \| \|/\| \| \| \| \| \| \|	Return image modification date on remote fetch for caching See merge request hubzilla/core!1383
\| \| *	remove image type double guess by checking HTTP headers	Max Kostikov	2018-11-08	1	-23/+7
\| \| \|
\| \| *	Return image modification date using HTTP 'Last-Modified' and '304 Not ↵	Max Kostikov	2018-11-08	1	-115/+159
\| \| \| \| \| \| \| \| \| \| \| \|	Modified' on remote fetch for caching
\| * \|	Workaround for local resource path to photo from Diaspora	Max Kostikov	2018-11-09	1	-0/+1
\| \|/
\| *	provide a function to log to syslog	Mario Vavti	2018-11-08	1	-0/+13
\| \|
\| *	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2018-11-07	3	-45/+95
\| \|\
* \| \|	stay ahead of the game	zotlabs	2018-11-13	1	-2/+2
\| \| \|
* \| \|	item uuid changes	zotlabs	2018-11-12	2	-20/+11
\| \| \|
* \| \|	dreport updates	zotlabs	2018-11-12	1	-4/+6
\| \| \|
* \| \|	more z6 debugging	zotlabs	2018-11-11	2	-8/+12
\| \| \|
* \| \|	add zot6 delivery method	zotlabs	2018-11-08	1	-23/+76
\| \| \|
* \| \|	begin native summary support	zotlabs	2018-11-08	2	-4/+34
\| \| \|
* \| \|	Merge branch 'master' into zvi	zotlabs	2018-11-07	2	-4/+37
\|\ \ \
\| * \| \|	Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge	zotlabs	2018-11-07	2	-4/+37
\| \|\\| \| \| \| \|/ \| \|/\|
\| \| *	Merge branch 'patch-20181028a' into 'dev'	Mario	2018-11-05	2	-4/+37
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add timestamp to pconfig See merge request hubzilla/core!1355