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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into tres	friendica	2015-05-01	5	-3/+37
\|\
\| *	more performance work	friendica	2015-04-30	1	-1/+9
\| \|
\| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	friendica	2015-04-30	9	-5/+19
\| \|\
\| \| *	document [var=wrap]none[/var] for block elements	Mario Vavti	2015-04-30	2	-0/+8
\| \| \|
\| * \|	just a test, please do not try to implement this as there are severe ↵	friendica	2015-04-30	3	-3/+21
\| \| \| \| \| \| \| \| \| \| \| \|	security issues
* \| \|	Merge branch 'master' into tres	friendica	2015-04-29	26	-1122/+1210
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \|	Conflicts: include/notifier.php
\| * \|	fix block view	Mario Vavti	2015-04-29	1	-1/+1
\| \| \|
\| * \|	disable voting in blocks, layouts and webpages	Mario Vavti	2015-04-29	4	-2/+7
\| \| \|
\| * \|	fix $noloc state in mod editwebpages	Mario Vavti	2015-04-29	1	-1/+1
\| \| \|
\| * \|	adjust placeholder naming	Mario Vavti	2015-04-29	2	-2/+3
\| \|/
\| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	friendica	2015-04-28	3	-7/+3
\| \|\
\| \| *	Merge pull request #316 from oliverlorenz/patch-1	redmatrix	2015-04-29	1	-1/+1
\| \| \|\ \| \| \| \| \| \| \| \|	Thank you! Updated INSTALL.txt - outdated link corrected
\| \| \| *	Updated INSTALL.txt - outdated link corrected	Oliver Lorenz	2015-04-28	1	-1/+1
\| \| \| \|
\| \| * \|	revert some changes in justified gallery	Mario Vavti	2015-04-28	2	-6/+2
\| \| \|/
\| * /	version update	friendica	2015-04-28	2	-2/+2
\| \|/
\| *	Provide webpage layout description	Mario Vavti	2015-04-25	4	-7/+18
\| \|
\| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	friendica	2015-04-24	13	-66/+127
\| \|\
\| \| *	css fixes	Mario Vavti	2015-04-24	2	-0/+8
\| \| \|
\| \| *	add widget class to blocks again by default. we have the wrap variable now ↵	Mario Vavti	2015-04-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	to remove the div wrapper if necessary.
\| \| *	provide block titles in blocklist	Mario Vavti	2015-04-24	4	-8/+15
\| \| \|
\| \| *	add title to element array	Mario Vavti	2015-04-24	3	-3/+5
\| \| \|
\| \| *	there is no key named term in this array	Mario Vavti	2015-04-24	1	-1/+0
\| \| \|
\| \| *	copy/paste typo	Mario Vavti	2015-04-24	1	-1/+1
\| \| \|
\| \| *	webpages layout fixes	Mario Vavti	2015-04-24	6	-56/+101
\| \| \|
\| * \|	zotfeed issues	friendica	2015-04-24	1	-3/+3
\| \| \|
\| * \|	reset route	friendica	2015-04-24	1	-1/+1
\| \| \|
\| * \|	mod/branchtopic - move an off-topic comment to its own thread as a fresh ↵	friendica	2015-04-24	4	-1028/+1026
\| \|/ \| \| \| \| \| \|	wall-to-wall post and the same delivery permissions as its parent. No adjustments are made for complex delivery chains.
\| *	block unfederated posts from zot_feed	friendica	2015-04-23	1	-0/+6
\| \|
\| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	friendica	2015-04-23	6	-56/+122
\| \|\
\| * \|	disconnect	friendica	2015-04-23	4	-12/+22
\| \| \|
* \| \|	Merge branch 'master' into tres	friendica	2015-04-23	1727	-201129/+48987
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	webpages blocks fixes	Mario Vavti	2015-04-23	6	-56/+122
\| \|/
\| *	explain a bit more about the structure and scope	friendica	2015-04-22	2	-1/+3
\| \|
\| *	do not show acl button if not owner	Mario Vavti	2015-04-22	1	-3/+4
\| \|
\| *	fix webpages profile_tabs	Mario Vavti	2015-04-22	1	-5/+2
\| \|
\| *	fix webpage perms	Mario Vavti	2015-04-22	3	-3/+12
\| \|
\| *	provide headings for blocks and layouts	Mario Vavti	2015-04-22	7	-10/+51
\| \|
\| *	add translation plugin to the to-do	friendica	2015-04-21	1	-0/+1
\| \|
\| *	use PERMS_SPECIFIC for anything that hasn't been specified. This way there's ↵	friendica	2015-04-21	2	-25/+25
\| \| \| \| \| \| \| \|	nothing that's "only yourself", and let's you add additional permissions at will rather than be forced to accept the defaults or turn on custom permissions just to give a friend delegation rights or the ability to post photos.
\| *	missing class	Mario Vavti	2015-04-21	1	-1/+1
\| \|
\| *	move .lockview to style.css and a typo	Mario Vavti	2015-04-21	2	-5/+5
\| \|
\| *	missing dropdown class	Mario Vavti	2015-04-21	1	-1/+1
\| \|
\| *	bring lockstate to webpages	Mario Vavti	2015-04-21	3	-5/+12
\| \|
\| *	bring lockview to menu items, slightly change the way /lockview is called	Mario Vavti	2015-04-21	9	-35/+46
\| \|
\| *	rework and hopefully improve webpage menu creation workflow	Mario Vavti	2015-04-21	11	-200/+258
\| \|
\| *	issue #162	friendica	2015-04-20	3	-1/+3
\| \|
\| *	issue #176, sender copy of item not obscured if using private mention	friendica	2015-04-20	2	-2/+4
\| \|
\| *	force event obj_type on update	friendica	2015-04-20	1	-1/+2
\| \|
\| *	update to-do list	friendica	2015-04-20	2	-1/+3
\| \|
\| *	issue #178, searching for words such as 'data' would return private items ↵	friendica	2015-04-19	1	-2/+4
\| \| \| \| \| \| \| \|	regardless of their unobscured content.