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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-10	1	-7/+9
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mod/editpost.php util/messages.po view/nl/messages.po view/nl/strings.php
\| *	more webpages - generic-content-wrapper fixes	Mario Vavti	2015-07-10	1	-7/+9
\| \|
* \|	Merge branch 'master' into tres	redmatrix	2015-05-14	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/Import/refimport.php include/activities.php include/attach.php include/event.php include/externals.php include/identity.php include/items.php include/notifier.php include/photos.php include/taxonomy.php include/zot.php mod/channel.php mod/connedit.php mod/events.php mod/item.php mod/like.php mod/manage.php mod/mood.php mod/ping.php mod/poke.php mod/subthread.php mod/tagger.php mod/thing.php
\| *	avoid double slash after editing layout	Mario Vavti	2015-05-06	1	-1/+1
\| \|
* \|	Merge branch 'master' into tres	friendica	2015-04-29	1	-25/+5
\|\\| \| \| \| \| \| \| \| \|	Conflicts: include/notifier.php
\| *	adjust placeholder naming	Mario Vavti	2015-04-29	1	-1/+2
\| \|
\| *	webpages layout fixes	Mario Vavti	2015-04-24	1	-24/+3
\| \|
* \|	Merge branch 'master' into tres	friendica	2015-04-23	1	-2/+6
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/Contact.php include/ItemObject.php include/api.php include/attach.php include/diaspora.php include/dir_fns.php include/enotify.php include/event.php include/expire.php include/items.php include/notifier.php include/notify.php include/photos.php include/taxonomy.php include/text.php include/widgets.php include/zot.php mod/admin.php mod/channel.php mod/dirsearch.php mod/display.php mod/editwebpage.php mod/events.php mod/home.php mod/item.php mod/manage.php mod/mood.php mod/network.php mod/page.php mod/photos.php mod/ping.php mod/post.php mod/thing.php mod/viewsrc.php view/css/mod_events.css
\| *	provide headings for blocks and layouts	Mario Vavti	2015-04-22	1	-2/+1
\| \|
\| *	title of preview button incorrect, fix ability to upload to webpages	friendica	2015-03-30	1	-1/+1
\| \|
\| *	remove the now redundant audio/video buttons and label the editor text style ↵	friendica	2015-03-11	1	-0/+5
\| \| \| \| \| \| \| \|	buttons which didn't have them. Unused editor buttons were commented in case we need to bring them back. If things go smoothly we can remove them. Use the link icon going forward - for all links.
* \|	Merge branch 'master' into tres	friendica	2015-01-29	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-1/+1
\| \|
* \|	more message restrict conversions	friendica	2015-01-29	1	-1/+1
\|/
*	edit and preview removed from additional features and turned into core ↵	friendica	2014-12-16	1	-1/+1
\| \| \| \|	functionality (always enabled).
*	Make it clear that title and categories are optional	Stefan Parviainen	2014-12-08	1	-2/+2
\|
*	this should make all the 'sys' webpage design tools useable by the admin	friendica	2014-11-12	1	-4/+1
\|
*	extend sys support to layouts	friendica	2014-11-12	1	-92/+127
\|
*	shareable design elements	friendica	2014-10-06	1	-0/+17
\|
*	rule of snakes #1, kill the snake.	friendica	2014-06-28	1	-2/+2
\| \| \| \| \| \|	tinymce is gone. if you want a visual editor, figure out what you want and make it happen. If you don't want a visual editor, do nothing. This is in the community's hands. I don't need a visual editor.
*	use $showacl to show/hide acl in jot.tpl - remove $pvisit and repair ↵	marijus	2014-04-09	1	-1/+0
\| \| \| \|	editblock and editlayout which still depended on it.
*	change the way jot tools are displayed/hidden	marijus	2014-04-08	1	-2/+2
\|
*	delete confirmation popup for blocks and layouts	Christian Vogeley	2014-01-12	1	-2/+3
\|
*	Fix webpage layout title editing	Christian Vogeley	2014-01-12	1	-2/+7
\|
*	a few fixes to webpage editing	friendica	2014-01-04	1	-0/+1
\|
*	check that every invocation of htmlspecialchars has the right arg list	friendica	2013-12-12	1	-1/+1
\|
*	provide expire feature on post and comments as well as private messages. ↵	friendica	2013-11-07	1	-0/+3
\| \| \| \|	This requires a feature setting and is currently unmaskable - if the author says it's gone, there's not a lot you can do to stop it or try and save it. It's gone.
*	spurious blank lines	friendica	2013-09-15	1	-1/+0
\|
*	provide ability to delete webpages, layouts and blocks	friendica	2013-09-06	1	-1/+6
\|
*	add layouts and editlayout and rework the page logic in mod/item	friendica	2013-09-01	1	-0/+139