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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'patch-20190107a' into 'dev'	Mario	2019-01-09	1	-6/+11
\|\ \| \| \| \| \| \| \| \|	Tweak to deal with changes that may happen within the same second. See merge request hubzilla/core!1462
\| *	Tweak to deal with changes that may happen within the same second.	DM42.Net (Matt Dent)	2019-01-07	1	-6/+11
\| \|
* \|	Merge branch 'browser_compatibility' into 'dev'	M. Dent	2019-01-07	1	-1/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	fix issue with IE See merge request hubzilla/core!1460
\| * \|	fix issue with IE	Mario Vavti	2019-01-07	1	-1/+5
\| \|/
* \|	Merge branch 'update_bbcode' into 'dev'	M. Dent	2019-01-07	1	-14/+3
\|\ \ \| \|/ \|/\| \| \| \| \|	Update bbcode See merge request hubzilla/core!1459
\| *	Update bbcode	Mario	2019-01-07	1	-14/+3
\|/
*	Merge branch 'check_content_type-1' into 'dev'	Max Kostikov	2019-01-03	1	-5/+8
\|\ \| \| \| \| \| \| \| \|	fix content type check See merge request hubzilla/core!1458
\| *	missing closing parenthesis	Mario Vavti	2019-01-03	1	-1/+1
\| \|
\| *	fix content type check	Mario Vavti	2019-01-03	1	-5/+8
\|/
*	Merge branch 'revert-3f61d24d' into 'dev'	Max Kostikov	2019-01-03	1	-7/+4
\|\ \| \| \| \| \| \| \| \|	Revert "Merge branch 'check_content_type' into 'dev'" See merge request hubzilla/core!1456
\| *	Revert "Merge branch 'check_content_type' into 'dev'"	Max Kostikov	2019-01-03	1	-7/+4
\|/ \| \|	This reverts merge request !1453
*	Merge branch 'update_boot' into 'dev'	Max Kostikov	2019-01-03	1	-1/+2
\|\ \| \| \| \| \| \| \| \|	add zotsite.net to directory fallback servers See merge request hubzilla/core!1454
\| *	add zotsite.net to directory fallback servers	Mario Vavti	2019-01-02	1	-1/+2
\| \|
* \|	Merge branch 'check_content_type' into 'dev'	Max Kostikov	2019-01-03	1	-4/+7
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	check suppported type if we get content type from header See merge request hubzilla/core!1453
\| * \|	check suppported type if we get content type from header	Mario Vavti	2019-01-02	1	-4/+7
\| \|/
* \|	Merge branch 'fix_pconfig' into 'dev'	Max Kostikov	2019-01-03	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	fix preg_match(): Delimiter must not be alphanumeric or backslash warning See merge request hubzilla/core!1452
\| * \|	fix preg_match(): Delimiter must not be alphanumeric or backslash warning	Mario Vavti	2019-01-02	1	-1/+1
\| \|/
* \|	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2019-01-03	1	-1/+6
\|\ \
\| * \|	better handling of notification updates while commenting	zotlabs	2019-01-02	1	-1/+6
\| \| \|
* \| \|	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2019-01-02	2	-4/+4
\|\\| \|
\| * \|	allow notification updates when composing comments. This was disabled when ↵	zotlabs	2019-01-02	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|	it was possible to have liveUpdate run automatically while composing comments, but it seems that live update is no longer possible (however the setting still remains - this should probably be removed).
* \| \|	Revert "Use subselect"	Mario	2019-01-02	1	-4/+4
\| \| \| \| \| \| \| \| \|	This reverts commit a50433dd958ec52eec88867517b3ae6467758618
* \| \|	Merge branch 'patch-20181230a' into 'dev'	Mario	2019-01-02	1	-4/+4
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \|	Use subselect See merge request hubzilla/core!1451
\| * \|	Use subselect	DM42.Net (Matt Dent)	2018-12-30	1	-4/+4
\| \| \|
* \| \|	Faster image processing with photo cache addon	Max Kostikov	2018-12-24	1	-5/+6
\| \| \|
* \| \|	update changelog	Mario Vavti	2018-12-22	1	-0/+18
\| \| \|
* \| \|	Merge branch 'fix_linkinfo_warning' into 'dev'	Mario	2018-12-22	1	-3/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	check if we deal with an array before sizeof() See merge request hubzilla/core!1444
\| * \| \|	use count() instead of sizeof()	Mario Vavti	2018-12-19	1	-1/+1
\| \| \| \|
\| * \| \|	check if we deal with an array before sizeof()	Mario Vavti	2018-12-19	1	-3/+3
\| \| \| \|
* \| \| \|	revert padding for text highlight. It is messing with indent punctuation and ↵	Mario Vavti	2018-12-22	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	decreases legibility of the highlighted text.
* \| \| \|	Merge branch 'dev' into 'dev'	Mario	2018-12-21	1	-13/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix for cURL with default HTTP/2 See merge request hubzilla/core!1447
\| * \| \| \|	Fix for cURL with default HTTP/2	Max Kostikov	2018-12-20	1	-13/+4
\| \| \| \| \|
\| * \| \| \|	Merge branch 'dev' into 'dev'	Max Kostikov	2018-12-20	1	-4/+13
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Dev See merge request kostikov/core!2
\| * \ \ \ \	Merge branch 'dev' into 'dev'	Max Kostikov	2018-12-20	16	-41/+196
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sync dev See merge request kostikov/core!1
* \| \ \ \ \ \	Merge branch 'remove-legacy-photo-cache-prevention' into 'dev'	Max Kostikov	2018-12-21	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	do not add timestamp to the photo src. caching is handled in mod photo now. See merge request hubzilla/core!1448
\| * \| \| \| \| \| \|	do not add timestamp to the photo src. caching is handled in mod photo now.	Mario Vavti	2018-12-21	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2018-12-21	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| / \| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
\| * \| \| \| \|	like permission issue	zotlabs	2018-12-20	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	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
* \| \| \| \|	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.