Commit graph

1335 commits

Author SHA1 Message Date
85ce0333d6 French translation of new services 2020-03-31 10:22:14 +02:00
35ccda599a French translation of covid page 2020-03-31 10:22:04 +02:00
e01c1b27de fix a link + add cryptpad 2020-03-30 19:29:03 +02:00
4618730c3d Merge branch 'WEBSITE_SP_Updates' of https://git.disroot.org/Disroot/website into WEBSITE_SP_Updates 2020-03-30 10:00:24 -03:00
6f7ec4c5b1 Spanish updates of website pages + Fixed Mumble address on Eng version
Rebase from master to SP branch
A
D
C
Rebase of master into SP branch#
2020-03-30 09:32:41 -03:00
20f8dbc9e8 Merge branch 'master' into covid_19_kit 2020-03-30 14:09:49 +02:00
a686e138cb reorganize cvid-19 tiles 2020-03-30 14:05:16 +02:00
bbce6eb31f Spanish updates of website pages + Fixed Mumble address on Eng version 2020-03-30 08:57:59 -03:00
ed29c3af05 fix bg color 2020-03-30 11:55:19 +02:00
776e434c0b fix links 2020-03-30 11:36:11 +02:00
9637f4acf1 add info about cryptpad project 2020-03-30 11:36:05 +02:00
81d278d4f8 add service tile for games 2020-03-30 11:22:54 +02:00
abaa9e8e30 Changed name in menu for covid19 kit page 2020-03-30 10:15:53 +02:00
55c52dfa1c remove forgotten test badge 2020-03-29 07:56:20 +02:00
053fd18f8d add Experimental badge on mumble and cryptpad tiles 2020-03-29 07:44:20 +02:00
d72a9a13a3 add mumble and cryptpad an home page list of services 2020-03-29 07:43:37 +02:00
e937b779f3 Merge pull request 'quarantine_services' (#122) from quarantine_services into master
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2020-03-28 21:36:03 +00:00
95b2ab41d3 corrects a typo + remove text already written on another page 2020-03-28 06:40:35 +01:00
81d840e766 small typos 2020-03-28 06:40:08 +01:00
95b339f0fb change image for mumble 2020-03-28 06:30:18 +01:00
9b15a22a7d Change to "Disroot Covid-19 Kit" 2020-03-28 06:24:43 +01:00
08db9bd204 Correct a typo 2020-03-28 06:24:16 +01:00
fac163e1c7 cryptpad page. 2020-03-27 21:24:42 +01:00
3332786a3a Overview Jan-Feb 2020 2020-03-27 11:15:18 +01:00
92808e771b Adjusted the DNS record settings as pointed out in
Ticket# 884328
2020-03-26 17:28:58 +01:00
c54de515c7 Merge pull request 'change "e2e issue with NC" text' (#116) from NCe2e into master 2020-03-26 14:04:30 +00:00
3e4ea957d5 Minor fix on text 2020-03-25 22:02:15 +00:00
88f77f5d1a add quaratantine page 2020-03-25 22:45:28 +01:00
4ef451d747 add mumble service 2020-03-25 22:45:15 +01:00
1fc619d417 typo in quarantine 2020-03-20 15:27:30 +01:00
094a881996 Quarantine with disroot 2020-03-20 10:58:16 +01:00
e158b45c3f Actualizar 'pages/07.blog/this_year_couldnt_become_any_crazier/item.es.md' 2020-03-16 20:18:43 +00:00
de6afbc7d6 SP translation of blogpost + git links added + EN typos and style fixes 2020-03-16 16:40:04 -03:00
e7d8072c76 Merge pull request 'add blog post text + img' (#111) from 2020_sprint into master 2020-03-16 17:05:42 +00:00
77bcd89e94 changed the text a little; removed screenshots form nextcloud;new pic. 2020-03-16 17:57:48 +01:00
ba7822e3ab add gitignore to tos directory 2020-03-12 13:16:36 +01:00
09eb9af595 fixed tos to pull content from tos repo 2020-03-12 13:12:10 +01:00
2162ec2d10 update text 2020-03-11 22:08:06 +01:00
e8d0311f0d top anchor in title 2020-03-11 11:59:24 +01:00
3ebbde1981 added title 2020-03-11 11:56:56 +01:00
fb3977988a Website adjustments for new privacy policy branch 2020-03-11 11:31:13 +01:00
f932c8929b change e2e issue with NC text 2020-03-09 18:10:51 +01:00
261e3f953d update blog post with NC 18 + coz we're not in february anymore! 2020-03-08 11:56:28 +01:00
7c3bc3148a remove diaspora page form the website 2020-03-06 00:00:39 +01:00
c64b364cd6 Some minor translations updates on FAQ + Donations&DisApp on frontpage 2020-02-29 16:55:58 -03:00
46d69205b9 Merge branch 'disapp' of Disroot/Website into master 2020-02-16 12:31:13 +00:00
51e873b1e4 cosmetics 2020-02-16 13:25:22 +01:00
1db029fe1c calls translated to german
+some minor fixes
2020-02-09 22:47:01 +01:00
f7bddea8aa Revert "Merge branch 'privacy_statement_v1_2' of Disroot/Website into master"
This reverts commit 026fc6e310, reversing
changes made to f398a932ac.

Rolling back to previous stage
2020-02-09 15:41:35 -03:00
bb11564a2b add blog post text + img 2020-02-09 19:17:58 +01:00