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/friendica/red	Habeas Codice	2015-01-21	3	-42/+49
\|\
\| *	Merge branch 'master' of https://github.com/friendica/red	marijus	2015-01-22	1	-3/+9
\| \|\
\| \| *	couple of hubloc manager issues	friendica	2015-01-21	1	-1/+5
\| \| \|
\| \| *	Merge https://github.com/friendica/red into pending_merge	friendica	2015-01-21	2	-39/+39
\| \| \|\
\| \| * \|	hubloc manage issue	friendica	2015-01-21	1	-2/+4
\| \| \| \|
\| * \| \|	make $links an array of links	marijus	2015-01-22	1	-1/+2
\| \| \|/ \| \|/\|
\| * \|	change mod/sharedwithme backend to use activity object - this is not ↵	marijus	2015-01-22	2	-39/+39
\| \|/ \| \| \| \| \| \|	backwards compatible
* /	directory server dba sql fixes	Habeas Codice	2015-01-21	1	-3/+3
\|/
*	Merge pull request #862 from pafcu/help	RedMatrix	2015-01-19	1	-12/+13
\|\ \| \| \| \|	Add some database documentation + mod/help.php bugfix
\| *	Don't try to open unexisting files in help	Stefan Parviainen	2015-01-18	1	-12/+13
\| \|
* \|	fix link	marijus	2015-01-18	1	-2/+2
\| \|
* \|	fix goaway link	marijus	2015-01-18	1	-2/+2
\| \|
* \|	fix profile tabs link	marijus	2015-01-18	1	-1/+1
\| \|
* \|	basic proof of concept file activity support - will send activity via the ↵	marijus	2015-01-18	2	-0/+123
\| \| \| \| \| \| \| \|	filestorage module and via attach_delete()
* \|	mod_prep usability enhancements, doc updates	friendica	2015-01-16	1	-11/+18
\| \|
* \|	fix to poco chatrooms	friendica	2015-01-15	1	-4/+4
\| \|
* \|	errors in mod_poco	friendica	2015-01-15	1	-2/+2
\| \|
* \|	more heavy lifting on poco rep	friendica	2015-01-15	1	-7/+28
\| \|
* \|	make sure mod/prep follows the poco_rating allow preference	friendica	2015-01-15	1	-0/+9
\| \|
* \|	poco rating - add a test module for pulling out ratings	friendica	2015-01-15	2	-4/+52
\| \|
* \|	editing stuff for poco reputation	friendica	2015-01-15	1	-2/+15
\| \|
* \|	more backend work on poco rating	friendica	2015-01-15	2	-1/+10
\|/
*	provide correct permissions role default for old-timers that didn't have any ↵	friendica	2015-01-14	1	-1/+4
\| \| \| \|	role configured.
*	correct some activity object types (for comments), also fix a foreach ↵	friendica	2015-01-14	1	-14/+21
\| \| \| \|	warning resulting from recent tag work
*	some back-end code to support location activity objects. Work in progress.	friendica	2015-01-14	1	-0/+1
\|
*	honor disable_discover_tab in mod/home - it isn't a tab here but basically ↵	friendica	2015-01-14	1	-0/+5
\| \| \| \|	block public content from showing if it's set.
*	now that's useful...	friendica	2015-01-13	1	-2/+8
\|
*	provide a setting to control ALLOWCODE permissions at the channel level - it ↵	friendica	2015-01-13	2	-4/+4
\| \| \| \|	isn't always appropriate to apply this to all channels in an account.
*	revert recent 3.0 changes to mod/cloud so we can work on this completely in ↵	friendica	2015-01-13	1	-30/+19
\| \| \| \|	another branch and not destabilise core
*	Merge branch 'moretagging' of git://github.com/pafcu/red into pafcu-moretagging	friendica	2015-01-13	7	-3/+30
\|\ \| \| \| \| \| \| \| \|	Conflicts: mod/profiles.php
\| *	Allow tags in event description and location	Stefan Parviainen	2015-01-13	1	-0/+4
\| \|
\| *	Allow tags in mail, many profile fields, and admin info	Stefan Parviainen	2015-01-13	6	-3/+25
\| \|
* \|	hide friends broken, add parameter for item search by verb	friendica	2015-01-13	6	-2/+7
\| \|
* \|	theme toggle issue when viewing mod/cloud of another channel	friendica	2015-01-12	2	-18/+0
\| \|
* \|	document the pros and cons of the not-yet written hassle-free connection ↵	friendica	2015-01-12	1	-0/+9
\| \| \| \| \| \| \| \|	auto-permission setting.
* \|	change deletion behaviour of linked photo items. Previously deleting the ↵	friendica	2015-01-12	1	-1/+1
\| \| \| \| \| \| \| \|	visible item in the conversation deleted the photo as well. Now photos must be deleted in the photos module. Deleting the linked item removes any attached conversation elements (likes, etc.) and sets the conversation item to hidden. This may create an issue in the future if we move the photo tags, title, or other photo elements to the linked item rather than the photo. Noting here so this can potentially be discovered and remembered at that time.
* \|	Merge https://github.com/friendica/red into pending_merge	friendica	2015-01-12	2	-115/+34
\|\\|
\| *	Refactor mention code to make it more reusable	Stefan Parviainen	2015-01-12	2	-115/+34
\| \|
* \|	double perms msg	friendica	2015-01-12	1	-1/+1
\|/
*	another attempt to explain default permissions on connedit page	friendica	2015-01-11	1	-4/+4
\|
*	remove extraneous debug file left over from postgres work.	friendica	2015-01-11	1	-1/+0
\|
*	that was not intended to be merged with master yet. Put it under a define	friendica	2015-01-11	1	-2/+36
\|
*	basic backend work for creating consensus items	friendica	2015-01-11	1	-0/+20
\|
*	Merge branch 'master' into trinidad	friendica	2015-01-11	1	-1/+1
\|\
\| *	Merge remote-tracking branch 'upstream/master'	Christian Vogeley	2015-01-11	18	-205/+253
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/html/classRedmatrix_1_1Import_1_1Import-members.html doc/html/classRedmatrix_1_1Import_1_1Import.js
\| * \|	Fix for issue #763 Error creating new channel within the limits of the	Christian Vogeley	2015-01-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	subscription plan
* \| \|	Merge branch 'master' into trinidad	friendica	2015-01-10	1	-2/+2
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	connection clone issues	friendica	2015-01-10	1	-2/+2
\| \| \|
* \| \|	Merge branch 'master' into trinidad	friendica	2015-01-10	2	-1/+2
\|\\| \|
\| * \|	Fix unescaped image data	Habeas Codice	2015-01-10	1	-0/+1
\| \| \|