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'	Max Kostikov	2018-12-20	1	-4/+13
\|\ \| \| \| \| \| \| \| \|	Dev See merge request kostikov/core!2
\| *	Merge branch 'revert-090fe394' into 'dev'	Max Kostikov	2018-12-20	1	-4/+13
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Fix cURL with HTTP/2" See merge request hubzilla/core!1446
\| \| *	Revert "Fix cURL with HTTP/2"	Max Kostikov	2018-12-20	1	-4/+13
\| \|/ \| \| \| \|	This reverts commit 090fe394e4733aea9e9ca2e9a93c2c27b266d065
* \|	Merge branch 'dev' into 'dev'	Max Kostikov	2018-12-20	16	-41/+196
\|\\| \| \| \| \| \| \| \| \|	Sync dev See merge request kostikov/core!1
\| *	Fix cURL with HTTP/2	Max Kostikov	2018-12-20	1	-13/+4
\| \|
\| *	missing observer check	Mario Vavti	2018-12-20	1	-0/+3
\| \|
\| *	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2018-12-20	1	-2/+87
\| \|\
\| \| *	reverse activity mapping improvements	zotlabs	2018-12-19	1	-2/+87
\| \| \|
\| \| *	Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge	zotlabs	2018-12-17	19	-21/+171
\| \| \|\
\| * \| \	Merge branch 'dark-fix-dev' into 'dev'	Mario	2018-12-19	3	-21/+28
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix for dark theme; includes one changes to bbcode.php and redbasic/css/style.css See merge request hubzilla/core!1442
\| \| * \| \|	remove color from style.css (default) but add a little padding; add color & ↵	phani00	2018-12-18	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	border radius to dark.css.
\| \| * \| \|	change hl text color to the default text color in non-dark schema. looks ↵	phani00	2018-12-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	good, except in dark, where i can change it in dark.css.
\| \| * \| \|	remove some fancy formatting.	phani00	2018-12-18	2	-5/+0
\| \| \| \| \|
\| \| * \| \|	new fix for dark theme	phani00	2018-12-17	3	-25/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	change implementation of hl-tags in include/bbcode.php insert class='default-highlight' instead of background-color: 'yellow' into span add span.default-highlight definition to view/theme/redbasic/css/style.css this works for all schemas incl. dark.
\| \| * \| \|	Merge branch 'dev' into dark-fix-dev	phani00	2018-12-17	4	-8/+35
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| * \| \|	remove my dark theme fixes.	phani00	2018-12-17	1	-5/+8
\| \| \| \| \|
\| * \| \| \|	Merge branch 'util-reload_addons' into 'dev'	Mario	2018-12-19	1	-0/+15
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add reload to util/addons See merge request hubzilla/core!1434
\| \| * \| \| \|	Add reload to util/addons	M. Dent	2018-12-19	1	-0/+15
\| \|/ / / /
\| * \| \| \|	Merge branch 'channel_b64_enc_mid' into 'dev'	Max Kostikov	2018-12-18	1	-0/+8
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	make mod channel deal with b64 encoded mid's See merge request hubzilla/core!1443
\| \| * \| \| \|	make mod channel deal with b64 encoded mid\s	Mario Vavti	2018-12-18	1	-0/+8
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	;
\| * \| \| \|	Merge branch 'dev' into 'dev'	Mario	2018-12-18	3	-97/+0
\| \|\ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove scale_external_images() See merge request hubzilla/core!1441
* \| \| \| \|	Remove scale_external_images()	Max Kostikov	2018-12-17	1	-2/+0
\| \| \| \| \|
* \| \| \| \|	Remove scale_external_images()	Max Kostikov	2018-12-17	1	-93/+0
\| \| \| \| \|
* \| \| \| \|	Remove scale_external_images()	Max Kostikov	2018-12-17	1	-2/+0
\| \| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2018-12-18	7	-16/+42
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| / \| \| \| \|/ \| \| \|/\|
\| \| * \|	regression: mail from dev to core not delivering	zotlabs	2018-12-17	2	-1/+8
\| \| \| \|
\| \| * \|	fix default values for affinity tool and other information which could be ↵	zotlabs	2018-12-17	5	-15/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	lost when approving a connection without the entire form provided by connedit.
\| * \| \|	Merge branch 'dev' into 'dev'	Mario	2018-12-17	1	-4/+10
\| \|\ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Keep remote site headers to respect caching policy See merge request hubzilla/core!1440
* \| \| \|	Keep remote site headers for caching	Max Kostikov	2018-12-17	1	-4/+10
\| \| \| \|
\| * \| \|	Merge branch 'memory-warn2' into 'dev'	Mario	2018-12-17	1	-0/+5
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add warning if upload_filesize < 4MB. See merge request hubzilla/core!1438
\| \| * \| \|	Update Zotlabs/Module/Setup.php	phani00	2018-12-16	1	-1/+0
\| \| \| \| \|
\| \| * \| \|	add warning if upload_filesize < 4MB.	phani00	2018-12-16	1	-0/+6
\| \| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2018-12-17	1	-0/+15
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| * \| \|	default curl to http/1.1	zotlabs	2018-12-16	1	-0/+15
\| \| \| \| \|
\| \| * \| \|	Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge	zotlabs	2018-12-13	10	-438/+493
\| \| \|\ \ \
\| * \| \ \ \	Merge branch 'dev' into 'dev'	Max Kostikov	2018-12-17	1	-6/+5
\| \|\ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move SSLify code from Photo cache addon See merge request hubzilla/core!1439
* \| \| \| \| \|	Move SSLify code from Photo cache addon	Max Kostikov	2018-12-17	1	-6/+5
\|/ / / / /
* \| \| \| \|	Revert Photos.php code	Max Kostikov	2018-12-17	1	-245/+1357
\| \| \| \| \|
* \| \| \| \|	SSLify cached URL on redirect if needed	Max Kostikov	2018-12-17	1	-1/+3
\| \| \| \| \|
* \| \| \| \|	SSLify cached URL on redirect if needed	Max Kostikov	2018-12-17	1	-1357/+245
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Remove photo_cache_enable variable	Max Kostikov	2018-12-16	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'patch-20181214a' into 'dev'	Mario	2018-12-16	1	-2/+10
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	ARTICLES MODULE: Default to local_channel() user when no argv(1) is passed. See merge request hubzilla/core!1427
\| * \| \|	Add return if no local_channel()	DM42.Net (Matt Dent)	2018-12-15	1	-1/+3
\| \| \| \|
\| * \| \|	ARTICLES MODULE: Default to local_channel() user when no argv(1) is passed.	DM42.Net (Matt Dent)	2018-12-14	1	-2/+8
\| \| \| \|
* \| \| \|	Merge branch 'dev' into 'dev'	M. Dent	2018-12-15	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update OAuth2Storage.php - fix email retrieval in getUser See merge request hubzilla/core!1436
\| * \| \| \|	Update OAuth2Storage.php - fix email retrieval in getUser	Pascal Deklerck	2018-12-15	1	-1/+1
\|/ / / /
* \| \| \|	Merge branch 'custom-item-types' into 'dev'	Mario	2018-12-15	6	-0/+98
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add ITEM_TYPE_CUSTOM and hooks for processing custom item types See merge request hubzilla/core!1431
\| * \| \| \|	Add ITEM_TYPE_CUSTOM and hooks for processing custom item types	DM42.Net (Matt Dent)	2018-12-14	6	-0/+98
\| \|/ / /
* \| \| \|	Merge branch 'patch-20181214f' into 'dev'	Mario	2018-12-15	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set min/maxversion for plugins to STD_VERSION unless otherwise specified See merge request hubzilla/core!1430
\| * \| \| \|	Set min/maxversion for plugins to STD_VERSION unless otherwise specified	DM42.Net (Matt Dent)	2018-12-14	1	-2/+2
\| \|/ / /