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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'upstream'	marijus	2014-08-22	15	-138/+275
\|\
\| *	Merge branch 'master' of https://github.com/friendica/red into upstream	marijus	2014-08-22	28	-780/+663
\| \|\
\| \| *	another round of heavy lifting	friendica	2014-08-21	1	-112/+99
\| \| *	provide the site blacklist everywhere it is needed	friendica	2014-08-21	3	-1/+43
\| \| *	missing template file	friendica	2014-08-21	1	-0/+57
\| \| *	D* receive endpoint is receive/users/$guid - where $guid is really the channe...	friendica	2014-08-21	1	-4/+5
\| \| *	the rest of the diaspora local discovery stuff	friendica	2014-08-21	2	-3/+24
\| \| *	make the old personal xrd interface (old webfinger) work again	friendica	2014-08-21	4	-7/+37
\| \| *	profile edit - missing visibility and drop link on non-default profiles, re-a...	friendica	2014-08-21	4	-11/+10
* \| \|	Merge branch 'master' of https://github.com/friendica/red	marijus	2014-08-21	14	-469/+360
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	abook-edit-me class lost during some edit - we need this to reset the permiss...	friendica	2014-08-21	2	-2/+2
\| * \|	extensible profiles - add the input form elements. Still needs styling and we...	friendica	2014-08-20	3	-135/+123
\| * \|	verified that chatroom expire is working, so doing away with the second funct...	friendica	2014-08-20	2	-24/+4
\| * \|	restrict returned directory contents to xchans in the zot network. We could p...	friendica	2014-08-20	1	-2/+2
\| * \|	restructure the author and owner info from feeds	friendica	2014-08-20	1	-85/+58
\| * \|	move Friendica photo migrator to addons, bring back a few XML scraping functi...	friendica	2014-08-20	4	-176/+165
\| * \|	Merge https://github.com/friendica/red into pending_merge	friendica	2014-08-20	1	-0/+1
\| \|\ \
\| * \| \|	provide admin option for allowing rss/atom feed connections. Need to do this ...	friendica	2014-08-20	2	-45/+6
* \| \| \|	Merge branch 'master' of https://github.com/friendica/red	marijus	2014-08-20	3	-196/+51
\|\ \ \ \ \| \| \|/ / \| \|/\| / \| \|_\|/ \|/\| \|
\| * \|	Merge pull request #570 from zzottel/master	zzottel	2014-08-20	1	-0/+1
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	updated German main.bb doco file	zottel	2014-08-20	1	-0/+1
\| * \|	greatly simplify consume_feed() - a lot of this was friendica specific and so...	friendica	2014-08-20	2	-196/+50
\| \|/
* \|	Merge branch 'master' of https://github.com/friendica/red	marijus	2014-08-20	7	-239/+373
\|\\|
\| *	fangs bared	friendica	2014-08-19	1	-1/+23
\| *	snakebite continued	friendica	2014-08-19	1	-53/+108
\| *	some work on network discovery	friendica	2014-08-19	2	-168/+167
\| *	also reset comment policy on alternate delivery chains	friendica	2014-08-19	1	-2/+4
\| *	make sure privacy scope is completely reset on second delivery chain - revert...	friendica	2014-08-19	1	-8/+62
\| *	follow => connect	friendica	2014-08-19	1	-1/+1
\| *	really really fix lockview (cross fingers) ;-)	friendica	2014-08-19	1	-5/+7
\| *	Merge pull request #569 from git-marijus/master	RedMatrix	2014-08-20	1	-1/+2
\| \|\
\| * \|	fix nl	Jeroen	2014-08-19	2	-3/+3
* \| \|	Merge branch 'master' of https://github.com/friendica/red	marijus	2014-08-19	2	-5927/+6256
\|\\| \| \| \|/ \|/\|
\| *	Update nl	Jeroen	2014-08-19	2	-5927/+6256
* \|	really fix lock info	marijus	2014-08-19	1	-1/+2
\|/
*	diaspora - crazy amount of work remaining	friendica	2014-08-19	2	-81/+64
*	provide an overt indication that a post/comment was edited.	friendica	2014-08-18	3	-4/+6
*	Merge https://github.com/friendica/red into pending_merge	friendica	2014-08-18	1	-5/+4
\|\
\| *	Merge pull request #568 from git-marijus/master	RedMatrix	2014-08-19	1	-5/+4
\| \|\
\| \| *	make lockview provide the right info	marijus	2014-08-18	1	-5/+4
\| \|/
* /	nav channel selection	friendica	2014-08-18	5	-3/+26
\|/
*	beginning of permission role settings	friendica	2014-08-17	2	-1/+61
*	add ability to follow somebody not already in your connections from "post act...	friendica	2014-08-17	1	-0/+5
*	diaspora - begin heavy lifting. This is a 738 tonne brick with a herd of elep...	friendica	2014-08-17	1	-218/+118
*	some more work on realms	friendica	2014-08-17	6	-15/+54
*	Merge https://github.com/friendica/red into pending_merge	friendica	2014-08-17	8	-2472/+2923
\|\
\| *	Merge pull request #567 from tuscanhobbit/master	Paolo T	2014-08-17	2	-1208/+1416
\| \|\
\| \| *	IT: strings updated	tuscanhobbit	2014-08-17	2	-1208/+1416
\| * \|	Doco - attempt to explain pull requests in git for non developers.	Thomas Willingham	2014-08-17	1	-2/+27
\| * \|	Merge pull request #565 from RedMatrixCanada/Branch	RedMatrix	2014-08-17	2	-1197/+1387
\| \|\ \