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

	Commit message (Collapse)	Author	Age	Files	Lines
*	fix help button for collapsed state	Mario Vavti	2016-04-21	3	-5/+6
\|
*	some fixes for contextual help and disable transition animation for now - it ↵	Mario Vavti	2016-04-21	4	-55/+57
\| \| \| \|	looked really wired because main moved with a different speed than help-content and help-content can not be displayed under the panel as it is implemented now.
*	Merge pull request #351 from anaqreon/toggle-context-help	git-marijus	2016-04-21	6	-51/+65
\|\ \| \| \| \|	Toggle context help
\| *	Added admin/site setting that toggles context help panel. If disabled, ↵	Andrew Manning	2016-04-21	4	-48/+57
\| \| \| \| \| \| \| \|	original help menu button behavior is restored.
\| *	Merge branch 'dev' into toggle-context-help	Andrew Manning	2016-04-20	326	-26364/+27310
\| \|\
\| * \|	Try toggling context help using onclick attribute	Andrew Manning	2016-04-19	4	-4/+9
\| \| \|
* \| \|	Merge pull request #348 from git-marijus/dev	git-marijus	2016-04-21	1	-5/+11
\|\ \ \ \| \| \| \| \| \| \| \|	add querystring to css and js which is added via head_add_{css, js}
\| * \| \|	add querystring to css and js which is added via head_add_{css, js}	Mario Vavti	2016-04-19	1	-5/+11
\| \| \| \|
* \| \| \|	make the cookie check agnostic to cookie state	redmatrix	2016-04-20	1	-5/+3
\| \| \| \|
* \| \| \|	revert the reversal of checkjs logic, but still restrict the behaviour scope ↵	redmatrix	2016-04-20	4	-7/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to just those urls that require it
* \| \| \|	send the correct number of args	redmatrix	2016-04-20	1	-1/+1
\| \| \| \|
* \| \| \|	We no longer require the diaspora_meta service locally.	redmatrix	2016-04-20	1	-3/+3
\| \| \| \|
* \| \| \|	Merge branch 'dmeta' into dev	redmatrix	2016-04-20	2	-8/+28
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	several diaspora changes/fixes
\| * \| \| \|	There is no longer a followup flag in the notifier. Remove all traces of it.	redmatrix	2016-04-20	1	-2/+0
\| \| \| \| \|
\| * \| \| \|	Merge branch 'dev' into dmeta	redmatrix	2016-04-20	7	-169/+11
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| * \| \| \|	bb2d updates from testing signature changes	redmatrix	2016-04-20	1	-5/+5
\| \| \| \| \|
\| * \| \| \|	testing dmeta	redmatrix	2016-04-19	1	-6/+5
\| \| \| \| \|
\| * \| \| \|	rework bb2diaspora for eradicating the diaspora comment virus	redmatrix	2016-04-19	1	-3/+26
\| \| \| \| \|
\| * \| \| \|	Revert the last edit on this file. Need to work this through a bit more ↵	redmatrix	2016-04-19	1	-15/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	before changing this bit.
\| * \| \| \|	second phase of diaspora comment virus eradication begins	redmatrix	2016-04-19	1	-17/+15
\| \| \| \| \|
* \| \| \| \|	upgrade std rev	redmatrix	2016-04-20	1	-1/+1
\| \|/ / / \|/\| \| \|
* \| \| \|	Merge branch 'master' into dev	redmatrix	2016-04-20	2	-3/+9
\|\ \ \ \
\| * \| \| \|	some crossbrowser rendering work on the comment box	Mario Vavti	2016-04-20	1	-1/+3
\| \| \| \| \|
\| * \| \| \|	Use stopImmidiatePropagation() only if we are in a list to not interfere ↵	Mario Vavti	2016-04-20	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	with other keypress listeners (e.g. chat).
* \| \| \| \|	Merge branch 'master' into dev	redmatrix	2016-04-20	1	-1/+1
\|\\| \| \| \|
\| * \| \| \|	revup #337	redmatrix	2016-04-20	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	missing class instance pointer in Pconfig module upgrade	redmatrix	2016-04-19	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	remove test files which were committed by accident	redmatrix	2016-04-19	3	-164/+0
\| \|/ / / \|/\| \| \|
* \| \| \|	Merge branch 'master' into dev	redmatrix	2016-04-19	1	-1/+1
\|\\| \| \| \| \|/ / \|/\| \|
\| * \|	Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge	redmatrix	2016-04-19	2	-1/+4
\| \|\ \
\| * \| \|	revup #337	redmatrix	2016-04-19	1	-1/+1
\| \| \| \|
* \| \| \|	a bit more namespace wrangling	redmatrix	2016-04-18	5	-9/+9
\| \| \| \|
* \| \| \|	module updates	redmatrix	2016-04-18	317	-26132/+27211
\| \| \| \|
* \| \| \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	redmatrix	2016-04-18	2	-1/+4
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Merge branch 'master' into dev	Mario Vavti	2016-04-18	1	-0/+1
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	bring back bbcode buttons for mod/editpost	Mario Vavti	2016-04-18	1	-0/+1
\| \| \| \|
\| * \| \|	Merge branch 'master' into dev	Mario Vavti	2016-04-18	1	-1/+3
\| \|\\| \|
\| \| * \|	fix rpost bbcode buttons and autocomplete	Mario Vavti	2016-04-18	1	-1/+3
\| \| \|/
* \| /	convert all the _well_known service controllers which are a bit touchy when ↵	redmatrix	2016-04-18	9	-228/+253
\|/ / \| \| \| \| \| \|	it comes to the router
* \|	Merge branch 'master' into dev	redmatrix	2016-04-18	5	-11601/+11629
\|\\|
\| *	revup #337	redmatrix	2016-04-18	1	-1/+1
\| \|
\| *	Spanish and Dutch strings update	jeroenpraat	2016-04-17	4	-11600/+11628
\| \|
* \|	some issues with GNU-Social's implementation of events in feeds. The summary ↵	redmatrix	2016-04-18	1	-2/+2
\| \| \| \| \| \| \| \|	element is over-riding content, so put summary into the xcal namespace. Some investigation reveals that both projects are non-compliant in the xcal space. Will deal with this later.
* \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	redmatrix	2016-04-17	20	-315/+348
\|\ \
\| * \|	Making sure the great new context help works with all thmes and schema's ↵	jeroenpraat	2016-04-18	6	-6/+62
\| \| \| \| \| \| \| \| \| \| \| \|	(3rd party themes: maybe abit of tweaking is still needed). Also fixing some minor cosmetic things.
\| * \|	Merge pull request #345 from anaqreon/context-help	redmatrix	2016-04-18	15	-315/+292
\| \|\ \ \| \| \| \| \| \| \| \|	New help panel that slides in from the top and pushes the content ...
\| \| * \|	Recover lost language translation accommodation and doc/context restructuring	Andrew Manning	2016-04-17	12	-110/+38
\| \| \| \|
\| \| * \|	New help panel that slides in from the top and pushes the content down so it ↵	Andrew Manning	2016-04-17	3	-205/+254
\| \|/ / \| \| \| \| \| \| \| \| \|	is not covered. Panel toggles with help button. Still some bugs with small screen viewing.
* \| \|	pull in the new object router and a few selected samples for the new ↵	redmatrix	2016-04-17	5	-1896/+1917
\| \| \| \| \| \| \| \| \| \| \| \|	controller layout
* \| \|	Merge commit '521d404' into dev	redmatrix	2016-04-17	5	-66/+115
\|\ \ \