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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge	zotlabs	2018-12-03	5	-27/+48
\|\
\| *	more notifications fixes	Mario Vavti	2018-12-03	1	-1/+1
\| \| \| \| \| \|	(cherry picked from commit 9ef6c57ca59aa318a3564f6b48c6442870650d3e)
\| *	catch exception if readImageBlob() receives bogus data	Mario Vavti	2018-12-03	1	-3/+7
\| \| \| \| \| \|	(cherry picked from commit 443d7684dbe8c1c3540df5aeb719403d67789747)
\| *	Merge branch 'photocache' into 'dev'	Max Kostikov	2018-12-03	1	-13/+18
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add flag to allow to save image without validation See merge request hubzilla/core!1416
\| \| *	Add Expires field support	Max Kostikov	2018-12-03	1	-11/+16
\| \| \|
\| \| *	Add flag to allow to save image without validation	Max Kostikov	2018-12-02	1	-2/+2
\| \| \|
\| * \|	Merge branch 'photocache' into 'dev'	M. Dent	2018-12-02	1	-5/+15
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Add Photo Cache addon support See merge request hubzilla/core!1412
\| \| *	Remove local_channel() check on cache_body_hook call	Max Kostikov	2018-12-02	1	-9/+7
\| \| \|
\| \| *	Check local_channel() before cache call	Max Kostikov	2018-11-30	1	-6/+8
\| \| \|
\| \| *	Move cache code to addon	Max Kostikov	2018-11-30	1	-17/+7
\| \| \|
\| \| *	Fix wrong parameter	Max Kostikov	2018-11-29	1	-4/+3
\| \| \|
\| \| *	Update text.php	Max Kostikov	2018-11-29	1	-5/+0
\| \| \|
\| \| *	Skip sslify for images if it already were cached with https enabled	Max Kostikov	2018-11-29	1	-1/+6
\| \| \|
\| \| *	Update text.php	Max Kostikov	2018-11-29	1	-1/+2
\| \| \|
\| \| *	Cache for viewer channel	Max Kostikov	2018-11-29	1	-5/+4
\| \| \|
\| \| *	Disable links to cached photos for non logged viewers	Max Kostikov	2018-11-29	1	-1/+1
\| \| \|
\| \| *	Update text.php	Max Kostikov	2018-11-29	1	-2/+2
\| \| \|
\| \| *	Add photo cache support using sslify()	Max Kostikov	2018-11-29	1	-6/+27
\| \| \|
\| * \|	Merge branch 'pdf_embed_fixes' into 'dev'	M. Dent	2018-12-02	1	-1/+5
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	make pdf preview 100% width and 300px height to match it openstreetmaps preview See merge request hubzilla/core!1414
\| \| * \|	make pdf preview 100% width and 300px height to match it openstreetmaps preview	Mario Vavti	2018-12-01	1	-1/+5
\| \| \|/
\| * \|	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2018-12-01	2	-4/+27
\| \|\ \ \| \| \|/ \| \|/\|
\| * \|	Merge remote-tracking branch 'mike/master' into dev	Mario	2018-11-23	2	-17/+19
\| \|\ \
\| * \ \	Merge remote-tracking branch 'mike/master' into dev	Mario	2018-11-22	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)
* \| \| \| \|	more work on z6 commenting	zotlabs	2018-12-03	1	-0/+15
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	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
* \| \|	use uuid in file storage	zotlabs	2018-11-22	1	-2/+2
\| \| \|
* \| \|	fix mastodon tag notifications (again)	zotlabs	2018-11-21	1	-15/+17
\| \|/ \|/\|
* \|	no mention notifications from mastodon (and pleroma)	zotlabs	2018-11-21	1	-4/+4
\|/
*	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