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

2136 Commits

Author SHA1 Message Date
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
Rainer Bielefeld 17929e7f2f Complete ly new translation of this area. 
I am not 100% sure concerning conversations.png, please check, whether 
that name is correct.
 2022-01-02 19:49:16 +01:00
Rainer Bielefeld f21effdc34 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-02 12:55:06 +01:00
l3o a79e479325 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 07:34:45 +00:00
shadowsword@disroot.org 220488b87d minor fixes & cryptpad translation 2022-01-01 22:40:56 +01:00
avg_joe daefec2d20 Merge pull request '20211231_Blog4Mewyear_DE' (#302) from 20211231_Blog4Mewyear_DE into master 
Reviewed-on: #302
Reviewed-by: avg_joe <avg_joe@no-reply@disroot.org>
 2021-12-31 20:55:39 +00:00
avg_joe 4ab26c3c7e Merge branch 'master' into 20211231_Blog4Mewyear_DE 2021-12-31 20:54:38 +00:00
meaz 1e2ad2caf0 Merge pull request 'typo in blog post' (#301) from blogpost_typo into master 
Reviewed-on: #301
 2021-12-31 15:50:39 +00:00
meaz 5cf029aed9
typo in blog post 2021-12-31 16:50:12 +01:00
avg_joe 47f7b3f5d6 fix faq quotation marks (#299) 
Co-authored-by: avg_joe <jh@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: #299
Co-authored-by: avg_joe <avg_joe@no-reply@disroot.org>
Co-committed-by: avg_joe <avg_joe@no-reply@disroot.org>
 2021-12-31 15:48:03 +00:00
Rainer Bielefeld 1508ec9d02 4 Typos corrected 2021-12-31 15:57:57 +01:00
avg_joe 800f4feb53 Merge pull request 'fix-german-translation-for-donation' (#297) from fix-german-translation-for-donation into master 
Reviewed-on: #297
Reviewed-by: meaz <meaz@no-reply@disroot.org>
 2021-12-31 10:37:07 +00:00
Rainer Bielefeld 120421a3ad German Translation for Hyppy New Year Blog Post. Related to #294 2021-12-31 11:08:54 +01:00
avg_joe 86533aff10 Merge branch 'master' into fix-german-translation-for-donation 2021-12-31 10:05:12 +00:00
l3o 7526b0c38c translated into italian perks page (#298) 
I translated perks page into Italian
I corrected a small typo (a space) in the Italian text of newsletter # 4

Co-authored-by: Alan <alan@alanleoni.ch>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: #298
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>
 2021-12-31 07:54:20 +00:00
Fede.- 46fc1b63b7 Merge pull request 'DisNews#4 Fixes' (#293) from disnews_4_FIX into master 
Reviewed-on: #293
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
 2021-12-30 19:25:21 +00:00
meaz 84ea839d23
Merge branch 'master' into disnews_4_FIX 2021-12-30 20:16:39 +01:00
avg_joe 47f42d96e5 Merge branch 'fix-german-translation-for-donation' of https://git.disroot.org/Disroot/Website into fix-german-translation-for-donation 2021-12-30 16:09:04 +01:00
avg_joe 61c30a673d avg_joe 2021-12-30 16:08:38 +01:00
avg_joe ee5c0a783f avg_joe 2021-12-30 16:05:42 +01:00
meaz 407f5e1864 Update vagrant again! (#285) 
I added the default Disroot's yaml config files, added some info + delete the default vagrant files/folder we get with new installation.

I destroyed vagrant and reinstalled several times, it worked  perfectly each time.

Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #285
Reviewed-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
 2021-12-30 11:32:55 -03:00