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

	Commit message (Collapse)	Author	Age	Files	Lines
*	don't auto-open the editor in forum mode. Save the forum selection text ↵	redmatrix	2015-09-09	1	-0/+1
\| \| \| \|	until we open it.
*	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-26	1	-1/+12
\|\ \| \| \| \| \| \| \| \|	Conflicts: include/diaspora.php
\| *	required for future work	redmatrix	2015-08-26	1	-1/+12
\| \|
* \|	photo permission inheritance. We want to use the folder permissions unless ↵	redmatrix	2015-08-06	1	-1/+1
\| \| \| \| \| \| \| \|	specific permissions have been set to over-ride them. If nothing is set, use the channel default. We may have to mess with his further in the case of somebody trying to create a public photo directory when their normal permissions are set to private. Kind of a chicken/egg problem because the folder permissions will be empty.
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-30	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \|	several dav fixes Conflicts: include/items.php
\| *	make superblock block a channel if it's an owner as well as the current ↵	redmatrix	2015-07-28	1	-1/+1
\| \| \| \| \| \| \| \|	author; add @hostname to event hashes to make their use in vcalendar more RFC compliant
* \|	the view_photos and post_photos permissions are redundant and are now mapped ↵	redmatrix	2015-07-19	1	-4/+2
\| \| \| \| \| \| \| \|	to view_storage and write_storage
* \|	since we've got a fresh start without a lot of legacy sites to support, ↵	redmatrix	2015-07-15	1	-1/+2
\| \| \| \| \| \| \| \|	provide 'naked' or authored=none (no date and attribution) as the default for webpages. It will be up to designers to add this if they desire it rather than force everybody to take it away. The code for adding it isn't yet provided.
* \|	convert the abook fields	redmatrix	2015-06-14	1	-1/+1
\| \|
* \|	Merge branch 'master' into tres	friendica	2015-04-29	1	-1/+4
\|\\| \| \| \| \| \| \| \| \|	Conflicts: include/notifier.php
\| *	disable voting in blocks, layouts and webpages	Mario Vavti	2015-04-29	1	-0/+2
\| \|
\| *	Provide webpage layout description	Mario Vavti	2015-04-25	1	-1/+1
\| \|
\| *	provide block titles in blocklist	Mario Vavti	2015-04-24	1	-0/+1
\| \|
* \|	Merge branch 'master' into tres	friendica	2015-04-23	1	-238/+332
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	fix webpage perms	Mario Vavti	2015-04-22	1	-1/+1
\| \|
\| *	allow jot to be displayed expanded, remove deprected datetimepicker js and ↵	Mario Vavti	2015-04-17	1	-1/+2
\| \| \| \| \| \| \| \|	some random fixes
\| *	provide a separate input field for rpost attachments	Mario Vavti	2015-04-16	1	-0/+1
\| \|
\| *	title=>name	Mario Vavti	2015-04-15	1	-1/+1
\| \|
\| *	Update/fix Dutch and removing an ugly space	jeroenpraat	2015-04-02	1	-1/+1
\| \|
\| *	Correcting reported Doxygen syntax warnings.	Klaus Weidenbach	2015-03-29	1	-5/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
\| *	provide ways to over-ride the datetime pickers	friendica	2015-03-26	1	-0/+2
\| \|
\| *	Fixed an exit of a loop in builtin_activity_puller().	Klaus Weidenbach	2015-03-21	1	-128/+132
\| \| \| \| \| \| \| \|	There was a "$return", but I think it should be "return".
\| *	phase one of the great file storage unification - use one button for uploads ↵	friendica	2015-03-16	1	-1/+1
\| \| \| \| \| \| \| \|	of any type (image or attachment). We'll sort out which one it is and deal with it appropriately.
\| *	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.
\| *	View upload photo button only if you have permission.	Klaus Weidenbach	2015-03-10	1	-59/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Check if post_photos permission is available otherwise hide the photo upload button. Or should we show the button and just disable it with a title, about missing permission to upload photos? In comments we use the same icon, but just add [img] bb-code. Should we provide this if no permission to upload photos. Do we need different icons for [img] and photo upload buttons?
\| *	bring back like/dislike summaries on photos	friendica	2015-02-16	1	-1/+1
\| \|
\| *	Merge https://github.com/friendica/red into pending_merge	friendica	2015-02-11	1	-1/+10
\| \|\
\| \| *	to get the correct total count we should probably only count the arrays with ↵	marijus	2015-02-11	1	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \|	count key set
\| \| *	typo agree->disagree	marijus	2015-02-11	1	-1/+1
\| \| \|
\| * \|	more efficient processing of response activities, plus a proof of concept ↵	friendica	2015-02-11	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \|	fix for the problem of receiving a delete notification before we actually get the item which we're supposed to delete.
\| * \|	cut/paste typo	friendica	2015-02-11	1	-1/+1
\| \|/
\| *	more permissions tweaking	friendica	2015-02-10	1	-0/+3
\| \|
\| *	item voting tools	friendica	2015-02-10	1	-0/+5
\| \|
\| *	more attendance	friendica	2015-02-10	1	-73/+69
\| \|
\| *	cleanup event attendance - make sure it works in list mode.	friendica	2015-02-10	1	-13/+4
\| \|
\| *	more progress on event confirmations	friendica	2015-02-10	1	-3/+28
\| \|
\| *	like formatting for extended consensus items	friendica	2015-02-09	1	-0/+53
\| \|
* \|	Merge branch 'master' into tres	friendica	2015-02-05	1	-5/+4
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: view/css/mod_events.css view/theme/redbasic/css/style.css
\| *	allow post expiration to be set from a config (and therefore a plugin/addon)	friendica	2015-02-05	1	-1/+4
\| \|
\| *	order ratings friends first	friendica	2015-02-03	1	-4/+0
\| \|
* \|	Merge branch 'master' into tres	friendica	2015-01-29	1	-26/+26
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-26/+26
\| \|
* \|	more expanding item flags	friendica	2015-01-22	1	-12/+3
\| \|
* \|	heavy lifting converting item flag bits	friendica	2015-01-22	1	-1/+1
\|/
*	basic proof of concept file activity support - will send activity via the ↵	marijus	2015-01-18	1	-1/+1
\| \| \| \|	filestorage module and via attach_delete()
*	basic backend work for creating consensus items	friendica	2015-01-11	1	-16/+49
\|
*	basic changes for file activity	marijus	2015-01-09	1	-0/+1
\|
*	fix label of preview button	marijus	2014-12-17	1	-1/+1
\|
*	edit and preview removed from additional features and turned into core ↵	friendica	2014-12-16	1	-3/+2
\| \| \| \|	functionality (always enabled).
*	Provide censorship.	Thomas Willingham	2014-12-10	1	-4/+9
\|