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-21	8	-102/+125
\|\
\| *	remove obsolete class	Mario Vavti	2016-04-21	1	-4/+0
\| \|
\| *	indicate if we will be displayed contextual help or default help	Mario Vavti	2016-04-21	2	-3/+7
\| \|
\| *	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
\| \| \| \| \|
* \| \| \| \|	new hook interface (the old one still works but requires handlers to have ↵	redmatrix	2016-04-21	6	-17/+110
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	two calling arguments; the first of which is no longer used). The new interface is called from Zotlabs\Extend\Hook::register() and allows you to specify which hook version to use. The default will be the new interface with one function argument. We also implement the hook priority field which was always there but needed to be set manually in the DB. This provides a way for two hook handlers that implement the same hook interface to determine which order to be called in the event of conflicts.
* \| \| \| \|	provide a way for the router to support custom controller objects and allow ↵	redmatrix	2016-04-21	1	-11/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	plugins to register class objects as modules instead of the traditional procedural interface.
* \| \| \| \|	Merge branch 'master' into dev	redmatrix	2016-04-21	2	-13/+13
\|\ \ \ \ \
\| * \ \ \ \	Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge	redmatrix	2016-04-21	1	-12/+12
\| \|\ \ \ \ \
\| \| * \ \ \ \	Merge pull request #349 from HaakonME/master	git-marijus	2016-04-21	1	-12/+12
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated Hubzilla on OpenShift deploy script to include unofficial repos
\| \| \| * \| \| \| \|	Updated Hubzilla on OpenShift deploy script to include unofficial repos by ↵	Haakon Meland Eriksen	2016-04-19	1	-19/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	appending the 'insecure' argument
\| \| \| * \| \| \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-04-18	7	-11602/+11633
\| \| \| \|\ \ \ \ \
\| \| \| * \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-04-16	1	-1/+1
\| \| \| \|\ \ \ \ \ \
\| \| \| * \| \| \| \| \| \|	Commented out extra repos except official addons	Haakon Meland Eriksen	2016-04-16	1	-12/+12
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	revup #337	redmatrix	2016-04-21	1	-1/+1
\| \|/ / / / / / / /
* \| \| \| \| / / / /	change the 404 warning from the router to reflect the new architecture	redmatrix	2016-04-20	1	-4/+5
\| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	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
\| \| \| \| \| \|