Commit graph

23 commits

Author SHA1 Message Date
redmatrix
aa58f68bfd Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	view/it/messages.po
	view/it/strings.php
2015-07-03 14:59:04 -07:00
zottel
8042ae9fe8 update German main help file 2015-07-03 11:01:26 +02:00
redmatrix
5f3edabd45 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	doc/de/features.bb
	view/de/messages.po
	view/de/strings.php
2015-06-24 16:34:52 -07:00
zottel
38302051f2 update German help files 2015-06-24 16:54:17 +02:00
redmatrix
833098e346 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	include/items.php
	mod/item.php
2015-06-23 17:30:35 -07:00
Mario Vavti
a4775aab9b Bring /help in line with the rest of the app 2015-06-22 14:02:14 +02:00
redmatrix
51b89f0ed8 Merge branch 'master' of https://github.com/redmatrix/redmatrix
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
2015-05-13 19:23:13 -07:00
redmatrix
364025e550 remove project name dependency from most of the doc files to ease project merging, there are going to be some edge cases requiring manual tweaking as most of this was done by script. 2015-05-13 17:59:45 -07:00
redmatrix
a3c37f1458 first pass name change 2015-05-05 03:56:10 -07:00
zottel
0d3a8b2d94 update German help files to current English contents 2015-02-27 13:59:56 +01:00
zottel
1e8019c806 remove extra blank line 2015-01-08 11:46:14 +01:00
zottel
9467208f78 update German main help file 2015-01-08 11:44:04 +01:00
zottel
22340d105b update to Germanmain help file 2014-11-24 11:56:15 +01:00
zottel
add493ef4d update to German help files 2014-11-07 22:46:39 +01:00
zottel
d98fcdf3fb update to German help 2014-10-24 17:08:50 +02:00
zottel
ccc97ffdc0 update German main help page 2014-09-23 16:35:30 +02:00
zottel
ecf8b70794 updated German main.bb doco file 2014-08-20 14:44:55 +02:00
zottel
08bee2a03a update German main help page 2014-08-08 14:28:02 +02:00
zottel
dd1bf6e4c2 added link to privacy help file 2014-07-11 16:53:49 +02:00
zottel
3654093dc0 update German docs 2014-07-02 14:50:03 +02:00
zottel
8ae986b9c6 correct bbcode link in German docs 2014-02-28 14:00:50 +01:00
zottel
6c0fdbebeb some new German files 2014-02-27 18:35:03 +01:00
zottel
77e087a380 convert existing German help files to BBCode 2014-02-27 15:01:44 +01:00