Disroot/Website
Disroot
/
Website
14
15
Fork 14
Code Pull Requests 3 Releases Activity
1,895 Commits 18 Branches 0 Tags 198 MiB
Commit Graph

1555 Commits

Author SHA1 Message Date
l3o 9f565a2be2 Start translation it 2020-09-14 21:18:09 +02:00
Fede.- beed451478 Header image fix 2020-09-14 09:17:18 -03:00
Fede.- d8c0379eec Fixed header image 2020-09-14 11:55:28 +00:00
Fede.- fa6482e9f3 NC Deck blogpost by AvJoe 2020-09-12 12:32:27 -03:00
l3o e678872a50 Blog it-translation first half of 2020 and disroot is 5 2020-08-10 10:38:43 +02:00
meaz 78de38128c Merge branch 'master' into green_badge 2020-08-09 09:01:08 +00:00
meaz d512097002 move from home to about page + change background color 2020-08-09 10:58:53 +02:00
Fede.- a52e8c96e8 Website: small updates and fixes plus Blogpost translations 2020-08-09 03:29:19 -03:00
muppeth 264271188e Merge branch 'master' into muppdev 2020-08-07 16:11:23 +00:00
muppeth c88fd9b486 uploaded smaller image of sunflowers 2020-08-07 18:06:04 +02:00
muppeth 726c57bd77 blogs - half year 2020;disroot is 5 2020-08-07 17:59:57 +02:00
antil0pa 7ccf905e52 updated report 2020-08-07 09:28:40 +02:00
meaz 664c5028c2 Merge branch 'master' into green_badge 2020-08-07 06:25:34 +00:00
antil0pa 244ef9a6c8 2019 yearly report 2020-08-06 15:01:27 +02:00
antilopa 0a536ee4dd Merge pull request 'xmppbridges' (#151) from xmppbridges into master 
Reviewed-on: #151
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
 2020-08-06 12:34:32 +00:00
antil0pa b350419420 new conversations picture 2020-08-06 14:34:08 +02:00
antil0pa 8d6ac56ddf fixed a typo, added a hyperlink. 2020-08-06 14:20:32 +02:00
antilopa 90288ab4f6 Merge branch 'master' into green_badge 2020-08-06 12:16:43 +00:00
antilopa 3fe6e0f156 Merge branch 'master' into goals 2020-08-06 12:07:16 +00:00
lampenit e7a0dff300 Fixed some spelling mistakes 2020-07-20 14:18:06 +00:00
meaz d4a083ed91 Merge branch 'master' into goals 2020-07-18 19:17:16 +00:00
meaz 052494f227 Merge branch 'master' into green_badge 2020-07-17 06:34:55 +00:00
meaz 10703c943d Merge branch 'master' into xmppbridges 2020-07-17 06:33:20 +00:00
meaz fa6aac2726 improve how matrix syntax is displayed 2020-07-13 17:31:46 +02:00
meaz 424e347857 add info about Disroot team 2020-07-13 17:24:00 +02:00
meaz 7078fbe4a9 Add syntax for Matrix 2020-07-11 00:06:01 +02:00
meaz 327cec52ac add syntax info for IRC channels 2020-07-10 23:28:44 +02:00
meaz fe32a3042e add bgcolor 2020-07-10 21:36:00 +02:00
meaz a76799446c add avatars 2020-07-10 10:29:07 +02:00
meaz bb32896f7f add donated graph in section, remove it in tile 2020-07-10 09:48:01 +02:00
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 8018111118 change location of badge + fix error with bkground 2020-04-22 11:47:00 +02:00
meaz acf0a1b654 add green badge 2020-04-22 11:34:12 +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
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
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
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
antil0pa f6560717c5 root in fixed position 2020-01-09 11:02:56 +01:00
antil0pa b8173e6014 forgotten 2col pages 2020-01-08 21:30:14 +01:00
antil0pa 53f7ff06c9 Privacy policy bottom page fix 2020-01-08 16:10:38 +01:00
antil0pa 5bb11b9d14 Major update to all two columns pages and other minor fixes 2020-01-08 16:08:07 +01:00
meaz 2c06f27284 Mise à jour de 'pages/03.services/03.nextcloud/_nextcloud-cals/2col-right.de.md' 
back to de folder ;)
 2020-01-07 16:19:35 +00:00
