Commit graph

1591 commits

Author SHA1 Message Date
b350419420 new conversations picture 2020-08-06 14:34:08 +02:00
10703c943d Merge branch 'master' into xmppbridges 2020-07-17 06:33:20 +00:00
aa6cd795b7 Merge pull request 'about' (#150) from about into master
Reviewed-on: #150
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2020-07-17 05:13:04 +00:00
fa6aac2726 improve how matrix syntax is displayed 2020-07-13 17:31:46 +02:00
424e347857 add info about Disroot team 2020-07-13 17:24:00 +02:00
7078fbe4a9 Add syntax for Matrix 2020-07-11 00:06:01 +02:00
327cec52ac add syntax info for IRC channels 2020-07-10 23:28:44 +02:00
fe32a3042e add bgcolor 2020-07-10 21:36:00 +02:00
a76799446c add avatars 2020-07-10 10:29:07 +02:00
6195e8a4b1 Merge pull request 'finacial overview till may 2020' (#147) from financial_overview_jun2020 into master 2020-06-05 18:50:27 +00:00
fe85f0992c finacial overview till may 2020 2020-06-05 16:58:52 +02:00
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
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
dfff9295cd Merge pull request 'Roundcube announcement' (#145) from roundcube_post into master
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2020-05-20 09:24:14 +00:00
243287b995 Roundcube announcement 2020-05-20 01:31:05 -03:00
d26c785cb3 updated git settings 2020-05-08 11:32:29 +02:00
193ae70991 Merge pull request 'Update donation address' (#143) from update_donation_page into master 2020-05-08 09:29:14 +00:00
f95f7bf6b1 Update donation address 2020-05-08 11:26:30 +02:00
4aa28acc1f Add mumble clients in En and Fr 2020-04-21 07:09:56 +02:00
6a5b83ab6e Merge pull request 'IT traduction - blog flisol' (#140) from IT-blog-flisol into master 2020-04-16 12:57:08 +00:00
l3o
887dbc1376 IT traduction - blog flisol 2020-04-16 14:42:06 +02:00
9e4095f4fc Merge pull request 'Post about Flisol' (#139) from flisol_blogpost into master 2020-04-14 06:47:23 +00:00
fa042ff879 Post about Flisol 2020-04-14 02:40:53 -03:00
bb30628f32 Merge pull request 'fix wrong closing </a>' (#138) from faq into master 2020-04-13 12:25:23 +00:00
13b1651797 fix wrong closing </a> 2020-04-08 12:10:22 +02:00
f6047b420f Merge pull request 'IT traduction covid19' (#137) from IT-covid19 into master 2020-04-06 05:20:51 +00:00
l3o
408a9b26d2 IT traduction covid19 2020-04-05 21:11:36 +02:00
2260f8a639 fix de (#136)
fix de

Co-authored-by: muppeth <muppeth@disroot.org>
2020-04-04 18:45:48 +00:00
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
c52edfa99d Merge pull request 'remove new badge from games tile' (#134) from remove_new into master 2020-04-01 10:14:13 +00:00
fcb4550c3c remove new badge from games tile 2020-04-01 12:07:13 +02:00
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
fd8238a098 Merge pull request 'WEBSITE_Blogpost_ES' (#133) from WEBSITE_Blogpost_ES into master 2020-04-01 04:36:14 +00:00
86504d8914 Fixed typo
Fixed a typo
2020-03-31 20:48:06 +00:00
f20283947f Spanish translation of blogpost 2020-03-31 17:40:22 -03:00
494f770c5a Merge pull request 'covid19 kit blog post.' (#132) from covid19-kit into master
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
2020-03-31 20:29:28 +00:00
8f29354e00 covid19 kit blog post. 2020-03-31 22:22:06 +02:00
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
6a47de815a Spanish fixes 2020-03-31 09:07:30 -03:00
3a811c34f9 Spanish fixes 2020-03-31 09:06:32 -03:00
976bb9d7d7 Kit: Spanish update for English fixes 2020-03-31 09:05:53 -03:00
ce02c8d8b2 Spanish fixes 2020-03-31 08:58:49 -03:00
e87f448f26 Merge pull request 'french_covid' (#130) from french_covid into master 2020-03-31 11:53:02 +00:00
9360c7d7a5 improve info about NC key resetting 2020-03-31 12:43:19 +02:00
3fe3a223a3 French translation of cryptpad service page 2020-03-31 10:46:41 +02:00
384e6c7a84 remove mention of email on cryptpad 2020-03-31 10:41:59 +02:00
0a15232182 French translation of Mumble service page 2020-03-31 10:37:44 +02:00
8197b4e755 remove a space character 2020-03-31 10:29:14 +02:00
6f39a3f3ae franch translation of Quarantine page 2020-03-31 10:27:50 +02:00