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	-2/+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	-2/+2
\| \| \| \| \| \| \| \|	merging, there are going to be some edge cases requiring manual tweaking as most of this was done by script.
* \|	first pass name change	redmatrix	2015-05-05	1	-2/+2
\|/
*	update resource links	friendica	2015-04-01	1	-1/+1
\|
*	add repo pointers	friendica	2015-03-04	1	-0/+9
\|
*	missed a couple	friendica	2015-03-04	1	-0/+2
\|
*	provide a list of potential addons and what they do for members who can't ↵	friendica	2015-03-04	1	-1/+57
\| \| \| \| \| \|	see the descriptions on the admin/plugins page Not all of these are in red-addons repository, please add any that haven't been listed. We should probably provide a list of addon repositories at the end.
*	merge madness	friendica	2014-10-19	1	-1/+1
\|
*	Make [observer.baseurl] more reliable using connurl which will change	Thomas Willingham	2014-06-30	1	-1/+1
\| \| \| \| \|	less often than xchan_url, which can break the regex and might not even contain the baseurl at all, plus a bit of doco clean up.
*	Some doco work. Changed main.bb and added a return link to all .bb files and ↵	root	2014-06-29	1	-0/+3
\| \| \| \|	began planning new entries for user orientated documentation.
*	Doco - gnusocial doco from Randal	Thomas Willingham	2014-06-24	1	-0/+2