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-10	68	-1166/+1313
\|\
\| *	Missing ''	Thomas Willingham	2014-12-10	1	-1/+1
\| \|
\| *	Merge branch 'master' of https://github.com/friendica/red	Thomas Willingham	2014-12-10	1	-232/+228
\| \|\
\| \| *	some work on profile page - mostly whitespace	marijus	2014-12-10	1	-232/+228
\| \| \|
\| * \|	Bring back 'no special theme for mobile'	Thomas Willingham	2014-12-10	1	-6/+8
\| \|/
\| *	Provide censorship.	Thomas Willingham	2014-12-10	1	-4/+9
\| \|
\| *	Issue #732	Thomas Willingham	2014-12-09	2	-2/+28
\| \|
\| *	adjustment to clear browser location button only if use browser location ↵	marijus	2014-12-09	2	-2/+2
\| \| \| \| \| \| \| \|	option is set
\| *	show clear browser location button only if use browser location option is ↵	marijus	2014-12-09	6	-15/+8
\| \| \| \| \| \| \| \|	set and minor css fixes
\| *	Merge pull request #735 from pafcu/jotbtnspacing2	git-marijus	2014-12-09	2	-56/+68
\| \|\ \| \| \| \| \| \|	Put some spacing between share types and other buttons in jot
\| \| *	Group comment editor icons	Stefan Parviainen	2014-12-08	1	-28/+34
\| \| \|
\| \| *	Put some spacing between share types and other buttons in jot	Stefan Parviainen	2014-12-08	1	-28/+34
\| \| \|
\| * \|	Merge pull request #733 from pafcu/rewordoptional	git-marijus	2014-12-09	5	-10/+10
\| \|\ \ \| \| \|/ \| \|/\|	Make it clear that title and categories are optional
\| \| *	Make it clear that title and categories are optional	Stefan Parviainen	2014-12-08	5	-10/+10
\| \|/
\| *	Merge pull request #726 from pafcu/tagsinotherchannels	Thomas Willingham	2014-12-08	3	-262/+273
\| \|\ \| \| \| \| \| \|	Show tags in other channels profile field to make it easier to navigate ...
\| \| *	Show tags in other channels profile field to make it easier to navigate to ↵	Stefan Parviainen	2014-12-07	3	-262/+273
\| \| \| \| \| \| \| \| \| \| \| \|	the channels
\| * \|	Merge pull request #724 from pafcu/suggestionsindir	Thomas Willingham	2014-12-08	3	-4/+47
\| \|\ \ \| \| \| \| \| \| \| \|	Show suggestions in directory
\| \| * \|	Suggestions in dir redux. Suggestions are now showed in directory if ↵	Stefan Parviainen	2014-12-07	3	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	suggest=1 parameter is given to directory.
\| \| * \|	Revert "Revert "Directory shows channel suggestions by default""	Stefan Parviainen	2014-12-07	4	-4/+43
\| \| \|/ \| \| \| \| \| \| \| \| \|	This reverts commit bfde28f28eae1f4b00aac03b2714254d14ab7464.
\| * \|	Merge pull request #723 from pafcu/diropts	Thomas Willingham	2014-12-08	4	-10/+28
\| \|\ \ \| \| \| \| \| \| \| \|	Directory sorting as a dropdown, forum filter as checkbox, option to sor...
\| \| * \|	Directory sorting as a dropdown, forum filter as checkbox, option to sort ↵	Stefan Parviainen	2014-12-07	4	-10/+28
\| \| \|/ \| \| \| \| \| \| \| \| \|	oldest first
\| * \|	Merge pull request #727 from dawnbreak/docu	Thomas Willingham	2014-12-08	6	-272/+397
\| \|\ \ \| \| \| \| \| \| \| \|	Some Doxygen comments and small cleanups.
\| \| * \|	Some Doxygen comments and small cleanups.	Klaus Weidenbach	2014-12-07	6	-272/+397
\| \| \| \|
\| * \| \|	Merge pull request #731 from zzottel/master	zzottel	2014-12-08	23	-28/+31
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	add main_footer include to all .md files except TOS and README
\| \| * \| \|	add main_footer include to all .md files except TOS and README	zottel	2014-12-08	23	-28/+31
\| \| \|/ /
\| * \| \|	Merge pull request #728 from cvogeley/master	mrjive	2014-12-08	5	-130/+42
\| \|\ \ \ \| \| \|/ / \| \|/\| \|	Remove channel cloud files from file system when the channel is removed
\| \| * \|	small change	Christian Vogeley	2014-12-07	1	-1/+1
\| \| \| \|
\| \| * \|	Remove channel cloud files from file system when	Christian Vogeley	2014-12-07	1	-0/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the channel is removed
\| \| * \|	merge	Christian Vogeley	2014-12-07	1	-4/+4
\| \| \| \|
\| \| * \|	merge	Christian Vogeley	2014-12-07	3	-126/+2
\| \|/ /
\| * \|	Missing include if photo album widget called from not-the-photos page.	Thomas Willingham	2014-12-04	1	-1/+2
\| \| \|
\| * \|	Merge pull request #721 from magicoli/master	RedMatrix	2014-12-04	8	-112/+111
\| \|\ \ \| \| \| \| \| \| \| \|	update fr
\| \| * \|	update fr: 'to prod', better translated by 'encourager'	Olivier van Helden	2014-12-04	2	-10/+10
\| \| \| \|
\| \| * \|	update fr: checked mail templates and another bunch of typoes in strings	Olivier van Helden	2014-12-04	8	-36/+35
\| \| \| \|
\| \| * \|	update fr: use prefixFromNow to display time delta in the most used, natural ↵	Olivier van Helden	2014-12-04	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	form ("Il y a 2 jours" and not "2 jours auparavant")
\| \| * \|	update fr - sorry for multiple posts, I will try to find time to check the ↵	Olivier van Helden	2014-12-04	2	-36/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	whole french translation and submit once.
\| \| * \|	update fr	Olivier van Helden	2014-12-04	2	-28/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- resubmitted, after online tests, correct translations for poked, pinged, etc - fix wrong sense for poked - there were two different translations for [red:notify], changed to the most used (Red:Notification) everywhere.
\| \| * \|	Merge pull request #2 from friendica/master	Olivier van Helden	2014-12-03	2	-2/+3
\| \| \|\ \ \| \| \|/ / \| \|/\| \|	Pull from friendica/master
\| * \| \|	Merge pull request #720 from magicoli/master	Thomas Willingham	2014-12-04	2	-24/+24
\| \|\\| \| \| \| \| \| \| \| \| \|	update fr
\| \| * \|	update fr: fix typo and ambiguous changes in ↵	Olivier van Helden	2014-12-03	2	-11/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1ea73a55e8276006b4c0f0307dfbe2a35acdff33
\| \| * \|	update fr typoes	Olivier van Helden	2014-12-03	2	-33/+33
\| \| \| \|
\| \| * \|	Merge pull request #1 from friendica/master	Olivier van Helden	2014-12-03	478	-36595/+54051
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	Merge master from friendica
\| * \| \| \|	Put dir back - the fat lady didn't sing afterall.	Thomas Willingham	2014-12-04	2	-2/+3
\| \| \|/ / \| \|/\| \|
* / \| \|	block adult channels from inclusion in public content feeds	friendica	2014-12-10	5	-708/+708
\|/ / /
* \| \|	add comodo intermediate certs and a method to add other intermediate certs.	friendica	2014-12-03	5	-2/+4080
\| \| \|
* \| \|	can't reset public to false because it may have been passed in as true and ↵	friendica	2014-12-01	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \|	this would be wrong and cause even more subtle bugs. Reset to whatever value was passed in.
* \| \|	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