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-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
\|\\| \|
\| * \|	Bump version so migrator tool can verify that mods to account.php etc in ↵	ken restivo	2015-11-18	1	-1/+1
\| \|/ \| \| \| \| \| \|	312cc41 and 1f2a408 were applied.
\| *	rename some menus	Mario Vavti	2015-11-19	1	-3/+3
\| \|
* \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-19	26	-5770/+16731
\|\\|
\| *	remove more unneeded files	Mario Vavti	2015-11-18	7	-157/+0
\| \|
\| *	move moment.min.js and remove unneeded files	Mario Vavti	2015-11-18	425	-111600/+1
\| \|
\| *	Merge branch 'master' of https://github.com/redmatrix/hubzilla	Mario Vavti	2015-11-18	4	-9/+10
\| \|\
\| * \|	some events refacturing	Mario Vavti	2015-11-18	456	-5770/+128487
\| \| \|
* \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-18	4	-9/+10
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2015-11-18	2	-8/+8
\| \|\ \
\| \| * \|	Pass in account_id. Required for bulk identity importer.	ken restivo	2015-11-18	2	-5/+5
\| \| \| \|
\| \| * \|	Use provided account_id instead of user's logged in account_id. Necessary ↵	ken restivo	2015-11-18	1	-3/+3
\| \| \|/ \| \| \| \| \| \| \| \| \|	for bulk importer.
\| * /	wsod viewing photo widget	redmatrix	2015-11-18	2	-1/+2
\| \|/
* \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-18	3	-3/+25
\|\\|
\| *	fix admin plugin hooks	redmatrix	2015-11-17	3	-3/+25
\| \|
* \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-18	10	-19/+23
\|\\|
\| *	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2015-11-17	13	-230/+599
\| \|\
\| \| *	whitespace	Mario Vavti	2015-11-17	1	-1/+1
\| \| \|
\| \| *	more css fixes	Mario Vavti	2015-11-17	6	-16/+14
\| \| \|
\| * \|	photo album widget permissions issue	redmatrix	2015-11-17	4	-3/+9
\| \| \|
* \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-17	14	-233/+622
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	missing closing " for src attribute	Mario Vavti	2015-11-17	1	-1/+1
\| \| \|
\| * \|	update bootstrap lib 3.3.4 -> 3.3.5	Mario Vavti	2015-11-17	6	-195/+568
\| \| \|
\| * \|	css fixes	Mario Vavti	2015-11-17	2	-7/+9
\| \| \|
\| * \|	show jotnets toggle button only if there are jotnets and whitespace fixes	Mario Vavti	2015-11-17	1	-14/+10
\| \|/
\| *	fix api/direct_messages/new at least for the json case. We seem to have a ↵	redmatrix	2015-11-16	4	-16/+34
\| \| \| \| \| \| \| \|	missing template for XML
* \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-11-16	10	-26/+51
\|\\|
\| *	tag_deliver of an edit to an already uplinked item wasn't resetting ↵	redmatrix	2015-11-15	1	-1/+4
\| \| \| \| \| \| \| \|	permissions and ownership bits before starting delivery chain on the edit.
\| *	allow plugins to also log to a different named logfile and also alter the ↵	redmatrix	2015-11-15	1	-1/+1
\| \| \| \| \| \| \| \|	log message
\| *	add logger plugin hook	redmatrix	2015-11-15	1	-0/+16
\| \|
\| *	permission issues editing wall-to-wall posts	redmatrix	2015-11-15	3	-9/+19
\| \|
\| *	issue with dead hub detection	redmatrix	2015-11-15	1	-1/+1
\| \|
\| *	revert html in markdown for posts, but trim the input before processing the ↵	redmatrix	2015-11-15	2	-2/+2
\| \| \| \| \| \| \| \|	markdown
\| *	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2015-11-15	7	-1138/+1160
\| \|\
\| * \|	issues connecting to local forum	redmatrix	2015-11-15	3	-13/+9
\| \| \|