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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-13	1	-1/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/DerivedTheme1.md doc/Developers.md doc/Features.md doc/Plugins.md doc/Privacy.md doc/README.md doc/Remove-Account.md doc/Translations.md doc/about.bb doc/account_basics.bb doc/accounts_profiles_channels_basics.bb doc/addons.bb doc/addons_gnusocial.bb doc/bbcode.html doc/campaign.bb doc/classRedmatrix_1_1Import_1_1Import-members.html doc/classRedmatrix_1_1Import_1_1Import.html doc/cloud.bb doc/connecting_to_channels.bb doc/connecting_to_channels.md doc/credits.bb doc/de/channels.bb doc/de/features.bb doc/de/main.bb doc/de/registration.bb doc/developers.bb doc/encryption.bb doc/external-resource-links.bb doc/extra_features.bb doc/faq_admins.bb doc/faq_developers.bb doc/faq_members.bb doc/features.bb doc/hidden_configs.bb doc/history.md doc/html/index.php doc/main.bb doc/permissions.bb doc/plugins.bb doc/problems-following-an-update.bb doc/profiles.bb doc/red2pi.bb doc/registration.bb doc/roadmap.bb doc/sv/main.bb doc/what_is_zot.bb doc/zot.md
\| *	remove project name dependency from most of the doc files to ease project ↵	redmatrix	2015-05-13	1	-1/+1
\| \| \| \| \| \| \| \|	merging, there are going to be some edge cases requiring manual tweaking as most of this was done by script.
* \|	second pass name change	redmatrix	2015-05-05	1	-1/+1
\|/
*	Looked through the whole doc/-folder more or less. Added and commented a few ↵	RedSwede	2015-01-17	1	-0/+1
\| \| \| \| \| \| \| \|	things here and there. One question: * Is the crypto-js E2EE or not? If the devs agree that it is NOT then I propose removing this from the help files and gui.
*	add main_footer include to all .md files except TOS and README	zottel	2014-12-08	1	-0/+1
\|
*	wordsmithing	friendica	2013-11-18	1	-1/+3
\|
*	update to reflect that account and channel removal is now possible, though ↵	friendica	2013-11-18	1	-1/+18
\| \| \| \|	bugs likely remain.
*	Doco	Thomas Willingham	2013-05-14	1	-21/+1
\|
*	Merge branch 'master' of https://github.com/friendica/friendica	Alexander Kampmann	2012-04-05	1	-0/+0
\| \| \| \| \| \|	Conflicts: include/config.php update.php
*	doc/Remove-Account.md	Thomas	2012-03-06	1	-2/+13
\|
*	add remove_user hook (it looks like dreamhost changed all my file ↵	friendica	2012-01-18	1	-0/+0
\| \| \| \|	permissions, this will make a nasty commit)
*	some doc updates	Friendika	2011-11-08	1	-3/+3
\|
*	local documentation library	Friendika	2011-04-13	1	-0/+13