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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-23	7	-5/+59
\|\
\| *	doco updates	redmatrix	2015-11-22	2	-1/+29
\| \|
\| *	delivery report tweaks	redmatrix	2015-11-22	3	-2/+27
\| \|
\| *	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2015-11-22	9	-352/+920
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: version.inc
\| * \|	webpages and design elements weren't being included in the item export query.	redmatrix	2015-11-22	2	-2/+3
\| \| \|
* \| \|	Documenting the need to change database server address from 127.0.0.1 to ↵	Haakon Meland Eriksen	2015-11-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	localhost when installing Hubzilla on OpenShift with the deploy script
* \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-22	4	-346/+886
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	update datetimepicker and fix it for finish date	Mario Vavti	2015-11-22	3	-342/+881
\| \| \|
\| * \|	do not hide scrollbars	Mario Vavti	2015-11-21	1	-1/+1
\| \| \|
\| * \|	datetimepicker should also respect first day of week setting	Mario Vavti	2015-11-21	2	-5/+6
\| \| \|
* \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-21	4	-2/+11
\|\\| \|
\| * \|	make calendar week start (sun or mon) configurable	Mario Vavti	2015-11-21	4	-2/+11
\| \| \|
* \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-21	3	-6/+25
\|\\| \|
\| * \|	Use http_status() instead of homegrowing it. Adapt http_status to handle ↵	ken restivo	2015-11-20	2	-5/+24
\| \| \| \| \| \| \| \| \| \| \| \|	replies with data.
\| * \|	Bump version, migrator needs to depend on it for f164ddf	ken restivo	2015-11-20	1	-1/+1
\| \|/
* \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-21	9	-27/+75
\|\\|
\| *	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2015-11-20	1	-0/+1
\| \|\
\| \| *	Report correct HTTP error code, i.e. for API callers.	ken restivo	2015-11-20	1	-0/+1
\| \| \|
\| * \|	add v4 project roadmap, partial fix for cloning of profile photos on ↵	redmatrix	2015-11-20	4	-4/+53
\| \|/ \| \| \| \| \| \|	alternate profiles
\| *	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2015-11-20	6	-3195/+3281
\| \|\
\| * \|	change _newwin to _blank because the window named _newwin may be hard to ↵	redmatrix	2015-11-20	4	-23/+21
\| \| \| \| \| \| \| \| \| \| \| \|	find if you have lots of windows/tabs open.
* \| \|	Space between Preview and Submit in jot.tpl	Haakon Meland Eriksen	2015-11-20	1	-1/+1
\| \| \|
* \| \|	Space between Preview and Submit in jot.tpl	Haakon Meland Eriksen	2015-11-20	1	-0/+2
\| \| \|
* \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-20	20	-4575/+4735
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Merge branch 'master' of https://github.com/redmatrix/hubzilla	Mario Vavti	2015-11-20	4	-3192/+3278
\| \|\ \
\| \| * \|	update es+nl	jeroenpraat	2015-11-20	4	-3192/+3278
\| \| \|/
\| * /	make calendar language aware	Mario Vavti	2015-11-20	2	-3/+3
\| \|/
\| *	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2015-11-20	1	-0/+6
\| \|\
\| * \|	issue #85, community tags and file tags lost during edits. This required ↵	redmatrix	2015-11-20	14	-1380/+1454
\| \| \| \| \| \| \| \| \| \| \| \|	splitting off communitytags as a separate tag type and is not backward compatible. Community tags on older posts or those federated from redmatrix clones will not be preserved during edits.
* \| \|	Rearranging buttons	Haakon Meland Eriksen	2015-11-20	1	-1/+1
\| \| \|
* \| \|	Rearranging buttons	Haakon Meland Eriksen	2015-11-20	1	-10/+3
\| \| \|
* \| \|	Rearranging buttons	Haakon Meland Eriksen	2015-11-20	1	-3/+5
\| \| \|
* \| \|	Rearranging buttons	Haakon Meland Eriksen	2015-11-20	1	-6/+8
\| \| \|
* \| \|	Rearranging buttons	Haakon Meland Eriksen	2015-11-20	1	-6/+6
\| \| \|
* \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-20	13	-13/+65
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Throw HTTP error and display error message when database is unavailable. #179	ken restivo	2015-11-19	1	-0/+6
\| \|/
\| *	change action label from 'stop following' to 'unfollow thread'	redmatrix	2015-11-19	1	-1/+1
\| \|
\| *	directory search for pubforums using hubzilla directory servers using ↵	redmatrix	2015-11-19	1	-3/+9
\| \| \| \| \| \| \| \|	redmatrix flag value
\| *	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2015-11-19	4	-3/+14
\| \|\
\| \| *	Had to switch these 2. Sorry.	jeroenpraat	2015-11-20	2	-1/+3
\| \| \|
\| \| *	Merge branch 'master' of https://github.com/redmatrix/hubzilla	jeroenpraat	2015-11-20	3	-4/+11
\| \| \|\
\| \| * \|	Some bits	jeroenpraat	2015-11-20	3	-4/+13
\| \| \| \|
\| * \| \|	new feature: 'suppress_duplicates' issue #146 triggered with less than two ↵	redmatrix	2015-11-19	3	-2/+24
\| \| \|/ \| \|/\| \| \| \| \| \| \|	minutes between posts having identical content.
\| * \|	issue #160 add blablanet to directory fallback list	redmatrix	2015-11-19	1	-0/+1
\| \| \|
\| * \|	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2015-11-19	6	-3/+19
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: version.inc
\| * \|	issue #173	redmatrix	2015-11-19	2	-4/+10
\| \| \|
* \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-19	6	-3/+19
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	move today button from aside to section title	Mario Vavti	2015-11-19	4	-3/+3
\| \| \|
\| * \|	css fixes	Mario Vavti	2015-11-19	2	-0/+16
\| \| \|
* \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-19	2	-4/+4
\|\\| \|