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-24	6	-596/+31
\|\
\| *	Merge pull request #877 from solstag/master	RedMatrix	2015-01-25	1	-1/+2
\| \|\ \| \| \| \| \| \|	Call sslify with an extra path element so files keep their names
\| \| *	Call sslify with an extra path element so files keep their names	Alexandre Hannud Abdo	2015-01-25	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The main motivation for this is when saving images one doesn't need to inspect and manually input the file's actual name. There might be other benefits, perhaps in automated downloads.
\| * \|	Merge pull request #876 from cvogeley/master	RedMatrix	2015-01-25	5	-595/+29
\| \|\ \ \| \| \| \| \| \| \| \|	Check allowed emails, also add blacklisting for
\| \| * \|	Check allowed emails, also add blacklisting for	Christian Vogeley	2015-01-25	5	-595/+29
\| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	not allowed emails: config:'system','not_allowed_email'
* \| /	remove superfluous group by	Habeas Codice	2015-01-24	1	-1/+1
\|/ / \| \| \| \| \| \| \| \|	this gets called from a zot post_post dealing with a specific messageid and hubloc_hash combination. grouping by site doesn't make sense here and it gets grouped when pulled back out elsewhere anyway
* \|	Merge branch 'master' of https://github.com/friendica/red	Habeas Codice	2015-01-24	1	-3/+15
\|\\|
\| *	optimize check query	marijus	2015-01-24	1	-2/+7
\| \|
\| *	Merge branch 'master' of https://github.com/friendica/red	marijus	2015-01-24	6	-7/+12
\| \|\
\| * \|	the old item must be removed before the new is created	marijus	2015-01-24	1	-1/+8
\| \| \|
* \| \|	standardize sql	Habeas Codice	2015-01-24	1	-1/+1
\| \|/ \|/\|
* \|	unmatched parens	Habeas Codice	2015-01-23	1	-1/+1
\| \|
* \|	Merge https://github.com/friendica/red into pending_merge	friendica	2015-01-23	7	-131/+115
\|\ \
\| * \	Merge branch 'master' of https://github.com/friendica/red	Habeas Codice	2015-01-23	58	-1239/+1497
\| \|\ \
\| \| * \	Merge pull request #875 from zzottel/master	RedMatrix	2015-01-24	2	-0/+4
\| \| \|\ \ \| \| \| \|/ \| \| \|/\|	add db update 1131/1132 to database schemas
\| \| \| *	add db update 1131/1132 to database schemas	zottel	2015-01-23	2	-0/+4
\| \| \| \|
\| \| * \|	disable notices	marijus	2015-01-24	1	-2/+2
\| \| \| \|
\| \| * \|	some more kiss	marijus	2015-01-24	2	-95/+60
\| \| \|/
\| \| *	typo	marijus	2015-01-23	1	-1/+1
\| \| \|
\| \| *	we get the object info before it is deleted now	marijus	2015-01-23	1	-12/+12
\| \| \|
\| \| *	Merge branch 'master' of https://github.com/friendica/red	marijus	2015-01-23	51	-1111/+1384
\| \| \|\
\| \| * \|	some code restructure	marijus	2015-01-23	3	-46/+59
\| \| \| \|
\| * \| \|	rand() fixes	Habeas Codice	2015-01-23	2	-3/+5
\| \| \| \|
* \| \| \|	onedirsync issue reported by habeas codice	friendica	2015-01-23	1	-3/+2
\| \|_\|/ \|/\| \|
* \| \|	Merge https://github.com/friendica/red into pending_merge	friendica	2015-01-23	3	-6/+9
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	this will require more fixing in include/enotify	marijus	2015-01-23	2	-2/+2
\| \| \|
\| * \|	possible performance improvement for sharedwithme update query	marijus	2015-01-22	1	-4/+7
\| \|/
* \|	provide pref to set default photo resolution for posts to something other ↵	friendica	2015-01-23	1	-0/+9
\| \| \| \| \| \| \| \|	than 2. The only acceptable option is 1. (640)
* \|	doc updates	friendica	2015-01-23	50	-1111/+1375
\|/
*	Merge branch 'master' of https://github.com/friendica/red	Habeas Codice	2015-01-22	2	-2/+26
\|\
\| *	add some mimetypes	marijus	2015-01-22	2	-2/+26
\| \|
* \|	fix dir server query take 2	Habeas Codice	2015-01-22	1	-1/+1
\|/ \| \| \| \|	rationale: use latest entry rather than latest update. update timestamp is updated for all entries upon success so they are equivalent. prevents dupes from fake null dates.
*	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
\| \|\