Commit Graph

1562 Commits

Author SHA1 Message Date
muppeth 909c132d46 small change 2020-04-04 20:35:47 +02:00
muppeth 68ad5ca504 change wrong filename 2020-04-04 20:31:27 +02:00
meaz c52edfa99d Merge pull request 'remove new badge from games tile' (#134) from remove_new into master 2020-04-01 10:14:13 +00:00
antil0pa fcb4550c3c remove new badge from games tile 2020-04-01 12:07:13 +02:00
meaz 4a2adf1d4b Merge pull request 'Kit: Spanish update for English fixes' (#129) from WEBSITE_SP_Fixes into master 2020-04-01 04:38:58 +00:00
meaz fd8238a098 Merge pull request 'WEBSITE_Blogpost_ES' (#133) from WEBSITE_Blogpost_ES into master 2020-04-01 04:36:14 +00:00
Fede.- 86504d8914 Fixed typo
Fixed a typo
2020-03-31 20:48:06 +00:00
Fede.- f20283947f Spanish translation of blogpost 2020-03-31 17:40:22 -03:00
Fede.- 494f770c5a Merge pull request 'covid19 kit blog post.' (#132) from covid19-kit into master
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2020-03-31 20:29:28 +00:00
muppeth 8f29354e00 covid19 kit blog post. 2020-03-31 22:22:06 +02:00
Fede.- e6831f21a7 Merge branch 'WEBSITE_SP_Fixes' of https://git.disroot.org/Disroot/website into WEBSITE_SP_Fixes 2020-03-31 09:08:39 -03:00
Fede.- 6a47de815a Spanish fixes 2020-03-31 09:07:30 -03:00
Fede.- 3a811c34f9 Spanish fixes 2020-03-31 09:06:32 -03:00
Fede.- 976bb9d7d7 Kit: Spanish update for English fixes 2020-03-31 09:05:53 -03:00
Fede.- ce02c8d8b2 Spanish fixes 2020-03-31 08:58:49 -03:00
Fede.- e87f448f26 Merge pull request 'french_covid' (#130) from french_covid into master 2020-03-31 11:53:02 +00:00
meaz 3fe3a223a3 French translation of cryptpad service page 2020-03-31 10:46:41 +02:00
meaz 384e6c7a84 remove mention of email on cryptpad 2020-03-31 10:41:59 +02:00
meaz 0a15232182 French translation of Mumble service page 2020-03-31 10:37:44 +02:00
meaz 8197b4e755 remove a space character 2020-03-31 10:29:14 +02:00
meaz 6f39a3f3ae franch translation of Quarantine page 2020-03-31 10:27:50 +02:00
meaz af6f0a8b49 added new services in other languages 2020-03-31 10:22:26 +02:00
meaz 85ce0333d6 French translation of new services 2020-03-31 10:22:14 +02:00
meaz 35ccda599a French translation of covid page 2020-03-31 10:22:04 +02:00
Fede.- 4f6d6ddbfb Games links fixed 2020-03-31 03:05:37 -03:00
Fede.- dc4ba43bdc Kit: Spanish update for English fixes 2020-03-31 02:55:26 -03:00
maryjane 9a08582192 Merge pull request 'fix a link + add cryptpad' (#128) from fix_covid19 into master
Adds cryptad to the COVID19 page and corrects a link in the same page in the Game section
2020-03-30 17:34:35 +00:00
meaz e01c1b27de fix a link + add cryptpad 2020-03-30 19:29:03 +02:00
meaz 3af93f5e3d Merge pull request 'Spanish updates of website pages + Fixed Mumble address on Eng version' (#127) from WEBSITE_SP_Updates into master 2020-03-30 15:52:55 +00:00
Fede.- 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
Fede.- 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
antilopa defdd2200f Merge pull request 'Changed name in menu for covid19 kit page' (#125) from covid_19_kit into master 2020-03-30 12:13:34 +00:00
antil0pa 20f8dbc9e8 Merge branch 'master' into covid_19_kit 2020-03-30 14:09:49 +02:00
antil0pa 5c818087e6 Merge branch 'covid_19_kit' of git.disroot.org:Disroot/Website into covid_19_kit 2020-03-30 14:05:18 +02:00
antil0pa a686e138cb reorganize cvid-19 tiles 2020-03-30 14:05:16 +02:00
antil0pa 903bf28d1c reorganize cvid-19 tiles 2020-03-30 14:01:20 +02:00
Fede.- bbce6eb31f Spanish updates of website pages + Fixed Mumble address on Eng version 2020-03-30 08:57:59 -03:00
maryjane a1f107d7e7 Merge pull request 'new_service_correction' (#126) from new_service_correction into master
Fixing link and adding information
2020-03-30 09:56:35 +00:00
meaz ed29c3af05 fix bg color 2020-03-30 11:55:19 +02:00
meaz 776e434c0b fix links 2020-03-30 11:36:11 +02:00
meaz 9637f4acf1 add info about cryptpad project 2020-03-30 11:36:05 +02:00
meaz 81d278d4f8 add service tile for games 2020-03-30 11:22:54 +02:00
meaz 94ca5da3d6 Merge pull request 'home_services' (#124) from home_services into master
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2020-03-30 08:44:37 +00:00
antil0pa abaa9e8e30 Changed name in menu for covid19 kit page 2020-03-30 10:15:53 +02:00
meaz 55c52dfa1c remove forgotten test badge 2020-03-29 07:56:20 +02:00
meaz 053fd18f8d add Experimental badge on mumble and cryptpad tiles 2020-03-29 07:44:20 +02:00
meaz d72a9a13a3 add mumble and cryptpad an home page list of services 2020-03-29 07:43:37 +02:00
Fede.- 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
meaz 95b2ab41d3 corrects a typo + remove text already written on another page 2020-03-28 06:40:35 +01:00
meaz 81d840e766 small typos 2020-03-28 06:40:08 +01:00