Commit graph

1916 commits

Author SHA1 Message Date
34dd1d576a yearly overview 2020 2021-03-02 10:22:34 +01:00
e79c8dbde4 Update coffee index page link 2021-03-01 09:43:20 +01:00
b0591bc818 Merge pull request 'Changed bank info and made other small fixes in ita translation' (#201) from it-bank-transfer into master
Reviewed-on: #201
2021-02-26 20:42:03 +00:00
l3o
b0fcafc73b Fixed mistake in form 2021-02-26 21:39:09 +01:00
l3o
8742ba27f4 Changed bank info and made other small fixes in ita translation 2021-02-26 20:46:11 +01:00
d557542946 Merge pull request 'bank transfer restricited to SEPA only' (#200) from sepa into master
Reviewed-on: #200
2021-02-25 08:10:08 +00:00
911e0a4bc6 bank transfer restricited to SEPA only 2021-02-25 09:04:27 +01:00
da48afef5f Merge pull request 'remove link as it is not directing to the right website anymore' (#198) from exploitation into master
Reviewed-on: #198
2021-02-23 22:51:24 +00:00
1b4710079b Merge branch 'exploitation' of https://git.disroot.org/Disroot/Website into exploitation 2021-02-23 19:50:33 -03:00
c862174dbb remove link as it is not directing to the right website anymore 2021-02-23 19:50:20 -03:00
be2cc4e8d5 remove link as it is not directing to the right website anymore 2021-02-23 11:52:04 +01:00
9006269c42 Merge pull request 'Spanish translation of last post' (#197) from Blog_Sp_translation into master
Reviewed-on: #197
2021-02-22 19:28:20 +00:00
d716753d53 Spanish translation of last post 2021-02-22 11:13:41 -03:00
f6be008952 Merge pull request 'blog post about the downtime because of the loose cable' (#196) from cable_downtime into master
Reviewed-on: #196
2021-02-22 13:31:20 +00:00
9a3d59f2f1 added a line break for readabilty 2021-02-22 14:30:47 +01:00
65882ccf66 corrected post date from 2020 to 2021 2021-02-22 14:30:07 +01:00
7c93cc2be5 corrected some typos 2021-02-22 14:19:44 +01:00
b8d9e419b3 blog post about the downtime because of the loose cable 2021-02-22 13:22:00 +01:00
592380c04f Fix typo in russian version 2021-02-20 09:55:49 +01:00
6e29c5d74c Merge pull request 're-enable extra storage forms' (#195) from enable_storage_form into master
Reviewed-on: #195
2021-02-18 05:38:17 +00:00
881d33ed25 re-enable extra storage forms 2021-02-18 00:15:09 +01:00
e1cd829666 Add if to avoid errors + fix few other errors + fix erros with PP 2021-02-14 11:30:15 +01:00
affd69dea1 Merge pull request 'Update contact with new gpg key for cryptdisroot' (#192) from contact_gpg into master
Reviewed-on: #192
2021-02-13 07:34:54 +00:00
882ae50c89 antilopa's suggestion into other language page 2021-02-13 06:10:34 +01:00
611ac540c4 Merge branch 'master' into contact_gpg 2021-02-13 04:57:20 +00:00
9c3f317367 suggestion for better layout 2021-02-12 21:09:03 +01:00
027fec6c0f Merge pull request 'Remove badge from services' (#189) from badge into master
Reviewed-on: #189
2021-02-12 19:43:08 +00:00
546955e508 Merge pull request 'fix error with grub when using vagrant' (#193) from vagrant_grub into master
Reviewed-on: #193
2021-02-12 19:39:53 +00:00
e19910ab3c Merge branch 'master' into badge 2021-02-09 21:45:47 +00:00
6592f11d51 Merge branch 'master' into contact_gpg 2021-02-09 21:45:07 +00:00
19c9560579 Merge branch 'master' into vagrant_grub 2021-02-09 21:44:44 +00:00
8cb01a13e6 Merge pull request 'change Attachement size limit info to 64MB' (#191) from email_size into master
Reviewed-on: #191
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2021-02-09 21:44:14 +00:00
ecc4d0704b fix error with grub when using vagrant 2021-02-09 22:43:10 +01:00
407990f10d Update contact with new gpg key for cryptdisroot 2021-02-09 22:40:29 +01:00
ec9e2ba313 Merge branch 'master' into email_size 2021-02-09 05:47:25 +00:00
d2d431b34c Merge pull request 'Choose what Grav version to install + minors improvments / if statement' (#190) from bootstrap into master
Reviewed-on: #190
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2021-02-09 05:46:19 +00:00
cbd0fdcfc6 change from 70 to 64 in case the calculation of the message size is off 2021-02-07 08:37:17 +01:00
bfcbd48d2d change Attachement size limit info to 70MB 2021-02-07 08:34:42 +01:00
0b630c479d Choose what Grav version to install + minors improvments / if statement 2021-02-06 00:20:12 +01:00
223f2e0776 Remove badge from services 2021-02-04 06:34:53 +01:00
68238d1e38 Blogpost Spanish translation + fixed minor typos in English (#188)
Blogpost Spanish translation + fixed minor typos in English

Co-authored-by: Fede <fede@disroot.org>
Reviewed-on: #188
Co-Authored-By: Fede.- <fede@no-reply@disroot.org>
Co-Committed-By: Fede.- <fede@no-reply@disroot.org>
2020-12-31 17:07:59 +00:00
8cbcf4c100 Merge pull request 'blog post end 2020' (#187) from muppwrite into master
Reviewed-on: #187
2020-12-31 10:58:01 +00:00
ffd65186db blog post end 2020 2020-12-31 11:20:29 +01:00
09ba743ce3 emergancy push to update microshit blog post 2020-12-29 12:02:32 +01:00
61dfab4d54 Merge pull request '[Blog-it] Translate sticker contest post' (#185) from blog-it-sticker into master
Reviewed-on: #185
2020-12-15 13:01:07 +00:00
l3o
a37a02316b [Blog-it] Translate sticker contest post 2020-12-15 13:45:51 +01:00
1f0b6391cc Stickers contest blog post (#184)
color adjustment on image

Added hashtag + Spanish translation

change merch to gift

Fede's suggestions

Few small fixes

Stickers contest blog post

Co-authored-by: antilopa <antilopa@disroot.org>
Co-authored-by: Fede <fede@disroot.org>
Co-authored-by: meaz <meaz@disroot.org>
Co-authored-by: Fede.- <fede@no-reply@disroot.org>
Reviewed-on: #184
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2020-12-08 15:12:06 +00:00
441c3ca33e Merge pull request 'add tagcloud plugin to vagrant + info about language-selector' (#182) from meazdev into master
Reviewed-on: #182
2020-12-05 23:19:20 +00:00
face1b7435 add tagcloud plugin to vagrant + info about language-selector 2020-12-06 00:17:27 +01:00
8c388fafe2 Merge pull request 'Update to debian10' (#181) from debian10 into master
Reviewed-on: #181
2020-12-05 22:45:31 +00:00