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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'dev' into red	zotlabs	2017-03-13	1	-1/+1
\|\
\| *	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	zotlabs	2017-03-13	2	-2/+2
\| \|\
\| \| *	Merge pull request #697 from anaqreon/dev	git-marijus	2017-03-13	1	-1/+1
\| \| \|\ \| \| \| \| \| \| \| \|	Add id to app-menu for JS access
\| \| \| *	Add id to app-menu for JS access	Andrew Manning	2017-03-12	1	-1/+1
\| \| \| \|
\| \| * \|	we need to have this even if we are not the owner. otherwise we loose the ↵	Mario Vavti	2017-03-13	1	-1/+1
\| \| \|/ \| \| \| \| \| \| \| \| \|	acl if e.g. not-owner edits a webpage. should probably find a better solution for this though.
* \| \|	move oauth2 to vendor	zotlabs	2017-03-14	132	-3612/+1324
\| \| \|
* \| \|	better handling of mimetype security	zotlabs	2017-03-12	3	-20/+7
\| \| \|
* \| \|	remove more hardwired branding	zotlabs	2017-03-12	3	-65/+67
\| \| \|
* \| \|	update license	zotlabs	2017-03-12	1	-1/+1
\| \| \|
* \| \|	update readme	zotlabs	2017-03-12	1	-27/+3
\| \| \|
* \| \|	grrr. stop making branding assumptions.	zotlabs	2017-03-12	6	-13/+8
\| \| \|
* \| \|	more cleanup	zotlabs	2017-03-12	1	-29/+35
\| \| \|
* \| \|	update std_version	zotlabs	2017-03-12	1	-1/+1
\| \| \|
* \| \|	db issues	zotlabs	2017-03-12	4	-90/+8
\| \| \|
* \| \|	Merge branch 'dev' into red	zotlabs	2017-03-11	3	-3/+27
\|\\| \|
\| * \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	zotlabs	2017-03-11	2	-2/+26
\| \|\\|
\| \| *	Login-box css-fix for Bluegrid scheme	jeroenpraat	2017-03-11	1	-1/+25
\| \| \|
\| \| *	Merge pull request #693 from anaqreon/dev	git-marijus	2017-03-11	1	-1/+1
\| \| \|\ \| \| \| \| \| \| \| \|	Take me home instead of get me home
\| \| \| *	Take me home instead of get me home	Andrew Manning	2017-03-09	1	-1/+1
\| \| \|/
\| * \|	strings	zotlabs	2017-03-10	1	-3838/+3824
\| \| \|
\| * \|	Monday is a proper name and should be capitalised (except in private ↵	zotlabs	2017-03-08	1	-1/+1
\| \|/ \| \| \| \| \| \|	conversation amongst unix geeks).
* \|	strings	zotlabs	2017-03-10	1	-3838/+3824
\| \|
* \|	one role.	zotlabs	2017-03-09	4	-61/+5
\| \|
* \|	more cleanup	zotlabs	2017-03-09	3	-40/+5
\| \|
* \|	Merge branch 'dspr' into red	zotlabs	2017-03-09	11	-7395/+7326
\|\ \
\| * \|	move all the diaspora content hacks to the diaspora plugin	zotlabs	2017-03-08	1	-408/+9
\| \| \|
\| * \|	DCV stuff	zotlabs	2017-03-07	1	-20/+6
\| \|/
\| *	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	Mario Vavti	2017-03-07	3	-10/+10
\| \|\
\| \| *	allow post_activity_item to be passed an empty ACL without resetting to ↵	zotlabs	2017-03-06	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \|	channel default
\| \| *	add public_policy to the nwiki container also. This should not affect the ↵	zotlabs	2017-03-06	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|	recent bug as presented, but is being added for consistency.
\| \| *	correct fix for wiki anonymous read issue (items_permissions_sql checks ↵	zotlabs	2017-03-06	2	-9/+6
\| \| \| \| \| \| \| \| \| \| \| \|	item.public_policy which was set for posts, not wikis)
\| * \|	Big 2.2 string update Dutch	jeroenpraat	2017-03-07	2	-6864/+7305
\| \|/
\| *	allow unauthenticated access to public wiki pages	Mario Vavti	2017-03-06	1	-2/+10
\| \|
\| *	do not collapse long nsfw content	Mario Vavti	2017-03-06	1	-1/+1
\| \|
\| *	remove include/probe.php which has never completed development and has never ↵	zotlabs	2017-03-05	4	-106/+1
\| \| \| \| \| \| \| \|	been used
* \|	go back to where the problem started	zotlabs	2017-03-09	2	-600/+13
\| \|
* \|	Merge branch 'dev' into red	zotlabs	2017-03-05	1824	-18/+2
\|\\|
\| *	move emoji emoticons (not reactions) to plugin	zotlabs	2017-03-05	1824	-18/+2
\| \|
* \|	some event work	zotlabs	2017-03-05	2	-0/+5
\|/
*	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	zotlabs	2017-03-05	22	-4756/+5247
\|\
\| *	Merge pull request #689 from mjfriaza/dev	zotlabs	2017-03-05	2	-2329/+2378
\| \|\ \| \| \| \| \| \|	Translated the last strings into Spanish version
\| \| *	Translated the last strings into Spanish version	Manuel Jiménez Friaza	2017-03-05	2	-2329/+2378
\| \| \|
\| * \|	Merge pull request #688 from dawnbreak/markdown	zotlabs	2017-03-05	20	-2427/+2869
\| \|\ \ \| \| \| \| \| \| \| \|	:arrow_up: :hammer: Upgrade Markdownify library.
\| \| * \|	:arrow_up: :hammer: Upgrade Markdownify library.	Klaus Weidenbach	2017-03-05	20	-2427/+2869
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The current version 2.0.0 (alpha) throws deprecated warning with PHP7.1 and PHPUnit. Upgrade the HTML to Markdown converter for PHP to the current Markdownify 2.2.1. Used composer to manage this library.
* \| \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	zotlabs	2017-03-04	2	-1/+2
\|\\| \|
\| * \|	update changelog	Mario Vavti	2017-03-04	1	-0/+1
\| \| \|
\| * \|	we need item edited for wiki page history, not item created	Mario Vavti	2017-03-04	1	-1/+1
\| \| \|
* \| \|	minor feed issue	zotlabs	2017-03-04	1	-0/+8
\|/ /
* \|	string update	zotlabs	2017-03-03	1	-887/+910
\| \|
* \|	fix badge position for narrow navbar	Mario Vavti	2017-03-03	1	-4/+0
\| \|