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

	Commit message (Collapse)	Author	Age	Files	Lines
*	more work on items	redmatrix	2015-06-11	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php view/it/messages.po view/it/strings.php
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-06	1	-0/+1
\|\\| \| \| \| \| \| \| \| \|	Conflicts: util/messages.po
\| *	use the right webpage layout for an installed webpage if it exists	Mario Vavti	2015-06-04	1	-0/+1
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-31	1	-7/+50
\|\\|
\| *	whitespace	Mario Vavti	2015-05-29	1	-1/+1
\| \|
\| *	some fixes to make menu sharing work and expose it in the ui.	Mario Vavti	2015-05-29	1	-5/+9
\| \|
\| *	untested menu element import, be aware that the menu api does not over-write ↵	redmatrix	2015-05-28	1	-7/+46
\| \| \| \| \| \| \| \|	on duplicate name - it just fails. We'll need to sort this out eventually. Also it was planned to offer a choice of whether to preserve links from the source site or change the baseurl to the local one. Currently we convert them all to local links.
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-28	1	-0/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: install/schema_mysql.sql mod/impel.php view/pt-br/messages.po view/pt-br/strings.php
\| *	missing row in sql query which is used further down	redmatrix	2015-05-27	1	-1/+1
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-27	1	-57/+83
\|\\| \| \| \| \| \| \| \| \|	Conflicts: mod/impel.php
\| *	some high-level stuff we may need for shareable menus. Also make the client ↵	redmatrix	2015-05-27	1	-57/+83
\| \| \| \| \| \| \| \|	register function do the right thing even though I refuse to make it work. If you want service federation with things like pumpio and openid connect, it's time for you to put your own skin in the game and quit treating project volunteers like excrement just because you can't get up off your lazy buttocks.
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-20	1	-8/+9
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/items.php include/text.php mod/item.php view/nl/messages.po
\| *	check for success before updating remote id	redmatrix	2015-05-20	1	-8/+9
\| \|
* \|	merge redmatrix fix	redmatrix	2015-05-19	1	-2/+2
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-19	1	-1/+9
\|\\|
\| *	issue with deleting imported design elements and re-installing them	redmatrix	2015-05-19	1	-1/+9
\| \|
* \|	Merge branch 'master' into tres	friendica	2015-04-29	1	-1/+1
\|\\| \| \| \| \| \| \| \| \|	Conflicts: include/notifier.php
\| *	add title to element array	Mario Vavti	2015-04-24	1	-1/+1
\| \|
* \|	Merge branch 'master' into tres	friendica	2015-01-29	1	-5/+5
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/group.php include/text.php mod/acl.php mod/channel.php mod/connections.php mod/display.php mod/group.php mod/item.php mod/locs.php mod/network.php mod/photos.php mod/ping.php mod/starred.php mod/viewsrc.php
\| *	local_user => local_channel	friendica	2015-01-28	1	-5/+5
\| \|
* \|	more message restrict conversions	friendica	2015-01-29	1	-3/+3
\|/
*	provide a setting to control ALLOWCODE permissions at the channel level - it ↵	friendica	2015-01-13	1	-2/+2
\| \| \| \|	isn't always appropriate to apply this to all channels in an account.
*	shareable design elements	friendica	2014-10-06	1	-11/+19
\|
*	more infrastructure for sharing page design elements	friendica	2014-10-03	1	-1/+43
\|
*	doc updates	friendica	2014-10-03	1	-0/+71