Disroot/Website
Disroot
/
Website
14
15
Fork 14
Code Pull Requests 4 Releases Activity
2,056 Commits 19 Branches 0 Tags 198 MiB
Commit Graph

2056 Commits

Author SHA1 Message Date
antilopa 1c6ab97a20 oof 2022-02-01 12:46:59 +01:00
antilopa e98417c4b5 revert 2022-02-01 12:46:16 +01:00
antilopa 62a493dcfe oops I have overwritten some fixes 2022-02-01 12:44:39 +01:00
antilopa 867ccb2814 correction 2022-02-01 12:43:54 +01:00
antilopa e8811005be corrected year and image dimensions 2022-02-01 12:41:52 +01:00
Fede.- 1fc0d083ed Merge pull request 'german translation of january outage blog post' (#344) from de_jan31blog_shadowsword into master 
Reviewed-on: #344
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
 2022-02-01 04:05:09 +00:00
Fede.- 650dd7fc97 Merge branch 'master' into de_jan31blog_shadowsword 2022-02-01 04:01:47 +00:00
shadowsword@disroot.org d23108ecc4 german translation of january outage blog post 2022-01-31 23:52:57 +01:00
Fede.- efa04d5f48 Merge pull request 'translation of the last post into Italian' (#342) from it_blog_outage_31jan into master 
Reviewed-on: #342
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
 2022-01-31 19:44:57 +00:00
l3o 540f20cf1c translation of the last post into Italian 2022-01-31 20:33:47 +01:00
antilopa 2190cb7788 Merge pull request 'update on major outage' (#341) from jan_outage into master 
Reviewed-on: #341
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
 2022-01-31 13:59:47 +00:00
Fede.- 5836596115 Fixed few typos and added Spanish translation 2022-01-31 10:55:02 -03:00
antilopa 167fc62143 update on major outage 2022-01-31 10:38:02 +01:00
shadowsword 116231a9cc [Website][Translation]{DE] Terms of Service (#337) 
Final Version TOS German for now

Co-authored-by: shadowsword@disroot.org <shadowsword@disroot.org>
Co-authored-by: avg_joe <jh@disroot.org>
Reviewed-on: #337
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: shadowsword <shadowsword@no-reply@disroot.org>
Co-committed-by: shadowsword <shadowsword@no-reply@disroot.org>
 2022-01-22 21:11:02 +00:00
Fede.- 34dee3318a Merge pull request 'Last part revision of the entire site in Italian' (#336) from it-last-part-revision into master 
Reviewed-on: #336
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
 2022-01-12 19:40:25 +00:00
l3o 7813eafa87 Last part revision of the site in Italian done 2022-01-12 19:58:50 +01:00
Rainer Bielefeld 62c11eeb41 the old link leads to the Jitsi Chat application. But for "Calls" the "Jitsi Meet" app is required. (#330) 
I just tried 'https://calls.disroot.org//MeinDisrootTest' in WIN Jitsi
Meet, now works fine after Fix for issue #110

So now the linkfix is required.

Ok so or do you think direkt link to download area on the web page is not appropriate?

Co-authored-by: RainerBielefeld <rainerbielefeldng@bielefeldundbuss.de>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: #330
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: Rainer Bielefeld <rainerbielefeld@no-reply@disroot.org>
Co-committed-by: Rainer Bielefeld <rainerbielefeld@no-reply@disroot.org>
 2022-01-11 17:20:10 +00:00
Fede.- 1696851658 Merge pull request 'Updated xmpp bridges in italian' (#334) from xmpp-bridges-in-italian into master 
Reviewed-on: #334
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
 2022-01-10 22:22:17 +00:00
l3o 66327cc47b Updated xmpp bridges in italian 2022-01-10 21:08:44 +01:00
Fede.- ea810d4d78 Merge pull request 'Italian translation - content check and updating' (#332) from it-website-check into master 
Reviewed-on: #332
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
 2022-01-10 15:14:48 +00:00
l3o d0b2b0dbfe Verified all pages except the section servizi 2022-01-10 15:46:39 +01:00
meaz 7eb08e5f45 archive nextcloud news (#329) 
Fix #327

Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #329
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
 2022-01-09 20:08:06 +00:00
avg_joe 54f90e16e6 Merge pull request 'Merge branch 'disroot-bold-on-home'' (#326) from disroot-bold-on-home into master 
Reviewed-on: #326
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
 2022-01-09 11:44:15 +00:00
meaz 5276900820 Merge branch 'master' into disroot-bold-on-home 2022-01-06 21:07:47 +00:00
Rainer Bielefeld ea31623988 Linkfix Related to 'Contact Page: Bad link to 'GPG: server.ubuntu.com' 🐛 #320 ' (#325) 
Finished, can be merged.

Co-authored-by: RainerBielefeld <rainerbielefeldng@bielefeldundbuss.de>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: #325
Co-authored-by: Rainer Bielefeld <rainerbielefeld@no-reply@disroot.org>
Co-committed-by: Rainer Bielefeld <rainerbielefeld@no-reply@disroot.org>
 2022-01-06 21:06:46 +00:00
avg_joe 0bea6826a3 Merge branch 'de_shadowsword_emailunify' 2022-01-06 20:18:43 +01:00
avg_joe a956cce573 Merge pull request 'unified email spelling and typos' (#322) from de_shadowsword_emailunify into master 
Reviewed-on: #322
Reviewed-by: meaz <meaz@no-reply@disroot.org>
 2022-01-06 18:59:08 +00:00
avg_joe fd0cba4c8c fix typo 2022-01-06 19:46:03 +01:00
shadowsword@disroot.org 5e2c288ef7 unified email spelling and typos 2022-01-06 12:21:38 +01:00
avg_joe fff95878f9 perks: german translation, donation: adding hyphen (#313) 2022-01-05 21:38:45 +00:00
avg_joe 7b04999792 Merge branch 'master' into de_shadowsword_perks 2022-01-05 21:30:40 +00:00
shadowsword@disroot.org 905494249b latest changes, all "E-Mail" with non-brk hyphen 2022-01-05 20:02:16 +01:00
shadowsword@disroot.org 80a66e28d6 reviewed review 2022-01-05 19:24:21 +01:00
meaz 924c2d0b74 xmpp bridges in French (#314) 
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #314
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
 2022-01-04 15:27:24 +00:00
avg_joe e18ae840d2 review 2022-01-03 23:14:04 +01:00
shadowsword@disroot.org 22d21d09d5 perks: german translation 
donation: adding hyphen
 2022-01-03 21:24:14 +01:00
avg_joe 20d0245945 Merge pull request 'I fixed some Typos in SERVICES > XMPP > DE!' (#309) from 220102_Services_XMPP_DE_TypoFixes into master 
Reviewed-on: #309
Reviewed-by: avg_joe <avg_joe@no-reply@disroot.org>
 2022-01-03 13:50:54 +00:00
avg_joe bb66558025 Merge branch '220102_Services_XMPP_DE_TypoFixes' of https://git.disroot.org/Disroot/Website into 220102_Services_XMPP_DE_TypoFixes 2022-01-03 14:41:27 +01:00
avg_joe 5aa75bd709 review incl small changes 2022-01-03 14:13:58 +01:00
Rainer Bielefeld 5cc2c25f08 Complete ly new translation of this area. 
I am not 100% sure concerning conversations.png, please check, whether 
that name is correct.
 2022-01-03 14:13:58 +01:00
Rainer Bielefeld e41923b0a1 I fixed some Typos in SERVICES > XMPP > DE! 
Remaining Questions (general, not translation related):
a) „bau-haus.net“ still up to date?

b) bot.disroot.org: What's that? Explication is rather rare. „get in 
touch with us“? Which way?
 2022-01-03 14:13:58 +01:00
Fede.- b5b17fef42 Merge pull request 'Modified MX record address EN/ES/FR/IT' (#312) from FIX_Custom.domain.MX into master 
Reviewed-on: #312
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
 2022-01-03 10:45:40 +00:00
Fede.- d6ef5d268c Modified MX record address EN/ES/FR/IT 2022-01-03 01:01:50 -03:00
Fede.- f5195ac720 Merge pull request 'minor fixes & cryptpad translation' (#306) from de_shadowsword_minor01 into master 
Reviewed-on: #306
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
 2022-01-03 02:13:22 +00:00
Fede.- 4abac36346 Merge branch 'master' into de_shadowsword_minor01 2022-01-03 02:10:32 +00:00
Fede.- a50c790f5e Remove conflict file 2022-01-02 23:09:53 -03:00
shadowsword@disroot.org a613e5993f updated after review 2022-01-02 23:24:12 +01:00
l3o e56254ee18 it-news03-2021 (#307) 
I translated the disnews number 3 into Italian

Co-authored-by: l3o <l3o@disroot.org>
Reviewed-on: #307
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: l3o <l3o@no-reply@disroot.org>
Co-committed-by: l3o <l3o@no-reply@disroot.org>
 2022-01-02 22:35:59 +01:00
avg_joe e2496c22a6 review incl small changes 2022-01-02 21:40:45 +01:00
avg_joe 6a8721d111 review (typos + suggestions) 2022-01-02 21:00:17 +01:00