acetone/Website
1
0
Fork 0
forked from Disroot/Website
Code Issues Pull requests Releases Wiki Activity
1665 commits 17 branches 0 tags 120 MiB
Commit graph

1423 commits

Author SHA1 Message Date
antil0pa e5812374fb small adjustments to text 2020-07-06 14:07:21 +02:00
meaz c74b7f3d92 readd deleted image! 2020-06-27 15:39:34 +02:00
meaz c85871353e create goals tiles + change blocks order 2020-06-27 15:35:21 +02:00
antil0pa fe85f0992c finacial overview till may 2020 2020-06-05 16:58:52 +02:00
antilopa 6a84a4f969 Merge pull request 'improve info about NC key resetting' (#131) from Faq into master 
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
 2020-05-27 10:54:15 +00:00
antilopa 0b065b5a0d Merge pull request 'Add mumble clients in En and Fr' (#141) from mumble_clients into master 
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
 2020-05-27 10:52:50 +00:00
l3o 26882c74ff Translated blog article: Roundcube (#146) 
Translated blog article: Roundcube

Co-authored-by: l3o <l3o@disroot.org>
 2020-05-21 12:50:38 +00:00
Fede.- 243287b995 Roundcube announcement 2020-05-20 01:31:05 -03:00
antil0pa d26c785cb3 updated git settings 2020-05-08 11:32:29 +02:00
antil0pa f95f7bf6b1 Update donation address 2020-05-08 11:26:30 +02:00
meaz 4aa28acc1f Add mumble clients in En and Fr 2020-04-21 07:09:56 +02:00
l3o 887dbc1376 IT traduction - blog flisol 2020-04-16 14:42:06 +02:00
meaz 9e4095f4fc Merge pull request 'Post about Flisol' (#139) from flisol_blogpost into master 2020-04-14 06:47:23 +00:00
Fede.- fa042ff879 Post about Flisol 2020-04-14 02:40:53 -03:00
antilopa bb30628f32 Merge pull request 'fix wrong closing </a>' (#138) from faq into master 2020-04-13 12:25:23 +00:00
meaz 13b1651797 fix wrong closing </a> 2020-04-08 12:10:22 +02:00
l3o 408a9b26d2 IT traduction covid19 2020-04-05 21:11:36 +02:00
muppeth 2260f8a639 fix de (#136) 
fix de

Co-authored-by: muppeth <muppeth@disroot.org>
 2020-04-04 18:45:48 +00:00
muppeth 21c11f74ca remove de from pastebin (#135) 
remove de from pastebin

Co-authored-by: muppeth <muppeth@disroot.org>
 2020-04-04 18:43:30 +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
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
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
meaz 9360c7d7a5 improve info about NC key resetting 2020-03-31 12:43:19 +02: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
meaz e01c1b27de fix a link + add cryptpad 2020-03-30 19:29:03 +02: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
antil0pa 20f8dbc9e8 Merge branch 'master' into covid_19_kit 2020-03-30 14:09:49 +02:00
antil0pa a686e138cb reorganize cvid-19 tiles 2020-03-30 14:05:16 +02:00
Fede.- bbce6eb31f Spanish updates of website pages + Fixed Mumble address on Eng version 2020-03-30 08:57:59 -03: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
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
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
muppeth 094a881996 Quarantine with disroot 2020-03-20 10:58:16 +01: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
antil0pa ba7822e3ab add gitignore to tos directory 2020-03-12 13:16:36 +01:00
antil0pa 09eb9af595 fixed tos to pull content from tos repo 2020-03-12 13:12:10 +01:00
meaz 2162ec2d10 update text 2020-03-11 22:08:06 +01:00
antil0pa e8d0311f0d top anchor in title 2020-03-11 11:59:24 +01:00
antil0pa 3ebbde1981 added title 2020-03-11 11:56:56 +01:00
antil0pa fb3977988a Website adjustments for new privacy policy branch 2020-03-11 11:31:13 +01:00
meaz f932c8929b change e2e issue with NC text 2020-03-09 18:10:51 +01:00
meaz 261e3f953d update blog post with NC 18 + coz we're not in february anymore! 2020-03-08 11:56:28 +01:00
Muppeth 7c3bc3148a remove diaspora page form the website 2020-03-06 00:00:39 +01:00
Fede.- c64b364cd6 Some minor translations updates on FAQ + Donations&DisApp on frontpage 2020-02-29 16:55:58 -03:00
antilopa 46d69205b9 Merge branch 'disapp' of Disroot/Website into master 2020-02-16 12:31:13 +00:00
antil0pa 51e873b1e4 cosmetics 2020-02-16 13:25:22 +01:00
shadowsword 1db029fe1c calls translated to german 
+some minor fixes
 2020-02-09 22:47:01 +01:00
Fede.- 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
meaz bb11564a2b add blog post text + img 2020-02-09 19:17:58 +01:00
meaz b32cb3addc ad bkground color to fix displaying 2020-02-09 12:52:30 +01:00
meaz bcc5da5892 add disapp section on home page + fdroid icon 2020-02-09 12:50:32 +01:00
meaz 1b4fdee124 change bg color + add disapp section 2020-02-09 12:49:21 +01:00
Fede.- e7f7bdbfc6 Update of Privacy Statement and Terms of use + Spanish translations of them 2020-02-07 02:38:21 -03:00
meaz f398a932ac update xmpp link with xmpp:room?join on contact page 2020-02-05 17:47:23 +01:00
shadowsword 571e1c86cc german translation of email delimiters section 
some minor fixes
 2020-02-04 22:17:53 +01:00
Fede.- 80dd95c1a9 Merge branch 'internat_donate' of Disroot/Website into master 2020-02-03 21:23:21 +00:00
l3o 322d764173 Email extra storage translation 2020-02-03 15:31:36 +01:00
meaz 4176082cc6 add more info for delimiters in EN + other languages 2020-02-02 11:37:32 +01:00
meaz 1b47d1e467 internatization of home page / donate section 2020-02-02 11:10:42 +01:00
antil0pa a7bd33ae11 corrected error in expenses graph 2020-01-29 11:24:29 +01:00
antil0pa 97624151be updated overview for 2019 2020-01-27 22:33:57 +01:00