Commit graph

1305 commits

Author SHA1 Message Date
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 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
antil0pa 7996805a22 chane of color 2020-01-27 21:57:29 +01:00
antilopa ffa980968b Merge branch 'reward' of Disroot/Website into master 2020-01-27 20:41:46 +00:00
antil0pa fd0069c895 type setting 2020-01-27 21:40:05 +01:00
meaz 370ef3d8e1 Merge branch 'WEBSITE_ES_Update' of Disroot/Website into master 2020-01-25 07:47:43 +00:00
shadowsword 505d934c14 Blogpost "Demise-Diaspora" translation to german 2020-01-24 22:49:52 +01:00
Fede.- 51d0784d54 Spanish website & Blogpost translations updates + Few minor English typos 2020-01-24 16:28:42 -03:00
antil0pa e420b04e18 changed text to markdown 2020-01-22 22:27:09 +01:00
meaz 7c498e9599 add reward informations on home page 2020-01-22 14:00:56 +01:00
meaz 6ed8ab61b0 add id sections so that we can use anchor with links 2020-01-22 14:00:29 +01:00
meaz 7d5c96fd7f Merge branch 'IT-translation_gitea' of Disroot/Website into master 2020-01-22 12:36:14 +00:00
shadowsword 8e94cfc570 gitea service translation to german 2020-01-21 22:49:00 +01:00
l3o 50eea50cea IT-translation Last check, ready to merge 2020-01-21 17:02:28 +01:00
l3o 5a80f77df9 IT translation git pages 2020-01-21 16:59:44 +01:00
meaz 55b0119472 Merge branch 'IT-blog-new-road-map' of Disroot/Website into master 2020-01-21 14:44:26 +00:00
l3o 806d6966a6 IT translation Last mistake fixed. Ready to merge 2020-01-21 14:37:50 +01:00
l3o bf0695083b It translation - fixed small language mistake 2020-01-21 14:31:11 +01:00
l3o 306e34a928 IT translation new road map finished 2020-01-21 14:28:20 +01:00
antilopa 11afac4500 Merge branch 'gitea_french' of Disroot/Website into master 2020-01-21 08:50:53 +00:00