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	17	-89/+184
\|\
\| *	Merge https://github.com/friendica/red into pending_merge	friendica	2015-01-21	2	-2/+4
\| \|\
\| \| *	Merge branch 'master' of https://github.com/friendica/red	marijus	2015-01-22	2	-6/+12
\| \| \|\
\| \| * \|	make $links an array of links	marijus	2015-01-22	2	-2/+4
\| \| \| \|
\| * \| \|	zot_finger second arg is optional but function declaration didn't specify ↵	friendica	2015-01-21	1	-1/+1
\| \| \|/ \| \|/\| \| \| \| \| \| \|	this - causes issue with check_upstream_directory
\| * \|	couple of hubloc manager issues	friendica	2015-01-21	2	-4/+8
\| \| \|
\| * \|	Merge https://github.com/friendica/red into pending_merge	friendica	2015-01-21	4	-68/+118
\| \|\\|
\| \| *	Merge branch 'master' of https://github.com/friendica/red	marijus	2015-01-22	8	-8/+37
\| \| \|\
\| \| \| *	added redmatrix.nl back as a directory server. this was not the issue with ↵	Jeroen	2015-01-22	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the performance problems
\| \| * \|	change mod/sharedwithme backend to use activity object - this is not ↵	marijus	2015-01-22	4	-67/+116
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	backwards compatible
\| * \| \|	hubloc manage issue	friendica	2015-01-21	1	-2/+4
\| \| \|/ \| \|/\|
\| * \|	Merge https://github.com/friendica/red into pending_merge	friendica	2015-01-21	7	-13/+42
\| \|\ \
\| \| * \	Merge pull request #873 from pafcu/master	RedMatrix	2015-01-22	5	-6/+31
\| \| \|\ \ \| \| \| \|/ \| \| \|/\|	Update some external libraries
\| \| \| *	Update to latest version of jRange (fixes issue #867)	Stefan Parviainen	2015-01-21	4	-4/+14
\| \| \| \|
\| \| \| *	Update to latest version of jquery-textcomplete.	Stefan Parviainen	2015-01-21	1	-2/+17
\| \| \|/
\| \| *	bring back nav-search spinner	marijus	2015-01-21	2	-7/+11
\| \| \|
\| * \|	update V3 roadmap	friendica	2015-01-21	2	-1/+4
\| \|/
\| *	Merge https://github.com/friendica/red into pending_merge	friendica	2015-01-20	1	-1/+1
\| \|\
\| \| *	Merge pull request #872 from habeascodice/master	RedMatrix	2015-01-21	1	-1/+1
\| \| \|\ \| \| \| \| \| \| \| \|	Rework directory server update selection query
\| * \| \|	add my.federated.social as directory server	friendica	2015-01-20	1	-0/+1
\| \|/ /
\| * \|	More styling for poco reputation page. Note: the reason this isn't yet ↵	friendica	2015-01-20	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \|	linked to the UI is because we need to age some old '1' values that are bogus.
* \| \|	directory server dba sql fixes	Habeas Codice	2015-01-21	1	-3/+3
\| \|/ \|/\|
* \|	Rework directory server update selection query	Habeas Codice	2015-01-20	1	-1/+1
\|/
*	typo in postgres db update, remove redmatrix.nl from directory servers since ↵	friendica	2015-01-20	2	-2/+1
\| \| \| \|	it isn't a directory server any more.
*	Merge https://github.com/friendica/red into pending_merge	friendica	2015-01-20	5	-26/+35
\|\
\| *	css fixes - hopefully	marijus	2015-01-20	4	-15/+24
\| \|
\| *	satisfy the floated images	marijus	2015-01-20	3	-3/+3
\| \|
\| *	as a workaround make nav-search dropdown behave a little better	marijus	2015-01-20	3	-11/+11
\| \|
* \|	get rid of really old poco records once weekly	friendica	2015-01-20	3	-1/+10
\| \|
* \|	poco rating variable getting over-written before local storage.	friendica	2015-01-19	1	-1/+1
\|/
*	oauth permissions table	friendica	2015-01-19	4	-3/+59
\|
*	Change link label from Feature settings to Feature/Addon settings to more ↵	friendica	2015-01-19	1	-1/+1
\| \| \| \|	accurately describe its purpose, since we currently use it exclusively for addons (though this will not always be true).
*	Merge https://github.com/friendica/red into pending_merge	friendica	2015-01-19	1	-2/+2
\|\
\| *	Merge pull request #870 from pafcu/autocomplete_fix	RedMatrix	2015-01-20	1	-1/+1
\| \|\ \| \| \| \| \| \|	Fix autocomplete with groups
\| \| *	Fix autocomplete with groups	Stefan Parviainen	2015-01-19	1	-1/+1
\| \| \|
\| * \|	Merge pull request #868 from pafcu/autocomplete_fix	git-marijus	2015-01-19	1	-1/+1
\| \|\\| \| \| \| \| \| \|	Fix issue #865.
\| \| *	Fix issue #865.	Stefan Parviainen	2015-01-19	1	-1/+1
\| \| \|
* \| \|	put cloud back in get_cloudpath - just have to be careful where we use it.	friendica	2015-01-19	2	-3/+5
\|/ /
* \|	make typo.php descend into include/RedDAV	friendica	2015-01-18	1	-0/+8
\| \|
* \|	Merge https://github.com/friendica/red into pending_merge	friendica	2015-01-18	4	-8/+23
\|\ \
\| * \|	allow system-loaded (i.e. pecl-oauth) to coexist	Habeas Codice	2015-01-18	1	-1/+2
\| \| \|
\| * \|	fix postgres escaping	Habeas Codice	2015-01-18	1	-5/+6
\| \| \|
\| * \|	fix update 1131 for postgres databases	Habeas Codice	2015-01-18	2	-2/+15
\| \| \|
* \| \|	typo	friendica	2015-01-18	1	-2/+2
\|/ /
* \|	remove all hardwired references to 'cloud' in the files interfaces and ↵	friendica	2015-01-18	2	-9/+13
\| \| \| \| \| \| \| \|	replace with $a->module. It's OK to leave them in the RedBrowser component because this will remain under /cloud. All the DAV bits need to be abstracted as they will eventually end up under /dav. $a->module will contain the correct string to use.
* \|	remove unrecognised code comment from markdown text.	friendica	2015-01-18	1	-1/+2
\| \|
* \|	Merge pull request #866 from redswede/dev_redswede	RedMatrix	2015-01-19	14	-18/+173
\|\ \ \| \| \| \| \| \|	Translations and updates to doc-files
\| * \	Merge branch 'master' of git://github.com/friendica/red into dev_redswede	RedSwede	2015-01-19	83	-115/+2054
\| \|\ \
\| * \| \|	translation of 2 helpfiles to swedish	RedSwede	2015-01-19	2	-0/+143
\| \| \| \|
\| * \| \|	Looked through the whole doc/-folder more or less. Added and commented a few ↵	RedSwede	2015-01-17	12	-15/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	things here and there. One question: * Is the crypto-js E2EE or not? If the devs agree that it is NOT then I propose removing this from the help files and gui.