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

	Commit message (Collapse)	Author	Age	Files	Lines
*	old merge conflict	redmatrix	2015-10-20	1	-7/+1
\|
*	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-13	1	-0/+7
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\|/
*	remove Doxygen API Documentation from repository.	Klaus Weidenbach	2015-03-04	1478	-173459/+15
\| \| \| \| \| \| \|	This removes around 14MB and can get easily generate locally by doxygen util/Doxyfile when needed. Restructured .gitignore a bit and some additions like zotshrc, etc. Fixed a typo in doc/main.bb
*	weekly doxygen push	friendica	2015-02-27	69	-765/+1321
\|
*	doc update	friendica	2015-02-20	120	-0/+9960
\|
*	doc update	friendica	2015-02-20	169	-3219/+4114
\|
*	missing file	friendica	2015-02-15	1	-0/+8
\|
*	missing param	friendica	2015-02-13	51	-457/+652
\|
*	more doc updates	friendica	2015-02-06	10	-0/+772
\|
*	get_rel_link broken - also weekly doc updates	friendica	2015-02-06	72	-968/+1225
\|
*	sync_locations() toggle DB flag functions were broken - result of postgres ↵	friendica	2015-01-30	5	-0/+729
\| \| \| \|	changes. Split these into seperate set and reset blocks.
*	let zot_refresh continue without a primary hub if one cannot be found. also ↵	friendica	2015-01-30	83	-880/+1144
\| \| \| \|	weekly doc updates
*	remote_user => remote_channel	friendica	2015-01-28	6	-8/+8
\|
*	local_user => local_channel	friendica	2015-01-28	11	-14/+14
\|
*	Check allowed emails, also add blacklisting for	Christian Vogeley	2015-01-25	4	-589/+0
\| \| \| \| \|	not allowed emails: config:'system','not_allowed_email'
*	doc updates	friendica	2015-01-23	48	-235/+477
\|
*	more doc updates	friendica	2015-01-16	35	-0/+2759
\|
*	mod_prep usability enhancements, doc updates	friendica	2015-01-16	131	-1106/+1571
\|
*	Correction	Christian Vogeley	2015-01-11	1	-1/+1
\|
*	Correction	Christian Vogeley	2015-01-11	1	-1/+1
\|
*	Correction	Christian Vogeley	2015-01-11	3	-4/+3
\|
*	corrcetion	Christian Vogeley	2015-01-11	1	-1/+1
\|
*	Correct	Christian Vogeley	2015-01-11	1	-19/+18
\|
*	Merge remote-tracking branch 'upstream/master'	Christian Vogeley	2015-01-11	85	-825/+1425
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/html/classRedmatrix_1_1Import_1_1Import-members.html doc/html/classRedmatrix_1_1Import_1_1Import.js
\| *	doc updates	friendica	2015-01-10	45	-365/+814
\| \|
\| *	doc updates	friendica	2015-01-02	61	-497/+590
\| \|
\| *	Added url tag around image for inserted links	Andrew Manning	2014-12-30	5	-115/+155
\| \|
* \|	merge	Christian Vogeley	2014-12-27	7	-757/+18
\|/
*	doc update	friendica	2014-12-26	31	-382/+443
\|
*	doc updates	friendica	2014-12-19	68	-691/+1199
\|
*	doc update	friendica	2014-12-12	5	-0/+721
\|
*	don't import to sys channel from self-censored authors	friendica	2014-12-12	80	-771/+991
\|
*	Merge https://github.com/friendica/red into pending_merge	friendica	2014-12-10	4	-130/+6
\|\
\| *	merge	Christian Vogeley	2014-12-07	1	-4/+4
\| \|
\| *	merge	Christian Vogeley	2014-12-07	3	-126/+2
\| \|
* \|	block adult channels from inclusion in public content feeds	friendica	2014-12-10	2	-2/+2
\|/
*	doc updates	friendica	2014-11-28	57	-155/+564
\|
*	Documentation wording	Andrew Manning	2014-11-25	2	-124/+0
\| \| \| \| \|	Improved wording. Replaced white colored text with black because the default theme makes the white invisible.
*	doc updates	friendica	2014-11-22	91	-1408/+1554
\|
*	doc updates	friendica	2014-11-15	152	-1591/+3305
\|
*	doc updates	friendica	2014-11-07	102	-406/+1576
\|
*	doc updates	friendica	2014-11-01	10	-0/+1049
\|
*	doc updates	friendica	2014-10-31	82	-1814/+1782
\|
*	doc updates	friendica	2014-10-24	93	-543/+2308
\|
*	new doc added to doc checkin	friendica	2014-10-19	20	-0/+2790
\|
*	doc updates	friendica	2014-10-19	112	-1294/+1472
\|
*	doc updates	friendica	2014-10-10	140	-1903/+3809
\|
*	doc updates	friendica	2014-10-03	48	-355/+1038
\|