Commit Graph

1555 Commits

Author SHA1 Message Date
meaz 82e1b58a64 change double quotes by single ones 2020-11-25 22:09:32 +01:00
acetone 1ca8fe8efa more Russian correctly 2020-11-23 08:26:43 +03:00
acetone 48b00c8020 green energy and other bit corrects 2020-11-23 08:19:21 +03:00
acetone a3b50ff089 Merge branch 'master' into master 2020-11-23 05:13:54 +00:00
meaz 16a20c27f0 Merge branch 'master' into green_badge 2020-11-22 20:39:56 +00:00
acetone d1535eb2a4 for nice look 2020-11-22 21:03:55 +03:00
acetone d8ccb141ff hardware donations 2020-11-22 19:18:00 +03:00
acetone d740f65cb2 endless edits 2020-11-22 19:08:03 +03:00
acetone fa26a358cc More correct russian language 2020-11-22 18:58:26 +03:00
acetone d462a5c3a6 FAQ translated to Russia language 2020-11-22 15:38:14 +03:00
acetone de6699c420 "Мы" instead "О нас" 2020-11-22 13:41:43 +03:00
acetone 4aa4a9ffeb I hate Windows standard encoding. Ave UTF-8! 2020-11-22 13:30:56 +03:00
acetone b1972d1bf6 God save the Putin and russian symbol encoding 2020-11-22 13:24:37 +03:00
acetone 754d528834 Encoding symbols correct 2020-11-22 10:17:26 +00:00
acetone bbab805d0e DisrootTeam and Transparency 2020-11-22 13:12:10 +03:00
acetone 8aed6fa4c7 Corrected russian translate 2020-11-22 12:50:03 +03:00
acetone 73b5738da8 Synchronization 2020-11-22 12:45:18 +03:00
acetone 0af32399c1 in process... 2020-11-22 12:44:45 +03:00
acetone 07a0d464d5 Merge branch 'master' into master 2020-11-22 09:31:49 +00:00
acetone 4271367909 oops:) 2020-11-21 18:22:02 +03:00
acetone 5f2ee27a31 acetone with love from Russia 2020-11-21 18:18:28 +03:00
antil0pa 79e70e6e67 Updated the monthly overview for few month, corrected the donation graph 2020-11-21 10:42:30 +01:00
muppeth 4facb4615b disabled forms, added line on contact page about chat bridge 2020-11-15 08:40:43 +01:00
meaz 59c5abd458 Merge branch 'master' into green_badge 2020-11-15 06:23:30 +00:00
meaz ae0c7a1c09 fix yahoo 2020-11-07 19:07:25 +01:00
meaz ccc1c6c4fa Merge branch 'master' into MS 2020-11-07 17:02:16 +00:00
Fede.- a68e57dd80 Updated Spanish translation and minor fixes on English post 2020-11-07 10:23:58 -03:00
meaz 395ea4f058 Remove the blocking part + some fixes 2020-11-07 05:20:09 +01:00
meaz 553db9c2cb replace yahoo by hotmail 2020-10-28 09:09:43 +01:00
Fede.- 6b848975b2 Small fixes on text, added MS support contact page 2020-10-27 16:54:08 -03:00
Fede.- c4ef5f3e36 Merge branch 'MS' of https://git.disroot.org/Disroot/Website into MS 2020-10-27 16:00:06 -03:00
Fede.- 9d9c1e6969 Spanish translation of MS post 2020-10-27 15:55:21 -03:00
Fede.- efb026f6c2 MS post
Few typos fixed
2020-10-27 15:55:21 -03:00
meaz 302e89eb81 Blog post about MS issue 2020-10-27 15:55:21 -03:00
meaz ba8ed68809 update not EN contact pages with NC Talk 2020-10-27 11:28:47 +01:00
meaz 2802b37a6c adds Nextcloud Talk link on contact page 2020-10-24 11:11:50 +02:00
meaz c6be15469d Change yahoo by hotmail 2020-10-23 18:56:41 +02:00
Fede.- 9f3c3c5243 Spanish translation of MS post 2020-10-23 09:43:03 -03:00
Fede.- 18e520619d MS post
Few typos fixed
2020-10-23 12:31:13 +00:00
meaz 00557444b0 Blog post about MS issue 2020-10-23 12:05:41 +02:00
Fede.- b16e3b34d0 Spanish translation for Roadmap 4T post 2020-10-15 15:05:57 -03:00
Fede.- b3e433f4c1 Spanish blogpost translation 2020-10-15 14:47:05 -03:00
Fede.- 2537117d5b Small fixes on posts links 2020-10-15 08:52:43 -03:00
muppeth 834b84ee9f roadmap q4 2020 2020-10-14 21:11:38 +02:00
muppeth 80e7d7f1a4 small fix to the blog post 2020-10-14 19:21:14 +02:00
muppeth 56dc641bac switching some light off blog post 2020-10-14 08:28:50 +02:00
l3o 560a2d4a46 Blog Deck - it translation - last part 2020-09-16 10:40:32 +02:00
l3o e21458ce99 Blog "Deck" - it translation - fixed some small mistake 2020-09-16 10:34:12 +02:00
l3o 593a449388 Blog "Deck" - it translation 2020-09-16 10:29:23 +02:00
l3o 60424c09b9 IT- traduction 2020-09-14 21:33:16 +02:00
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