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-06-02	1	-1/+1
\|\
\| *	update help link	Mario Vavti	2015-06-02	1	-1/+1
\| \|
* \|	more migration of page types	redmatrix	2015-05-21	1	-3/+3
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-18	1	-2/+3
\|\\|
\| *	this should fix undeletable blocks and layouts	redmatrix	2015-05-18	1	-2/+3
\| \|
* \|	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
\| * \|	first pass name change	redmatrix	2015-05-05	1	-1/+1
\| \|/
* \|	Merge branch 'master' into tres	friendica	2015-04-29	1	-20/+29
\|\\| \| \| \| \| \| \| \| \|	Conflicts: include/notifier.php
\| *	disable voting in blocks, layouts and webpages	Mario Vavti	2015-04-29	1	-1/+2
\| \|
\| *	adjust placeholder naming	Mario Vavti	2015-04-29	1	-1/+1
\| \|
\| *	Provide webpage layout description	Mario Vavti	2015-04-25	1	-2/+5
\| \|
\| *	add title to element array	Mario Vavti	2015-04-24	1	-1/+2
\| \|
\| *	copy/paste typo	Mario Vavti	2015-04-24	1	-1/+1
\| \|
\| *	webpages layout fixes	Mario Vavti	2015-04-24	1	-18/+22
\| \|
* \|	Merge branch 'master' into tres	friendica	2015-04-23	1	-9/+13
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-5/+9
\| \|
\| *	make sure we redirect to a sane place after deleting a webpage element	friendica	2015-04-09	1	-0/+2
\| \|
\| *	Fix Design Tool navigation for sys channel.	Klaus Weidenbach	2015-04-06	1	-4/+2
\| \| \| \| \| \| \| \|	Fix creating menu for sys channel.
* \|	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
\|/
*	extend sys support to layouts	friendica	2014-11-12	1	-36/+83
\|
*	make blocks, webpages, and layouts postable (pre-filled forms if supplied ↵	friendica	2014-08-28	1	-1/+10
\| \| \| \|	from elsewhere). The only serious issue is with ordering - you have to process and save a named layout before you can save a webpage that uses that layout name. Otherwise it will get unset during the save.
*	use $showacl to show/hide acl in jot.tpl - remove $pvisit and repair ↵	marijus	2014-04-09	1	-0/+1
\| \| \| \|	editblock and editlayout which still depended on it.
*	change the way jot tools are displayed/hidden	marijus	2014-04-08	1	-1/+1
\|
*	layout export to file	friendica	2014-03-03	1	-3/+18
\|
*	put schemas in Comanche (this requires theme support (!))	friendica	2014-02-27	1	-53/+48
\|
*	more comanche migration	friendica	2013-12-19	1	-3/+3
\|
*	Comanche documentation and some cleanup of layout page (including link to ↵	friendica	2013-10-28	1	-1/+14
\| \| \| \|	doco) and a few other webpage related cleanups
*	add design tool menu to appropriate pages	friendica	2013-09-03	1	-0/+16
\|
*	add layouts and editlayout and rework the page logic in mod/item	friendica	2013-09-01	1	-0/+82