 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 |
 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 |
|
meaz
|
95b339f0fb
|
change image for mumble
|
2020-03-28 06:30:18 +01:00 |
|
meaz
|
9b15a22a7d
|
Change to "Disroot Covid-19 Kit"
|
2020-03-28 06:24:43 +01:00 |
|
meaz
|
08db9bd204
|
Correct a typo
|
2020-03-28 06:24:16 +01:00 |
 muppeth
|
fac163e1c7
|
cryptpad page.
|
2020-03-27 21:24:42 +01:00 |
|
meaz
|
b6b0c86511
|
Merge pull request 'financial_overview_JM2020' (#123) from financial_overview_JM2020 into master
|
2020-03-27 10:20:55 +00:00 |
|
antil0pa
|
3332786a3a
|
Overview Jan-Feb 2020
|
2020-03-27 11:15:18 +01:00 |
|
antil0pa
|
92808e771b
|
Adjusted the DNS record settings as pointed out in
Ticket# 884328
|
2020-03-26 17:28:58 +01:00 |
|
Fede.-
|
c54de515c7
|
Merge pull request 'change "e2e issue with NC" text' (#116) from NCe2e into master
|
2020-03-26 14:04:30 +00:00 |
|
Fede.-
|
3e4ea957d5
|
Minor fix on text
|
2020-03-25 22:02:15 +00:00 |
|
meaz
|
88f77f5d1a
|
add quaratantine page
|
2020-03-25 22:45:28 +01:00 |
|
meaz
|
4ef451d747
|
add mumble service
|
2020-03-25 22:45:15 +01:00 |
|
muppeth
|
1fc619d417
|
typo in quarantine
|
2020-03-20 15:27:30 +01:00 |
|
antilopa
|
a125d97bd0
|
Merge pull request 'Quarantine with disroot' (#120) from quarantine into master
|
2020-03-20 10:03:11 +00:00 |
|
muppeth
|
094a881996
|
Quarantine with disroot
|
2020-03-20 10:58:16 +01:00 |
|
meaz
|
864a20e54e
|
Merge pull request 'SP translation of blogpost + git links added + EN typos and style fixes' (#119) from WEBSITE_Blogpost_ES into master
|
2020-03-17 08:58:48 +00:00 |
|
Fede.-
|
e158b45c3f
|
Actualizar 'pages/07.blog/this_year_couldnt_become_any_crazier/item.es.md'
|
2020-03-16 20:18:43 +00:00 |
|
Fede.-
|
de6afbc7d6
|
SP translation of blogpost + git links added + EN typos and style fixes
|
2020-03-16 16:40:04 -03:00 |
|
antilopa
|
e7d8072c76
|
Merge pull request 'add blog post text + img' (#111) from 2020_sprint into master
|
2020-03-16 17:05:42 +00:00 |
|
Muppeth
|
77bcd89e94
|
changed the text a little; removed screenshots form nextcloud;new pic.
|
2020-03-16 17:57:48 +01:00 |
|
antilopa
|
6023fe5a36
|
Merge pull request 'Website adjustments for new privacy policy branch' (#118) from privacy_policy into master
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: meaz <meaz@no-reply@disroot.org>
|
2020-03-13 10:56:13 +00:00 |
|
antil0pa
|
ba7822e3ab
|
add gitignore to tos directory
|
2020-03-12 13:16:36 +01:00 |
|
antil0pa
|
4031ce72e9
|
Merge branch 'privacy_policy' of git.disroot.org:Disroot/Website into privacy_policy
|
2020-03-12 13:12:24 +01:00 |