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

	Commit message (Expand)	Author	Age	Files	Lines
*	works one way sort of - now to go the other way - which will require fixing ...	friendica	2014-08-26	4	-29/+51
*	houston we have liftoff	friendica	2014-08-26	2	-12/+14
*	Merge https://github.com/friendica/red into pending_merge	friendica	2014-08-26	6	-77/+48
\|\
\| *	make vcard and contact block widget look-alike	marijus	2014-08-27	2	-46/+38
\| *	Merge branch 'master' of https://github.com/friendica/red	marijus	2014-08-26	1	-0/+1
\| \|\
\| \| *	Revert - see comments.	Thomas Willingham	2014-08-26	1	-3/+3
\| \| *	HTML doesn't work without ACCOUNT_ROLE_ALLOWCODE, so don't offer it	Thomas Willingham	2014-08-26	1	-2/+3
\| * \|	add background color to widgets	marijus	2014-08-26	4	-31/+9
\| * \|	Merge branch 'master' of https://github.com/friendica/red	marijus	2014-08-26	23	-82/+489
\| \|\\|
\| * \|	Merge branch 'master' of https://github.com/friendica/red	marijus	2014-08-25	2	-1/+14
\| \|\ \
\| * \ \	Merge branch 'master' of https://github.com/friendica/red	marijus	2014-08-25	2	-295/+378
\| \|\ \ \
\| * \ \ \	Merge branch 'master' of https://github.com/friendica/red	marijus	2014-08-24	1	-0/+2
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'master' of https://github.com/friendica/red	marijus	2014-08-24	2	-1/+114
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'master' of https://github.com/friendica/red	marijus	2014-08-24	16	-748/+765
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'master' of https://github.com/friendica/red	marijus	2014-08-23	121	-1922/+2405
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	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
\| \| \|\ \ \ \ \ \ \ \
\| * \| \ \ \ \ \ \ \ \	Merge branch 'master' of https://github.com/friendica/red	marijus	2014-08-21	14	-469/+360
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'master' of https://github.com/friendica/red	marijus	2014-08-20	3	-196/+51
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of https://github.com/friendica/red	marijus	2014-08-20	7	-239/+373
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' of https://github.com/friendica/red	marijus	2014-08-19	2	-5927/+6256
\| \|\ \ \ \ \ \ \ \ \ \ \ \
* \| \| \| \| \| \| \| \| \| \| \| \| \|	take off the kid gloves	friendica	2014-08-26	4	-52/+41
\| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	get rid of template "auto generated" warnings	friendica	2014-08-25	15	-75/+0
* \| \| \| \| \| \| \| \| \| \| \| \|	more diaspora stuff - most of the basic bits are there except queueing and ph...	friendica	2014-08-25	18	-12/+300
* \| \| \| \| \| \| \| \| \| \| \| \|	sort out some anomalies	friendica	2014-08-25	4	-8/+20
* \| \| \| \| \| \| \| \| \| \| \| \|	more diaspora heavy lifting	friendica	2014-08-25	3	-66/+248
* \| \| \| \| \| \| \| \| \| \| \| \|	notifications/system not marking all notifications seen	friendica	2014-08-25	1	-1/+1
\| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	re-obscure item body if localize_item() changes it. It's already flagged as o...	friendica	2014-08-25	2	-1/+14
\| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Add d* folks to address book. WARNING - DO NOT ATTEMPT THIS. LEAVE IT THE FRU...	friendica	2014-08-24	2	-295/+378
\| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	onepoll: don't poll archived, blocked, or ignored connections	friendica	2014-08-24	1	-0/+2
\| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	diaspora discovery	friendica	2014-08-24	2	-1/+114
\| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	unobscure viewsrc items	friendica	2014-08-23	1	-2/+5
* \| \| \| \| \| \| \|	Merge https://github.com/friendica/red into pending_merge	friendica	2014-08-23	11	-738/+751
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	fix nl	Jeroen	2014-08-23	2	-13/+13
\| * \| \| \| \| \| \| \|	Minor adjustment photo view + update nl (at 100\%\!)	Jeroen	2014-08-23	11	-726/+739
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	add "any connections" to can_comment_on_post() - was missing	friendica	2014-08-23	1	-0/+1
* \| \| \| \| \| \| \|	switch everything over to crypto_encapsulate()	friendica	2014-08-23	4	-8/+8
\|/ / / / / / /
* \| \| \| \| \| \|	We really can't do this without a hubloc. I was hoping we could, but notifier...	friendica	2014-08-22	6	-7/+23
* \| \| \| \| \| \|	issue #573 - this may not fix everything in that issue but should resolve som...	friendica	2014-08-22	1	-0/+3
* \| \| \| \| \| \|	"false" issue	friendica	2014-08-22	1	-4/+9
* \| \| \| \| \| \|	Merge https://github.com/friendica/red into pending_merge	friendica	2014-08-22	2	-5/+5
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	fix nl	Jeroen	2014-08-22	2	-5/+5
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	issue #571 - use feed/nickname?top=1	friendica	2014-08-22	2	-1/+7
* \| \| \| \| \| \|	rev update	friendica	2014-08-22	2	-669/+661
* \| \| \| \| \| \|	doc update	friendica	2014-08-22	109	-1236/+1697
\|/ / / / / /
* \| \| \| \| \|	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