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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into tres	redmatrix	2015-05-14	187	-9453/+9692
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/Import/refimport.php include/activities.php include/attach.php include/event.php include/externals.php include/identity.php include/items.php include/notifier.php include/photos.php include/taxonomy.php include/zot.php mod/channel.php mod/connedit.php mod/events.php mod/item.php mod/like.php mod/manage.php mod/mood.php mod/ping.php mod/poke.php mod/subthread.php mod/tagger.php mod/thing.php
\| *	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-13	46	-209/+226
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	48	-277/+277
\| \| \| \| \| \| \| \| \| \| \| \|	merging, there are going to be some edge cases requiring manual tweaking as most of this was done by script.
\| * \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-13	13	-19/+23
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: boot.php include/api.php include/enotify.php
\| \| *	restrict webpage list to undeleted items	redmatrix	2015-05-13	2	-3/+3
\| \| \|
\| \| *	product was a bad string to use because we may require it for e-commerce, ↵	redmatrix	2015-05-13	11	-15/+15
\| \| \| \| \| \| \| \| \| \| \| \|	and RED_PLATFORM is equally problematic for other reasons.
\| \| *	issue #187	redmatrix	2015-05-12	1	-1/+5
\| \| \|
\| * \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-12	3	-2/+72
\| \|\\|
\| \| *	cut/paste error	redmatrix	2015-05-12	1	-1/+1
\| \| \|
\| \| *	repo updaters	redmatrix	2015-05-12	3	-2/+72
\| \| \|
\| * \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-12	6	-5/+27
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mod/mitem.php view/nl/strings.php
\| \| *	provide a method for loading site/custom widgets	redmatrix	2015-05-12	1	-0/+3
\| \| \|
\| \| *	replace project name with $product or $Product in strings to avoid merge ↵	redmatrix	2015-05-12	1	-2/+15
\| \| \| \| \| \| \| \| \| \| \| \|	issues across different project names. Currently a place-holder. The strings themselves have not yet been modified.
\| \| *	version update	redmatrix	2015-05-12	1	-1/+1
\| \| \|
\| \| *	Dutch 100\% again	jeroenpraat	2015-05-12	2	-56/+76
\| \| \|
\| \| *	fix a couple of miscellaneous errors which showed up in the logs	redmatrix	2015-05-11	2	-2/+5
\| \| \|
\| \| *	let the site admin import a record directly from the probe diagnostic	redmatrix	2015-05-11	1	-0/+3
\| \| \|
\| \| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-05-11	2	-6099/+7075
\| \| \|\
\| \| * \|	missing translation	redmatrix	2015-05-11	2	-2/+2
\| \| \| \|
\| * \| \|	missing merge conflict	redmatrix	2015-05-11	1	-6/+1
\| \| \| \|
\| * \| \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-11	0	-0/+0
\| \|\ \ \ \| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: view/pt-br/messages.po view/pt-br/strings.php
\| \| * \|	Merge pull request #319 from solstag/ptbrupdate	redmatrix	2015-05-12	2	-6099/+7075
\| \| \|\ \ \| \| \| \|/ \| \| \|/\|	update pt-br transation
\| \| \| *	update pt-br transation	Alexandre Hannud Abdo	2015-05-11	2	-6099/+7075
\| \| \|/
\| * \|	Merge branch 'master' of https://github.com/redmatrix/hubzilla into merger	redmatrix	2015-05-10	0	-0/+0
\| \|\ \
\| \| * \	Merge pull request #1 from anaqreon/patch-1	redmatrix	2015-05-11	1	-1/+1
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	Misspelling
\| \| \| * \|	Misspelling	anaqreon	2015-05-10	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	correcting upstream	redmatrix	2015-05-10	2	-2/+2
\| \|/ / /
\| * \| \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-10	14	-126/+186
\| \|\ \ \ \| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mod/mitem.php view/de/messages.po view/de/strings.php
\| \| * \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-05-10	18	-5474/+5835
\| \| \|\ \
\| \| \| * \|	uid > channel id to make submenus visible for observers	Mario Vavti	2015-05-10	1	-3/+3
\| \| \| \| \|
\| \| \| * \|	provide drop down submenu suggestions in edit mode	Mario Vavti	2015-05-10	2	-3/+6
\| \| \| \| \|
\| \| \| * \|	copy/paste typo	Mario Vavti	2015-05-10	1	-1/+1
\| \| \| \| \|
\| \| \| * \|	provide ability to create submenus	Mario Vavti	2015-05-10	8	-11/+47
\| \| \| \| \|
\| \| \| * \|	Merge pull request #318 from zzottel/master	zzottel	2015-05-08	2	-5226/+5453
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	update to German strings
\| \| \| \| * \|	update to German strings	zottel	2015-05-08	2	-5226/+5453
\| \| \| \|/ /
\| \| * \| \|	rev update	redmatrix	2015-05-10	3	-47/+63
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-07	8	-232/+301
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| / \| \| \|_\|/ \| \|/\| \|
\| \| * \|	provide wrap variable for comanche menus	Mario Vavti	2015-05-07	3	-5/+23
\| \| \| \|
\| \| * \|	Update Dutch	jeroenpraat	2015-05-07	2	-221/+232
\| \| \| \|
\| \| * \|	provide a possibility to include js/css libs	Mario Vavti	2015-05-07	1	-0/+40
\| \| \| \|
\| \| * \|	adjust icon size	Mario Vavti	2015-05-07	3	-6/+6
\| \| \| \|
\| * \| \|	missed one...	redmatrix	2015-05-06	3	-2/+4
\| \| \| \|
\| * \| \|	forgot to save	redmatrix	2015-05-06	1	-2/+0
\| \| \| \|
\| * \| \|	Hopefully this will make item_cache the default	redmatrix	2015-05-06	2	-14/+54
\| \| \| \|
\| * \| \|	change notification colour	redmatrix	2015-05-06	1	-1/+1
\| \| \| \|
\| * \| \|	convert ITEM_WALL from bitfield to standalone	redmatrix	2015-05-06	29	-90/+98
\| \| \| \|
\| * \| \|	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-05-06	10	-206/+274
\| \|\\| \|
\| \| * \|	comanche doco	Mario Vavti	2015-05-06	2	-2/+10
\| \| \| \|
\| \| * \|	avoid double slash after editing layout	Mario Vavti	2015-05-06	1	-1/+1
\| \| \| \|