88c9427202
Removed conflict files
2022-01-02 23:28:31 -03:00
c31aec7840
Removed conflict files after rebase
2022-01-02 23:25:49 -03:00
52b55e1456
Remove conflict file
2022-01-02 23:21:49 -03:00
fa50529345
updated after review
2022-01-02 23:21:49 -03:00
b4a8659898
review (typos + suggestions)
2022-01-02 23:21:49 -03:00
b99eeae4b3
minor fixes & cryptpad translation
2022-01-02 23:21:49 -03:00
b669824cbd
switched to mx10 record for custom domain perks page
2022-01-02 19:46:09 +01:00
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
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
4ab26c3c7e
Merge branch 'master' into 20211231_Blog4Mewyear_DE
2021-12-31 20:54:38 +00:00
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
5cf029aed9
typo in blog post
2021-12-31 16:50:12 +01:00
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
1508ec9d02
4 Typos corrected
2021-12-31 15:57:57 +01:00
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
120421a3ad
German Translation for Hyppy New Year Blog Post. Related to #294
2021-12-31 11:08:54 +01:00
86533aff10
Merge branch 'master' into fix-german-translation-for-donation
2021-12-31 10:05:12 +00:00
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
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
84ea839d23
Merge branch 'master' into disnews_4_FIX
2021-12-30 20:16:39 +01:00
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
61c30a673d
avg_joe
2021-12-30 16:08:38 +01:00
ee5c0a783f
avg_joe
2021-12-30 16:05:42 +01:00
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
9dac4063de
Fix lot of errors with forms ( #295 )
...
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #295
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@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
067d94f2c4
Merge branch 'fix-german-translation-for-donation' of https://git.disroot.org/Disroot/Website into fix-german-translation-for-donation
2021-12-30 14:37:20 +01:00
9a6a8674d6
missed it
2021-12-30 14:35:32 +01:00
51598aaed0
fix about change de
2021-12-30 14:35:32 +01:00
19c3f476c8
inital commit trans don ger
2021-12-30 14:35:32 +01:00
99d913b3f2
missed it
2021-12-30 14:34:12 +01:00
b5d760623b
fix about change de
2021-12-30 14:32:50 +01:00
dba372135b
Merge branch 'fix-german-translation-for-donation' of https://git.disroot.org/Disroot/Website into fix-german-translation-for-donation
2021-12-30 14:29:02 +01:00
2edb6b34a3
inital commit trans don ger
2021-12-30 14:18:44 +01:00
dd95954c2a
Merge branch 'fix-german-translation-for-donation' of https://git.disroot.org/Disroot/Website into fix-german-translation-for-donation
2021-12-30 13:55:29 +01:00
06738682fc
inital commit trans don ger
2021-12-30 13:44:12 +01:00
15f6fb9d52
inital commit trans don ger
2021-12-30 13:39:12 +01:00
31dd9e1a7a
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 10:43:53 +00:00
e3b5ae237b
Fix lot of errors with forms ( #295 )
...
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #295
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@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 10:43:09 +00:00
f887459daa
Merge branch 'master' into disnews_4_FIX
2021-12-30 10:02:45 +00:00
df8736e06e
Fix link + texts on other languages on about page, privacy section ( #281 )
...
Fix #278 and #279
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #281
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 10:02:09 +00:00
1e9f8ac118
Merge branch 'master' into disnews_4_FIX
2021-12-30 09:36:59 +00:00
e2c23dff5e
finish mumble + about section ( #288 )
...
Co-authored-by: avg_joe <jh@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: #288
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: avg_joe <avg_joe@no-reply@disroot.org>
Co-committed-by: avg_joe <avg_joe@no-reply@disroot.org>
2021-12-30 09:36:24 +00:00
20b69782f6
Merge pull request 'Frenh traduction of disnew 4' ( #296 ) from Disnews4_fr into master
...
Reviewed-on: #296
2021-12-30 09:35:27 +00:00
1cb3f07c2f
Frenh traduction of disnew 4
2021-12-30 10:34:35 +01:00
ed76abdc76
DisNews#4 Fixes
2021-12-29 22:41:12 -03:00
c9960b84ae
Merge pull request 'fix_news4' ( #291 ) from fix_news4 into master
...
Reviewed-on: #291
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2021-12-29 21:20:25 +00:00
41975179a9
added image without white frame
2021-12-29 22:16:44 +01:00
b4a4ec8d15
typo in header
2021-12-29 22:11:47 +01:00
cc9426fb78
typo in header
2021-12-29 22:05:45 +01:00
68c67e3ba5
it-disneews4 ( #290 )
...
I translated the newsletter #4 into Italian ;)
Co-authored-by: Alan <alan@alanleoni.ch>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: #290
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-29 20:26:49 +00:00
