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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-11	1	-9/+9
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/history.md mod/import.php
\| *	doc fixes	redmatrix	2015-08-11	1	-8/+8
\| \|
* \|	remove the forum limit	redmatrix	2015-08-11	1	-1/+1
\| \|
* \|	bring back colour to abook_self in acl	redmatrix	2015-08-11	1	-3/+3
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix0.8	redmatrix	2015-08-06	1	-2/+2
\|\\|
\| *	closing tags	redmatrix	2015-08-06	1	-2/+2
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-21	2	-17/+21
\|\\| \| \| \| \| \| \| \| \|	Conflicts: doc/to_do_code.bb
\| *	indicate where progress has been made	redmatrix	2015-07-20	2	-16/+20
\| \|
* \|	incorrectly named doc file	redmatrix	2015-07-06	1	-0/+0
\| \|
* \|	more work on db storage of doco	redmatrix	2015-07-05	1	-1/+0
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-07-03	1	-1/+0
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: view/it/messages.po view/it/strings.php
\| *	update German main help file	zottel	2015-07-03	1	-1/+0
\| \|
* \|	start doco cleanup	redmatrix	2015-07-03	63	-62/+62
\| \|
* \|	sync abook entries from redmatrix	redmatrix	2015-07-02	4	-35/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php
\| *	Clean up	Thomas Willingham	2015-06-30	4	-35/+1
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-28	2	-1/+4
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/zot.php mod/connedit.php util/messages.po
\| *	no this isn't it. well ok, it's part of it, but not the important part. it's ↵	redmatrix	2015-06-28	1	-1/+1
\| \| \| \| \| \| \| \|	still pretty cool.
\| *	project updates	redmatrix	2015-06-26	2	-1/+4
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-24	1	-11/+12
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/de/features.bb view/de/messages.po view/de/strings.php
\| *	update German help files	zottel	2015-06-24	2	-41/+56
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-23	3	-27/+21
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/items.php mod/item.php
\| *	Bring /help in line with the rest of the app	Mario Vavti	2015-06-22	3	-27/+21
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-21	2	-0/+2
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/items.php util/messages.po
\| *	do not show default in scheme selection dropdown. default.php and ↵	Mario Vavti	2015-06-21	2	-0/+2
\| \| \| \| \| \| \| \|	default.css should be symlinks. adjust doco accordingly.
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-13	1	-1/+1
\|\\| \| \| \| \| \| \| \| \|	Conflicts: util/messages.po
\| *	nginx config change from Thomas	Michael Johnston	2015-06-13	1	-1/+1
\| \|
* \|	more work on items	redmatrix	2015-06-11	2	-4/+4
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php view/it/messages.po view/it/strings.php
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-06	1	-2/+78
\|\\| \| \| \| \| \| \| \| \|	Conflicts: util/messages.po
\| *	some doco on webpage blocks	Mario Vavti	2015-06-04	1	-2/+78
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-02	2	-204/+48
\|\\|
\| *	update comanche doco	Mario Vavti	2015-06-02	2	-204/+48
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-27	2	-0/+38
\|\\| \| \| \| \| \| \| \| \|	Conflicts: mod/impel.php
\| *	add ability to change existing channel/account service class with	Habeas Codice	2015-05-26	2	-0/+7
\| \| \| \| \| \| \| \| \| \|	util/service_class add link from main doc
\| *	Add docs about current service class system, tiny util to make updates a	Habeas Codice	2015-05-25	1	-0/+31
\| \| \| \| \| \| \| \|	little easier than the standard config util
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-19	2	-1/+17
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: view/nl/messages.po view/nl/strings.php
\| *	Document widget creation.	Alexandre Hannud Abdo	2015-05-19	2	-1/+17
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-18	3	-4/+51
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: view/nl/messages.po view/nl/strings.php
\| *	Create Primary-Directory	Adam Robertson	2015-05-18	1	-0/+47
\| \| \| \| \| \|	Description and Instruction on using a Primary Directory for a series of Private Hubs
\| *	spelling	redmatrix	2015-05-17	2	-4/+4
\| \|
* \|	provide a warning	redmatrix	2015-05-17	1	-0/+4
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-17	1	-0/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/bb2diaspora.php include/diaspora.php include/enotify.php mod/admin.php mod/cloud.php mod/dav.php mod/home.php mod/invite.php mod/like.php mod/mitem.php mod/p.php mod/pubsites.php mod/setup.php mod/siteinfo.php util/messages.po
\| *	update to_do	redmatrix	2015-05-14	1	-0/+1
\| \|
* \|	update readme	redmatrix	2015-05-17	1	-4/+5
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-13	45	-208/+225
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	not sure how these files ended up here, but they belong with doxygen stuff	redmatrix	2015-05-13	2	-577/+0
\| \|
\| *	remove project name dependency from most of the doc files to ease project ↵	redmatrix	2015-05-13	47	-276/+276
\| \| \| \| \| \| \| \|	merging, there are going to be some edge cases requiring manual tweaking as most of this was done by script.
* \|	correcting upstream	redmatrix	2015-05-10	1	-1/+1
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-06	2	-2/+10
\|\\|
\| *	comanche doco	Mario Vavti	2015-05-06	2	-2/+10
\| \|
* \|	i think this is 100	redmatrix	2015-05-05	1	-7/+3
\| \|