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

	Commit message (Expand)	Author	Age	Files	Lines
*	Use / for album name in photo activities if no album present.	redmatrix	2016-04-27	1	-1/+1
*	Merge branch 'master' into dev	redmatrix	2016-04-27	1	-1/+1
\|\
\| *	revup	redmatrix	2016-04-27	1	-1/+1
* \|	implement the singleton delivery stuff	redmatrix	2016-04-26	3	-8/+38
* \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	redmatrix	2016-04-26	5	-51/+36
\|\ \
\| * \|	only padding-top needs adjustment	Mario Vavti	2016-04-26	1	-2/+2
\| * \|	hopefully fix jot dropdown visibility issue	Mario Vavti	2016-04-26	1	-3/+5
\| * \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	Mario Vavti	2016-04-26	2	-7/+13
\| \|\ \
\| * \| \|	move spoiler= and quote= bbcode handling from prepare_body() to bbcode() and ...	Mario Vavti	2016-04-26	3	-46/+29
* \| \| \|	move iconfig functions to include/config.php with all the rest of the configs...	redmatrix	2016-04-26	5	-160/+179
\| \|/ / \|/\| \|
* \| \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	redmatrix	2016-04-26	1	-0/+9
\|\\| \|
\| * \|	fix top padding for narrow navbar	Mario Vavti	2016-04-26	1	-0/+9
* \| \|	Merge branch 'master' into dev	redmatrix	2016-04-26	1	-1/+1
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	revup	redmatrix	2016-04-26	1	-1/+1
* \| \|	some cleanup on the mysqli driver	redmatrix	2016-04-25	1	-6/+12
\| \|/ \|/\|
* \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	redmatrix	2016-04-25	12	-15360/+15804
\|\ \
\| * \	Merge pull request #356 from Treer/CUI	redmatrix	2016-04-26	2	-2/+97
\| \|\ \
\| \| * \|	improve error message in config and pconfig	Treer	2016-04-25	2	-0/+13
\| \| * \|	util/pconfig can list channel IDs	Treer	2016-04-25	1	-1/+13
\| \| * \|	add commandline help to util/pconfig	Treer	2016-04-25	1	-0/+34
\| \| * \|	add commandline help to util/config	Treer	2016-04-25	1	-2/+38
\| * \| \|	+es-es strings update	jeroenpraat	2016-04-25	4	-15342/+15688
\| * \| \|	make it more obvious what is behind the dropdowns	Mario Vavti	2016-04-25	6	-16/+19
* \| \| \|	Setup was horked after this commit and I couldn't easily make it right so rev...	redmatrix	2016-04-25	6	-87/+98
* \| \| \|	Revert "Revert "revert inline-block for blockquote""	redmatrix	2016-04-25	1	-1/+0
* \| \| \|	Revert "revert inline-block for blockquote"	redmatrix	2016-04-25	1	-0/+1
* \| \| \|	remove global db variable	redmatrix	2016-04-25	6	-98/+87
\|/ / /
* \| \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	redmatrix	2016-04-25	4	-51/+69
\|\\| \|
\| * \|	Merge pull request #355 from Treer/document_tweaks	redmatrix	2016-04-25	3	-50/+69
\| \|\ \
\| \| * \|	merged duplicate entry in docs	Treer	2016-04-25	1	-10/+12
\| \| * \|	add default_photo_profile to docs	Treer	2016-04-25	3	-43/+60
\| \|/ /
\| * \|	revert inline-block for blockquote	Mario Vavti	2016-04-24	1	-1/+0
* \| \|	Merge branch 'master' into dev	redmatrix	2016-04-25	1	-1/+1
\|\ \ \ \| \|/ / \|/\| / \| \|/
\| *	revup	redmatrix	2016-04-25	1	-1/+1
* \|	add some missing hook entries to the doco	redmatrix	2016-04-23	2	-2/+35
* \|	updated doco to document how to use hook callbacks which are object methods	redmatrix	2016-04-23	1	-0/+24
* \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	redmatrix	2016-04-23	39	-1567/+1876
\|\ \
\| * \|	fix context help position with narrow navbar	Mario Vavti	2016-04-23	2	-0/+5
\| * \|	update jquery.textcomplete to version 1.3.4 and add minified version	Mario Vavti	2016-04-23	3	-144/+444
\| * \|	update smarty to version 3.1.29	Mario Vavti	2016-04-23	29	-1337/+1371
\| * \|	make the link to /help in dropdown conditional to the use of context help	Mario Vavti	2016-04-23	1	-1/+1
\| * \|	bump std version to prevent issues with context help js changes	Mario Vavti	2016-04-23	1	-1/+1
\| * \|	pull-right is not needed here	Mario Vavti	2016-04-23	1	-1/+1
\| * \|	simplify context help js and move it to main.js where all the nav related js ...	Mario Vavti	2016-04-23	5	-83/+51
\| * \|	only display help button in collapsed panel if context help is enabled	Mario Vavti	2016-04-23	1	-2/+4
* \| \|	this should work to call a hook for a string class method	redmatrix	2016-04-23	1	-2/+12
* \| \|	Class method support for hooks	redmatrix	2016-04-23	2	-2/+13
\|/ /
* \|	Merge branch 'master' into dev	redmatrix	2016-04-23	3	-7225/+7468
\|\\|
\| *	Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge	redmatrix	2016-04-23	2	-7224/+7467
\| \|\
\| \| *	Merge pull request #352 from phellmes/de20160422	redmatrix	2016-04-23	2	-7224/+7467
\| \| \|\