meaz 062767358e Mise à jour de 'pages/03.services/03.nextcloud/_nextcloud-bookmarks/2col-right.de.md' 
back to de folder ;)
 2020-01-07 16:19:09 +00:00
meaz 847e3e8edb Mise à jour de 'pages/03.services/03.nextcloud/_nextcloud-bookmarks/2col-right.de.md' 
image is in en folder
 2020-01-07 16:16:48 +00:00
meaz a3b8ec050a Mise à jour de 'pages/03.services/03.nextcloud/_nextcloud-cals/2col-right.de.md' 
images are in en
 2020-01-07 16:15:48 +00:00
shadowsword 000a6bc230 Nextcloud changes translated to german 2020-01-06 07:56:30 +01:00
meaz 92a1e07f60 shorten the link a bit 2020-01-05 11:15:20 +01:00
meaz 2513d1c92a add a button5 class on link on community page 2020-01-05 09:45:16 +01:00
antilopa 9f6404f896 Merge branch 'community_update' of Disroot/Website into master 2020-01-04 21:57:29 +00:00
meaz 5cbd14c26e Merge branch 'IT-nextcloud-updates' of Disroot/Website into master 2020-01-04 16:24:49 +00:00
meaz 361a12fe47 Update of logos and xmpp links on community page 2020-01-04 17:22:13 +01:00
l3o baf13c7695 IT fixed xmpp page 2020-01-04 14:03:19 +01:00
l3o 65944a7379 Merge branch 'IT-nextcloud-updates' of git.disroot.org:Disroot/Website into IT-nextcloud-updates 2020-01-04 13:46:05 +01:00
Fede.- 0bc17ced26 NC Services Spanish translations 2020-01-04 09:44:33 -03:00
l3o 158f1668a9 update nextcloud bookmark and faq 2020-01-04 13:35:39 +01:00
massimiliano 70a9177b35 corrected link to image in tasks and one not translated sentece in bookmarks 2020-01-04 12:28:28 +01:00
massimiliano 1297827c27 Merge branch 'IT-nextcloud-updates' of https://git.disroot.org/Disroot/Website into IT-nextcloud-updates 2020-01-04 11:59:48 +01:00
l3o cc6488d2a6 IT-updates: cals deck news 2020-01-04 11:55:39 +01:00
massimiliano c2b4d4a1b5 notes,sync and talk. + corrected vagrant readme 2020-01-04 11:54:08 +01:00
meaz 9f9676713b remove webbrowser client 2020-01-04 11:41:18 +01:00
meaz aa4c964ad1 add webbrowser info for NC in a section 2020-01-04 11:36:50 +01:00
antilopa fc2db1a570 Merge branch 'disroot_def' of Disroot/Website into master 2020-01-04 10:12:46 +00:00
antilopa 2375c40acf Merge branch 'Fr-translation' of Disroot/Website into master 2020-01-04 10:11:30 +00:00
meaz 5cad6fb3fb Fix bottom of ToS page 2020-01-03 17:27:36 +01:00
meaz f6633c6c49 ToS in French 2020-01-03 17:18:33 +01:00
meaz 57291fec22 More fix on translations 2020-01-03 17:06:43 +01:00
meaz 6b2b4abc60 Add definition of Disroot in the faq as suggested in issue n°10 2020-01-03 16:47:04 +01:00
meaz 4fe35d3f3d French updates, but also some other fixes for other languages 2020-01-03 12:27:23 +01:00
meaz f6c01a940a update bookmarks with new NC tiles 2020-01-03 11:55:25 +01:00
meaz 295e8719b0 Fix mission statement bottom in international pages 2020-01-03 11:25:13 +01:00
meaz 0e24b7ab56 Fix mission statement bottom that was displaying wrongly 2020-01-02 23:31:58 +01:00
antilopa a18793761c Merge branch 'NC-client-international' of Disroot/Website into master 2020-01-02 14:34:47 +00:00
antilopa f09f314470 Merge branch 'bgcolor' of Disroot/Website into master 2020-01-02 14:33:48 +00:00
antil0pa 4a3098a889 Merge branch 'master' into bgcolor 2020-01-02 15:30:24 +01:00