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-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
\| \|
* \|	update 99	redmatrix	2015-05-05	1	-10/+10
\| \|
* \|	second pass name change	redmatrix	2015-05-05	34	-85/+85
\| \|
* \|	first pass name change	redmatrix	2015-05-05	27	-201/+201
\| \|
* \|	iteration #97	redmatrix	2015-05-05	1	-2/+2
\| \|
* \|	this will settle down eventually.	redmatrix	2015-05-05	1	-3/+3
\| \|
* \|	are we there yet?	redmatrix	2015-05-04	1	-8/+8
\| \|
* \|	readme, ad nauseum	redmatrix	2015-05-04	1	-3/+3
\| \|
* \|	readme, yet again	redmatrix	2015-05-04	1	-8/+3
\| \|
* \|	readme	redmatrix	2015-05-04	1	-1/+1
\| \|
* \|	readme	redmatrix	2015-05-04	1	-12/+18
\| \|
* \|	readme	redmatrix	2015-05-04	1	-7/+34
\|/
*	document [var=wrap]none[/var] for block elements	Mario Vavti	2015-04-30	2	-0/+8
\|
*	disconnect	friendica	2015-04-23	1	-1/+1
\|
*	explain a bit more about the structure and scope	friendica	2015-04-22	1	-0/+2
\|
*	add translation plugin to the to-do	friendica	2015-04-21	1	-0/+1
\|
*	update to-do list	friendica	2015-04-20	1	-0/+2
\|
*	doco updates	friendica	2015-04-19	1	-9/+9
\|
*	you need communications in there someplace.	friendica	2015-04-16	1	-1/+1
\|
*	simplify	friendica	2015-04-16	1	-3/+1
\|
*	nits	friendica	2015-04-15	1	-1/+1
\|
*	more feature editing and an "redmatrix in a nutshell" overview for those ↵	friendica	2015-04-15	1	-6/+18
\| \| \| \|	that can't figure it out.
*	comanche preview is probably important	friendica	2015-04-14	1	-0/+1
\|
*	jRange: width is innacurate depending on box model, padding and margins. ↵	friendica	2015-04-08	1	-1/+1
\| \| \| \|	Using css width instead.
*	update features, allow sys account page deletion	friendica	2015-04-08	2	-15/+16
\|
*	update resource links	friendica	2015-04-01	12	-17/+16
\|
*	some DB documentation	friendica	2015-03-30	5	-42/+62
\|
*	change "create new collection" to iconic, document the account table	friendica	2015-03-30	1	-18/+43
\|
*	add channel_lastpost timestamp to help optimise some outrageously expensive ↵	friendica	2015-03-26	1	-1/+0
\| \| \| \|	queries.
*	admin config for default expiration	friendica	2015-03-25	1	-5/+2
\|
*	also allow service classes to set post expiration. These take priority over ↵	friendica	2015-03-24	1	-0/+3
\| \| \| \|	the site default.
*	more work on expiration, make system limits useful - even in retrospect	friendica	2015-03-24	1	-1/+4
\|
*	one step forward, one step back.	friendica	2015-03-23	1	-1/+1
\|
*	update schema doco a little. needs some more...	Mario Vavti	2015-03-19	2	-9/+12
\|
*	start on some db_table doco	friendica	2015-03-15	1	-14/+35
\|