Commit graph

2041 commits

Author SHA1 Message Date
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
l3o
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
7fd16ef6c7 fix error with mumble links (#287)
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #287
Reviewed-by: avg_joe <avg_joe@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2021-12-29 19:59:02 +00:00
8410835793 Merge pull request 'disnews_4' (#282) from disnews_4 into master
Reviewed-on: #282
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2021-12-29 09:42:09 +00:00
ffb50af77b uodated publish date 2021-12-29 10:30:22 +01:00
f1e21d8b0c removed media order header 2021-12-29 10:25:33 +01:00
e974d6e043 remove capitalization from link 2021-12-29 10:10:13 +01:00
8e81329bcd added some accents 2021-12-29 10:03:21 +01:00
ca5fc5fbdd fixed image size 2021-12-29 09:45:42 +01:00
34c653af65
remove extra ; 2021-12-29 08:34:32 +01:00
d0d3b3d0b8
remove defaults grav pages! 2021-12-29 08:29:02 +01:00
e71589e89d Fixed few typos on English post + Spanish translation 2021-12-29 04:10:07 -03:00
1707964b06 added more rojects 2021-12-29 01:36:52 +01:00
59b6c720c8 floss projects list 2021-12-29 01:17:11 +01:00
6610ba9f29 minor change 2021-12-29 00:34:30 +01:00
ceb46679d8 disnews #$ 2021-12-29 00:04:25 +01:00
bb5a84b82d German2021-12-21 (#274)
This branch is ready to bemerged with master.

Co-authored-by: RainerBielefeld <rainerbielefeldng@bielefeldundbuss.de>
Co-authored-by: avg_joe <jh@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: #274
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>
2021-12-28 10:51:35 +00:00
a1a791398e No Auto Discovery for RSS Feed #266 (#275)
Fix #266

Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #275
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-27 06:27:37 +00:00
66bd2f2e15 Merge pull request 'moved menu item 'perks' to different positiong in top bar' (#273) from change_menu_order into master
Reviewed-on: #273
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2021-12-22 19:25:48 +00:00
f80aea0c11 Update vagrant to php8 and grav to 1.7.24 (#268)
In order to better match with what is on prod.

Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #268
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-22 06:29:56 +00:00
e6362f77f5 remove hubzilla contact (#269)
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #269
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-22 06:28:51 +00:00