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://github.com/redmatrix/hubzilla into xdev_merge	zotlabs	2017-04-07	3	-11094/+10565
\|\
\| *	Merge pull request #712 from zotlabs/fr_update	git-marijus	2017-04-07	2	-11080/+10559
\| \|\ \| \| \| \| \| \|	Fr update (Monret)
\| \| *	fr strings update (Monret)	zotlabs	2017-04-03	2	-11080/+10559
\| \| \|
\| \| *	Revert "fr strings update (Monret)"	zotlabs	2017-04-03	2	-10559/+11080
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 4e4d406d23e01a6aa0992c94baea0fd676f04d1e.
\| \| *	fr strings update (Monret)	zotlabs	2017-04-03	2	-11080/+10559
\| \| \|
\| * \|	the string was there but the template var was wrong	Mario Vavti	2017-04-07	1	-1/+1
\| \| \|
\| * \|	css fixes and missing string	Mario Vavti	2017-04-07	1	-14/+6
\| \| \|
* \| \|	fix from downstream	zotlabs	2017-04-07	1	-1/+1
\| \| \|
* \| \|	revert grid and bars icon size change	zotlabs	2017-04-05	1	-1/+1
\| \| \|
* \| \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	zotlabs	2017-04-05	4	-10/+3
\|\\| \|
\| * \|	we should probably stick to 0.875rem font-size (this is equal to 14px with a ↵	Mario Vavti	2017-04-05	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	default browser setting of 16px) to give 90% of the members a nice desktop experience. The font-awesome icons are only rendered clean with 14px (and multiples) fontsize. They look somewhat unfocused with 16px font-size. The font-size setting has moved to display setting -> custom theme settings. Set it to 1rem there to use the slightly taller default browser size.
\| * \|	adjust font-size	Mario Vavti	2017-04-05	1	-1/+1
\| \| \|
\| * \|	update bd-dev and remove hotfix	Mario Vavti	2017-04-05	1	-7/+0
\| \|/
* \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	zotlabs	2017-03-31	13	-59/+57
\|\\|
\| *	triple a is more sane	Mario Vavti	2017-03-31	1	-1/+1
\| \|
\| *	minor css adjustments	Mario Vavti	2017-03-31	1	-1/+5
\| \|
\| *	various form css fixes	Mario Vavti	2017-03-31	10	-42/+38
\| \|
\| *	make btn-outline-secondary color slightly darker	Mario Vavti	2017-03-31	1	-0/+4
\| \|
\| *	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	Mario Vavti	2017-03-31	2	-7/+2
\| \|\
\| \| *	Merge pull request #710 from dawnbreak/importcsrf	git-marijus	2017-03-31	2	-7/+2
\| \| \|\ \| \| \| \| \| \| \| \|	:lock: Add CSRF protection for import and import_items.
\| * \| \|	css fixes	Mario Vavti	2017-03-31	3	-17/+9
\| \|/ /
\| * \|	add max height to #navbar-collapse-2	Mario Vavti	2017-03-31	2	-0/+2
\| \| \|
* \| \|	Merge branch 'importcsrf' of https://github.com/dawnbreak/hubzilla into csrf	zotlabs	2017-03-30	2	-7/+2
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	:lock: Add CSRF protection for import and import_items.	Klaus Weidenbach	2017-03-30	2	-7/+2
\| \|/
* \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	zotlabs	2017-03-30	3	-48/+22
\|\\|
\| *	more css fixes	Mario Vavti	2017-03-30	2	-1/+5
\| \|
\| *	css fixes	Mario Vavti	2017-03-30	2	-47/+17
\| \|
* \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	zotlabs	2017-03-29	4	-7/+15
\|\\|
\| *	css fixes	Mario Vavti	2017-03-29	1	-2/+11
\| \|
\| *	allow setting the system email name/address/reply	zotlabs	2017-03-29	1	-0/+5
\| \|
\| *	begin the process of using the relevant attach directory/path for photo ↵	zotlabs	2017-03-29	1	-3/+3
\| \| \| \| \| \| \| \|	albums instead of an album basename which may not be unique. Created an 'ellipsify()' function to shorten long names and keep the beginning and end intact
\| *	more markdown purification	zotlabs	2017-03-29	1	-2/+1
\| \|
\| *	even more fine tuning of the markdown purifier - especially when used with ↵	zotlabs	2017-03-29	1	-1/+1
\| \| \| \| \| \| \| \|	the wiki
\| *	various input filter fixes	zotlabs	2017-03-29	1	-1/+2
\| \|
\| *	dim class was un-themed	zotlabs	2017-03-29	2	-4/+4
\| \|
\| *	remove the unimplemented upload limit site settings	zotlabs	2017-03-29	1	-3/+0
\| \|
\| *	namespace error	Mario Vavti	2017-03-29	1	-1/+0
\| \|
* \|	scaling issue with fa-th and fa-bars icons when using boostrap-red.css:37 ↵	zotlabs	2017-03-28	1	-1/+1
\| \| \| \| \| \| \| \|	#navbar-collapse-1 i { font-size 1.0rem; }; FF 52.0.1 on Win7; 0.9rem and 1.1rem both render much better. 1.1 is a bit large so going with 0.9
* \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	zotlabs	2017-03-28	11	-41/+61
\|\\|
\| *	minor bs4 fixes	Mario Vavti	2017-03-28	4	-12/+12
\| \|
\| *	some fixes for latest bs-dev	Mario Vavti	2017-03-28	4	-2/+12
\| \|
\| *	fixes for latest bootstrap	Mario Vavti	2017-03-28	4	-24/+30
\| \|
\| *	update to latest bs-dev	Mario Vavti	2017-03-28	4	-7/+7
\| \|
\| *	links in wall-item-title must have white colour if the background is bg-primary	Mario Vavti	2017-03-28	1	-0/+4
\| \|
* \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	zotlabs	2017-03-27	9	-78/+40
\|\\|
\| *	adjust comment box	Mario Vavti	2017-03-27	1	-2/+3
\| \|
\| *	fix app rendering	Mario Vavti	2017-03-27	4	-8/+6
\| \|
\| *	unify css classes	Mario Vavti	2017-03-27	3	-44/+16
\| \|
\| *	css fixes	Mario Vavti	2017-03-27	3	-31/+22
\| \|
* \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	zotlabs	2017-03-26	8	-204/+33
\|\\|