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 dev_merge	redmatrix	2016-04-30	541	-25213/+29542
\|\
\| *	Merge pull request #362 from Treer/fontawesome	redmatrix	2016-05-01	512	-22656/+27156
\| \|\ \| \| \| \| \| \|	Update Font-Awesome to 4.6.1
\| \| *	update icon names in library	Treer	2016-05-01	2	-8/+8
\| \| \|
\| \| *	update icon names in view/	Treer	2016-05-01	85	-349/+349
\| \| \|
\| \| *	update icon names in view/js	Treer	2016-05-01	7	-68/+68
\| \| \|
\| \| *	update icon names in include/	Treer	2016-05-01	6	-34/+34
\| \| \|
\| \| *	update icon names in Zotlabs/	Treer	2016-05-01	3	-5/+5
\| \| \|
\| \| *	update font-awesome library to 4.6.1	Treer	2016-04-30	409	-22192/+26692
\| \| \| \| \| \| \| \| \| \| \| \|	Perhaps this should be done as a submodule instead?
\| * \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	Mario Vavti	2016-04-30	2	-6/+7
\| \|\ \
\| \| * \	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	jeroenpraat	2016-04-30	10	-463/+333
\| \| \|\ \
\| \| * \| \|	Small fix of Dutch strings	jeroenpraat	2016-04-30	2	-6/+7
\| \| \| \| \|
\| * \| \| \|	css fix	Mario Vavti	2016-04-30	3	-15/+5
\| \| \|/ / \| \|/\| \|
\| * \| \|	whitespace	Mario Vavti	2016-04-30	1	-36/+35
\| \| \| \|
\| * \| \|	more work on layout editors	Mario Vavti	2016-04-30	2	-5/+7
\| \| \| \|
\| * \| \|	make mod editlayout use status_editor()	Mario Vavti	2016-04-30	2	-108/+55
\| \| \| \|
\| * \| \|	add dl bbcode to the expanded autocomplete	Mario Vavti	2016-04-30	1	-2/+2
\| \| \| \|
\| * \| \|	minor cleanup	Mario Vavti	2016-04-30	1	-24/+16
\| \| \| \|
\| * \| \|	Merge pull request #361 from Treer/bbcode	git-marijus	2016-04-30	6	-291/+221
\| \|\ \ \ \| \| \|/ / \| \|/\| \|	Add definition lists to bbcode
\| \| * \|	clean up some doc/ formatting	Treer	2016-04-30	2	-288/+128
\| \| \| \|
\| \| * \|	improve whitespace control around definition list ([dl]) bbcode	Treer	2016-04-30	1	-4/+6
\| \| \| \|
\| \| * \|	Add definition lists to bbcode	Treer	2016-04-30	4	-3/+91
\| \| \| \|
\| * \| \|	Update NL+ES-ES	jeroenpraat	2016-04-30	4	-1916/+1888
\| \| \|/ \| \|/\|
\| * \|	get rid of the unused ispublic variable	Mario Vavti	2016-04-29	9	-27/+4
\| \| \|
\| * \|	css fix	Mario Vavti	2016-04-29	1	-1/+2
\| \| \|
\| * \|	Merge pull request #360 from sasiflo/dev_sasiflo_contexthelp	git-marijus	2016-04-29	13	-0/+96
\| \|\ \ \| \| \| \| \| \| \| \|	context help: added german translation
\| \| * \	Merge branch 'dev' into dev_sasiflo_contexthelp	sasiflo	2016-04-29	1	-25/+0
\| \| \|\ \
\| \| * \| \|	Added german translation to context help.	sasiflo	2016-04-29	13	-0/+96
\| \| \| \| \|
\| * \| \| \|	some work on making mod editpost use status_editor() - if you find anything ↵	Mario Vavti	2016-04-29	4	-109/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	related to jot broken please revert this commit
\| * \| \| \|	css fixes	Mario Vavti	2016-04-29	1	-5/+1
\| \| \|/ / \| \|/\| \|
\| * \| \|	jot: cleanup unused variables	Mario Vavti	2016-04-29	1	-25/+0
\| \|/ /
* \| \|	Merge branch 'master' into dev	redmatrix	2016-04-29	2	-794/+779
\|\ \ \
\| * \| \|	version+strings	redmatrix	2016-04-29	2	-794/+779
\| \| \| \|
* \| \| \|	trim engr_units string slight improvement to avoid subtle bugs	redmatrix	2016-04-29	1	-1/+3
\| \|/ / \|/\| \|
* \| \|	allow engineering units (e.g. 400M, 1G) as service class limits	redmatrix	2016-04-28	9	-13/+16
\| \| \|
* \| \|	This setting isn't implemented so remove the UI until it is.	redmatrix	2016-04-28	2	-4/+1
\| \| \|
* \| \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	redmatrix	2016-04-28	2	-5/+23
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	provide help button in context help popup	Mario Vavti	2016-04-28	2	-5/+22
\| \| \|
\| * \|	css fix	Mario Vavti	2016-04-28	1	-0/+1
\| \| \|
* \| \|	Merge branch 'master' into dev	redmatrix	2016-04-28	1	-1/+1
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	revup	redmatrix	2016-04-28	1	-1/+1
\| \| \|
* \| \|	provide a Hook method to unregister all hooks with a given filespec ↵	redmatrix	2016-04-27	1	-0/+21
\| \|/ \|/\| \| \| \| \|	component. This will be useful in upgrading plugins to use new interfaces, as you won't have to individually unregister hook declarations that you are no longer using in the code.
* \|	provide courtesy function for syncing one item. We'll probably be doing this ↵	redmatrix	2016-04-27	1	-0/+15
\| \| \| \| \| \| \| \|	a lot.
* \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	redmatrix	2016-04-27	11	-40/+78
\|\ \
\| * \	Merge pull request #359 from anaqreon/help-content	redmatrix	2016-04-28	7	-3/+48
\| \|\ \ \| \| \| \| \| \| \| \|	Help content
\| \| * \|	Added context help content	Andrew Manning	2016-04-27	5	-1/+29
\| \| \| \|
\| \| * \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into help-content	Andrew Manning	2016-04-27	23	-15602/+16085
\| \| \|\ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	some refinements on jot	Mario Vavti	2016-04-27	4	-37/+30
\| \| \| \|
\| \| * \|	Merge remote-tracking branch 'upstream/dev' into help-content	Andrew Manning	2016-04-25	53	-1636/+2042
\| \| \|\ \
\| \| * \ \	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into help-content	Andrew Manning	2016-04-23	4	-7227/+7472
\| \| \|\ \ \
\| \| * \| \| \|	Added help content	Andrew Manning	2016-04-22	3	-3/+20
\| \| \| \| \| \|