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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
\| \|\ \
\| \| * \|	French Transalations - UPDATED	RedMatrixCanada	2014-08-16	2	-1197/+1387
\| * \| \|	Merge pull request #566 from tonnerkiller/master	RedMatrix	2014-08-17	3	-65/+93
\| \|\ \ \ \| \| \|/ / \| \|/\| \|
\| \| * \|	Added "if(!function_exists('xpost_to_html2bbcode'))"	tonnerkiller	2014-08-16	1	-64/+68
\| \| * \|	api_posting.bb is a new doco file that explains posting to the redmatrix from...	tonnerkiller	2014-08-16	2	-1/+25
* \| \| \|	add collections widget to connections page - and some more work on realms	friendica	2014-08-17	5	-2/+27
\|/ / /
* \| \|	Merge https://github.com/friendica/red into pending_merge	friendica	2014-08-16	3	-4/+7
\|\ \ \
\| * \ \	Merge pull request #564 from cvogeley/master	RedMatrix	2014-08-17	2	-3/+6
\| \|\ \ \
\| \| * \| \|	Add account deletion to the UI	Christian Vogeley	2014-08-16	2	-3/+6
\| * \| \| \|	Install doc - mcrypt is required, not optional. Even if it's intended	Thomas Willingham	2014-08-16	1	-1/+1
\| \| \|/ / \| \|/\| \|
* / \| \|	provide backend storage and declaration of directory realm	friendica	2014-08-16	7	-31/+35
\|/ / /
* \| \|	Merge https://github.com/friendica/red into pending_merge	friendica	2014-08-15	1	-1/+1
\|\ \ \
\| * \ \	Merge pull request #563 from zzottel/master	RedMatrix	2014-08-16	1	-1/+1
\| \|\ \ \
\| \| * \| \|	don't block "public" messages with authenticated scope	zottel	2014-08-15	1	-1/+1
\| \|/ / /
* / / /	bring back some friendica crypto stuff including all the key mangling and tra...	friendica	2014-08-15	2	-1/+173
\|/ / /
* \| \|	doc update	friendica	2014-08-15	11	-0/+2299
* \| \|	doc update	friendica	2014-08-15	94	-4907/+5731
* \| \|	Merge https://github.com/friendica/red into pending_merge	friendica	2014-08-15	3	-2/+4
\|\ \ \
\| * \| \|	Merge pull request #562 from cvogeley/master	RedMatrix	2014-08-15	2	-1/+3
\| \|\\| \|