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-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.
\| *	issue #157, provide default directory sort order	friendica	2015-04-19	2	-2/+12
\| \|
\| *	doco updates	friendica	2015-04-19	2	-12/+9
\| \|
\| *	add favorites/create and destroy to api	friendica	2015-04-19	1	-36/+137
\| \|
\| *	api performance enhancer	friendica	2015-04-19	1	-5/+2
\| \|
\| *	assorted fixes to api direct messages	friendica	2015-04-19	1	-31/+35
\| \|
\| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	friendica	2015-04-19	1	-1/+1
\| \|\
\| \| *	Merge pull request #315 from unary/wallattach	redmatrix	2015-04-20	1	-1/+1
\| \| \|\ \| \| \| \| \| \| \| \|	switch from IMG_XXX constants to IMAGETYPE_XXX constants
\| \| \| *	switch from IMG_XXX constants to IMAGETYPE_XXX constants	Michael Johnston	2015-04-19	1	-1/+1
\| \| \|/
\| * /	some api cleanup	friendica	2015-04-19	1	-11/+15
\| \|/
\| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	friendica	2015-04-19	5	-70/+44
\| \|\
\| \| *	attach an id to menues, allow $menu_title to be empty, if no custom menu ↵	Mario Vavti	2015-04-19	3	-22/+20
\| \| \| \| \| \| \| \| \| \| \| \|	class is provided use default redbasic classes
\| \| *	Introduce wrap variable in comanche blocks (if set to none the block will ↵	Mario Vavti	2015-04-19	3	-48/+24
\| \| \| \| \| \| \| \| \| \| \| \|	not be wrapped in a div), fix menu item permissions (it was not possible to set them visible for everybody) and a typo
\| * \|	api - unobscure mail	friendica	2015-04-19	3	-5/+16
\| \|/
\| *	log this since we may need it to track down failures	friendica	2015-04-18	3	-3/+5
\| \|
\| *	css fix	Mario Vavti	2015-04-18	1	-1/+1
\| \|
\| *	fix page-title margin	Mario Vavti	2015-04-18	1	-0/+4
\| \|
\| *	remove failed experiment	friendica	2015-04-17	1	-2/+0
\| \|
\| *	add last post to api/account/verify_credentials	friendica	2015-04-17	1	-5/+60
\| \|
\| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	friendica	2015-04-17	10	-50/+43
\| \|\
\| \| *	adjus webpage font size to match conv item font size	Mario Vavti	2015-04-17	1	-1/+2
\| \| \|
\| \| *	Merge branch 'master' of https://github.com/redmatrix/redmatrix	Mario Vavti	2015-04-17	2	-5/+3
\| \| \|\
\| \| * \|	allow jot to be displayed expanded, remove deprected datetimepicker js and ↵	Mario Vavti	2015-04-17	10	-49/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	some random fixes
\| * \| \|	hide event share button when editing an event	friendica	2015-04-17	3	-388/+418
\| \| \|/ \| \|/\|
\| * \|	you need communications in there someplace.	friendica	2015-04-16	1	-1/+1
\| \| \|
\| * \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	friendica	2015-04-16	13	-40/+64
\| \|\\|
\| \| *	wording and css fixes	Mario Vavti	2015-04-16	2	-4/+3
\| \| \|
\| \| *	provide a separate input field for rpost attachments	Mario Vavti	2015-04-16	8	-10/+26
\| \| \|
\| \| *	make rpost respect default post permissions	Mario Vavti	2015-04-16	1	-1/+8
\| \| \|
\| \| *	whitespace	Mario Vavti	2015-04-16	1	-15/+15
\| \| \|
\| \| *	move share webpage element from editwebpage to webpages and make it ↵	Mario Vavti	2015-04-16	4	-22/+24
\| \| \| \| \| \| \| \| \| \| \| \|	shareable with rpost