Commit graph

1169 commits

Author SHA1 Message Date
3bbbae88f9 one last fix 2019-10-31 20:24:13 +01:00
42ba3873d1 fixed conflict 2019-10-31 20:22:09 +01:00
4350995d92 Merge branch 'master' into new_home 2019-10-31 20:19:15 +01:00
427f5d4c32 fixed broken link to xmpp webchat 2019-10-31 13:46:47 +01:00
c45c72ff6c Prepare files of the new home page for translations + somes fixes 2019-10-31 09:33:41 +01:00
e913d491af change ' to " for compatibility with languages that use ' 2019-10-31 09:16:44 +01:00
ce2c21be38 removed some line breaks 2019-10-30 23:28:34 +01:00
3471c0afb1 Merge branch 'new_home' of Disroot/Website into master 2019-10-30 22:01:27 +00:00
a5e2c7c317 Merge branch 'account-form-fr' of Disroot/Website into master 2019-10-30 21:56:13 +00:00
d8227045b8 Update 'pages/forms/domain-linking-form/form.en.md'
remove an extra <br>
2019-10-30 20:44:15 +00:00
694efe1cc3 fixed layout of donations section 2019-10-30 21:38:47 +01:00
0ad5f841cd Update 'pages/forms/domain-linking-form/form.en.md'
Add a </p> to fix displaying issue
2019-10-30 20:38:36 +00:00
60ca96a6d3 Merge branch 'domain-linking-fr' of Disroot/Website into master 2019-10-30 20:17:30 +00:00
4f4bae2c0b Merge branch 'French-mission' of Disroot/Website into master 2019-10-29 02:32:51 +00:00
47d5575693 Merge branch 'WEBSITE_statement_contact_ger' of Disroot/Website into master 2019-10-27 13:30:06 +00:00
fc30a4aedd update account registration form in french 2019-10-27 09:20:12 +01:00
a92accdc12 update domain-linking form (french) 2019-10-27 08:01:15 +01:00
91cfe5b46d recent changes translated to german 2019-10-27 00:03:49 +02:00
46dc9ce53e update french for update of the paragraph B 2019-10-26 11:24:36 +02:00
0dd3cd16d4 Merge branch 'statement_fix' of Disroot/Website into master 2019-10-26 09:20:20 +00:00
6d9f0858d4 Update of the paragraph B. Grants or subsidies 2019-10-25 17:59:56 -03:00
161c20192f update services tiles texts 2019-10-25 22:06:32 +02:00
88826dd589 remove all state pages, as there is a icon now 2019-10-25 22:02:49 +02:00
a9f88a561b Change about us to just about 2019-10-25 07:43:58 +02:00
d4f0120e10 Fix "us" not being displayed in menu 2019-10-24 19:16:29 +02:00
fe96b52cc4 fix redirection to services 2019-10-24 11:48:18 +02:00
fea7a1a5f6 added spacing and custom button tets for services 2019-10-22 23:00:38 +02:00
b5b7453256 Merge branch 'extra_storage' of Disroot/Website into master 2019-10-21 00:29:48 +00:00
d2e8cc4157 Actualizar 'pages/forms/extra-storage-space/form.en.md' 2019-10-21 00:25:43 +00:00
316acafa94 Merge branch 'extra_storage' of Disroot/Website into master 2019-10-20 12:45:01 +00:00
52b5733b52 Merge branch 'WEBSITE_recent_changes_ger' of Disroot/Website into master 2019-10-20 12:44:37 +00:00
bace146840 Merge branch 'WEBSITE_blog_ger' of Disroot/Website into master 2019-10-20 12:44:18 +00:00
259cb5ffcc translated the recent changes to ger
minor corrections
2019-10-20 01:12:14 +02:00
69b93bac68 Translated recent blog post to german
to show, that future blog posts will also be available in german
2019-10-20 00:02:40 +02:00
e87af29d36 Merge branch 'new_home' of https://git.disroot.org/Disroot/Website into new_home 2019-10-19 16:48:47 +02:00
bfa8c3af90 update service section of home 2019-10-19 16:27:44 +02:00
f1ad841807 reverted back to original service page and replaced icon variable in email and cloud. 2019-10-18 13:48:12 +02:00
2ffb34bc22 Merge branch 'WEBSITE_mission_statement_ger' of Disroot/Website into master 2019-10-17 22:07:21 +00:00
bd4091181c trans mission statement to ger 2019-10-16 22:19:37 +02:00
c316a09f72 domain linking form (#5) 2019-10-16 17:14:59 +00:00
e8c4539dd0 update of services, signup ad donate sections 2019-10-16 18:56:01 +02:00
7fb733b746 added contact support for custom options. 2019-10-16 16:37:00 +02:00
638902e425 Account registration (#3) 2019-10-16 14:28:54 +00:00
3baec668fc Merge branch 'contact' of Disroot/Website into master 2019-10-16 12:50:09 +00:00
6cd447abfa remove a br in english version 2019-10-16 06:35:30 +02:00
0ec96e60b3 update of home 2019-10-16 06:33:53 +02:00
56e54b33af Merge branch 'contact' of Disroot/Website into master 2019-10-15 19:37:42 +00:00
c9a32e3a7e remove div and br in all languages 2019-10-15 13:25:39 +02:00
50971fa864 Rmeove div and br from _link 2019-10-13 23:24:32 +02:00
a50f1b7f01 remove div from _contact 2019-10-13 23:23:05 +02:00