fleg
/
DisrootWebsite
forked from Disroot/Website
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,658 Commits 29 Branches 0 Tags 221 MiB
Commit Graph

1658 Commits

Author SHA1 Message Date
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
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
meaz c3dda6dd6c update vagrant with privacy statement repo 2020-03-11 14:06:01 +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
meaz 8191275e83 Merge branch 'kill_diaspora' of Disroot/Website into master 2020-03-06 10:06:21 +00:00
Muppeth 7c3bc3148a remove diaspora page form the website 2020-03-06 00:00:39 +01:00
meaz d413a719be Merge branch 'WEBSITE_FAQ_FRONT_ES_Updates_Fixes' of Disroot/Website into master 2020-02-29 20:14:38 +00:00
Fede.- c64b364cd6 Some minor translations updates on FAQ + Donations&DisApp on frontpage 2020-02-29 16:55:58 -03:00
antilopa 3d07016afa Merge branch 'postfix_issue' of Disroot/Website into master 2020-02-27 21:11:55 +00:00
meaz f3ced696d1 Fix problem in vagrant file with postfix configuration screen 2020-02-18 09:56:48 +01: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
meaz 0c798989cf Merge branch 'WEBSITE_services_calls_de' of Disroot/Website into master 2020-02-10 06:46:28 +00: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
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