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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge https://github.com/friendica/red into pending_merge	friendica	2014-12-01	23	-8754/+8897
\|\ \| \| \| \| \| \| \| \|	Conflicts: version.inc
\| *	Don't allow affinity of 0 in connedit.	Thomas Willingham	2014-12-02	3	-2/+3
\| \|
\| *	Somewhat subtle process_delivery() bug - $public was not being reset if a sys	Thomas Willingham	2014-12-01	1	-0/+1
\| \| \| \| \| \| \| \|	channel is reached but then the loop iterated over another channel.
\| *	Merge pull request #718 from tuscanhobbit/dev	Paolo T	2014-12-01	2	-4035/+4077
\| \|\ \| \| \| \| \| \|	Italian translation
\| \| *	Italian translation	Paolo Tacconi	2014-12-01	2	-4035/+4077
\| \|/
\| *	The other half of 'any theme for any device'. Closes #71	Thomas Willingham	2014-11-30	1	-6/+11
\| \|
\| *	Handle included txt files (ie, install doco) as BBCode, otherwise it strips all	Thomas Willingham	2014-11-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	white space. Was going to use Markdown, but lots of not-markdown gets parsed then, so...
\| *	Whitespace. Stupid £#@£@$ editor.	Thomas Willingham	2014-11-29	2	-7/+7
\| \|
\| *	Merge branch 'master' of https://github.com/friendica/red	Thomas Willingham	2014-11-29	73	-5591/+6208
\| \|\
\| \| *	Merge branch 'master' of https://github.com/friendica/red	marijus	2014-11-29	4	-4516/+4568
\| \| \|\
\| \| \| *	update nl (typo)	Jeroen	2014-11-29	2	-2/+2
\| \| \| \|
\| \| \| *	update nl	Jeroen	2014-11-29	2	-3957/+3999
\| \| \| \|
\| \| \| *	Merge pull request #715 from f03el/master	Thomas Willingham	2014-11-29	2	-559/+569
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \|	Update Swedish strings
\| \| \| \| *	Update Swedish strings	Erik Lundin	2014-11-29	2	-559/+569
\| \| \| \| \|
\| \| * \| \|	readd link_colour again	marijus	2014-11-29	1	-1/+1
\| \| \|/ /
\| \| * /	bootstrap-3.3.1 and minor css fixes	marijus	2014-11-29	9	-188/+227
\| \| \|/
\| * \|	Fix abook_toggle_flag from postgres stuff	Thomas Willingham	2014-11-29	1	-5/+7
\| \| \|
* \| \|	rev update	friendica	2014-12-01	1	-1/+1
\| \|/ \|/\|
* \|	Merge https://github.com/friendica/red into pending_merge	friendica	2014-11-28	2	-19/+20
\|\\|
\| *	Issue #713 Arguably, we shouldn't allow poking yourself and stuff either	Thomas Willingham	2014-11-29	1	-1/+2
\| \| \| \| \| \| \| \|	but I like that, so...
\| *	Doco - #710 flipped the colours. Unsurprisingly, they were the other	Thomas Willingham	2014-11-28	1	-18/+18
\| \| \| \| \| \| \| \| \| \|	way round because they were created on a dark theme. The right thing to do is not to specify a colour at all, and let the themes handle it.
* \|	update mozilla cacert.pem	friendica	2014-11-28	3	-732/+849
\| \|
* \|	doc updates	friendica	2014-11-28	57	-155/+564
\|/
*	Merge https://github.com/friendica/red into pending_merge	friendica	2014-11-27	5	-4080/+3988
\|\
\| *	Merge pull request #710 from anaqreon/features-doc	RedMatrix	2014-11-28	3	-132/+8
\| \|\ \| \| \| \| \| \|	Documentation wording
\| \| *	Documentation wording	Andrew Manning	2014-11-25	3	-132/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improved wording. Replaced white colored text with black because the default theme makes the white invisible.
\| * \|	Merge pull request #712 from f03el/master	RedMatrix	2014-11-28	2	-3948/+3980
\| \|\ \ \| \| \| \| \| \| \| \|	Update Swedish strings
\| \| * \|	Update Swedish strings	Erik Lundin	2014-11-25	1	-778/+785
\| \| \| \|
\| \| * \|	Update Swedish strings	Erik Lundin	2014-11-25	1	-3170/+3195
\| \| \|/
* \| /	revup	friendica	2014-11-27	1	-1/+1
\|/ /
* \|	revup	friendica	2014-11-26	1	-1/+1
\| \|
* \|	Merge remote-tracking branch 'upstream/master'	Habeas Codice	2014-11-26	129	-28979/+31328
\|\\|
\| *	Make events export track the current calendar. Turn it and 'new event' into ↵	friendica	2014-11-24	2	-3/+13
\| \| \| \| \| \| \| \|	buttons
\| *	Merge https://github.com/friendica/red into pending_merge	friendica	2014-11-24	1	-1/+0
\| \|\
\| \| *	Merge branch 'master' of https://github.com/friendica/red	Thomas Willingham	2014-11-25	2	-4/+14
\| \| \|\
\| \| * \|	Update dir fallbacks.	Thomas Willingham	2014-11-25	1	-1/+0
\| \| \| \|
\| * \| \|	ical output wasn't using 24-hour time	friendica	2014-11-24	1	-2/+2
\| \| \|/ \| \|/\|
\| * \|	theme the observer tags so they stick out like a sore thumb. Too much bad juju.	friendica	2014-11-24	2	-4/+14
\| \|/
\| *	Merge https://github.com/friendica/red into pending_merge	friendica	2014-11-24	9	-18686/+19723
\| \|\
\| \| *	Merge pull request #707 from HaakonME/master	RedMatrix	2014-11-25	2	-4902/+5594
\| \| \|\ \| \| \| \| \| \| \| \|	Updated Norwegian bokmål translation
\| \| \| *	Updated Norwegian bokmål translation	Haakon Meland Eriksen	2014-11-23	2	-4902/+5594
\| \| \| \|
\| \| * \|	Merge pull request #709 from tuscanhobbit/dev	Paolo T	2014-11-24	2	-5007/+5205
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	Italian translation
\| \| \| * \|	Italian translation	Paolo Tacconi	2014-11-24	2	-5007/+5205
\| \| \| \| \|
\| \| \| * \|	Merge pull request #7 from friendica/master	Paolo T	2014-11-24	472	-26959/+41480
\| \| \| \|\ \ \| \| \| \|/ / \| \| \|/\| \|	Merge from main project
\| \| * \| \|	and update Dutch	Jeroen	2014-11-24	2	-4385/+4403
\| \| \| \| \|
\| \| * \| \|	Merge pull request #708 from zzottel/master	zzottel	2014-11-24	3	-4392/+4521
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	German update
\| \| \| * \| \|	update to German strings	zottel	2014-11-24	2	-4392/+4519
\| \| \| \| \| \|
\| \| \| * \| \|	update to Germanmain help file	zottel	2014-11-24	1	-0/+2
\| \| \| \| \| \|
\| * \| \| \| \|	hide online presence maps to DNT	friendica	2014-11-24	2	-3/+6
\| \|/ / / /
\| * / / /	add event export (this month) to event UI	friendica	2014-11-24	3	-1/+14
\| \|/ / /