Commit Graph

1468 Commits

Author SHA1 Message Date
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 026fc6e310 Merge branch 'privacy_statement_v1_2' of Disroot/Website into master 2020-02-08 21:22:55 +00: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
Fede.- 68fa66dc20 Merge branch 'WEBSITE_email_de' of Disroot/Website into master 2020-02-05 11:26:15 +00: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
meaz 319694df68 Merge branch 'IT-email_storage' of Disroot/Website into master 2020-02-03 15:50:19 +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
meaz 78a111fea9 update links in vagrant readme 2020-02-02 11:09:27 +01:00
meaz c0c9ea93cd update website repo address 2020-01-31 11:33:34 +01:00
antil0pa a7bd33ae11 corrected error in expenses graph 2020-01-29 11:24:29 +01:00
Fede.- 8b5e3c70f8 Merge branch 'financial_overview_2019' of Disroot/Website into master
Financial Overview Update
2020-01-27 22:35:55 +00: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
meaz 4419c1e3e2 Merge branch 'WEBSITE_blog_de' of Disroot/Website into master 2020-01-25 07:15:27 +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
meaz 56169f0405 Merge branch 'WEBSITE_service_ger' of Disroot/Website into master 2020-01-22 12:35:12 +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
l3o c719cdd53d It translation continued 2020-01-20 21:41:50 +01:00
l3o a39a9291f1 Start IT blog translation 2020-01-20 15:29:25 +01:00
meaz 1cf86116ee fix issue with jitsi icon on es, fr and de version 2020-01-20 14:46:54 +01:00
meaz 1e92d1d976 Add git tile to other languages 2020-01-20 14:21:11 +01:00
meaz 514981ae57 French translation of gitea service page 2020-01-20 14:20:11 +01:00
antilopa 44c07eb76a Merge branch 'gitea' of Disroot/Website into master 2020-01-20 11:38:09 +00:00
Muppeth 4357284855 Quick Fix - removed additional h1 in the beggining of the texts 2020-01-20 11:42:48 +01:00
meaz 463cd78193 blog_posts_2020 (#95) 2020-01-20 10:32:16 +00:00
antil0pa ffa0c03b78 removed quote marks 2020-01-20 08:41:21 +01:00
meaz fd9a7e3174 add git service tile in home page 2020-01-19 11:30:57 +01:00
antilopa 11b2c47c08 Merge branch 'contact_pgp' of Disroot/Website into master 2020-01-15 14:41:16 +00:00
meaz bc7cd42fa3 remove one key server + fix key server link not working 2020-01-12 19:09:49 +01:00
meaz 585387500d Create gitea service page 2020-01-12 18:25:58 +01:00
meaz faa7baf0a9 fix bgcolor on tos 2020-01-12 08:11:15 +01:00