Disroot/Website
14
18
Fork 16
Code Pull requests 4 Releases Activity
1774 commits 10 branches 0 tags 199 MiB
Commit graph

1774 commits

This branch
This branch
All branches
Author SHA1 Message Date
meaz
f6ef0dd5e2 Merge branch 'master' into vagrant_if 2021-03-03 10:51:15 +00:00
meaz
19bda7ef1e Merge pull request 'Correct typo in english form' (#205) from wallun/disroot-website:master into master 
Reviewed-on: #205
 2021-03-03 10:50:58 +00:00
Wallun
57559db9ad
Correct typo in english form 2021-03-03 10:22:26 +01:00
meaz
6dd7b8b18f update overview feb 2021 (#204) 2021-03-02 13:05:04 +00:00
antilopa
865dfb4896 update overview feb 2021 2021-03-02 13:37:52 +01:00
meaz
1605fb86cd Merge pull request 'yearly overview 2020' (#203) from overview2020 into master 
Reviewed-on: #203
 2021-03-02 10:09:31 +00:00
meaz
22b6c2479b Merge branch 'master' into overview2020 2021-03-02 10:09:12 +00:00
antilopa
14692da53c Merge pull request 'Update coffee index page link' (#202) from coffee into master 
Reviewed-on: #202
 2021-03-02 09:52:18 +00:00
antilopa
34dd1d576a yearly overview 2020 2021-03-02 10:22:34 +01:00
meaz
e79c8dbde4 Update coffee index page link 2021-03-01 09:43:20 +01:00
meaz
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
antilopa
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
meaz
911e0a4bc6 bank transfer restricited to SEPA only 2021-02-25 09:04:27 +01:00
Fede.-
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
fede
1b4710079b Merge branch 'exploitation' of https://git.disroot.org/Disroot/Website into exploitation 2021-02-23 19:50:33 -03:00
meaz
c862174dbb remove link as it is not directing to the right website anymore 2021-02-23 19:50:20 -03:00
meaz
be2cc4e8d5 remove link as it is not directing to the right website anymore 2021-02-23 11:52:04 +01:00
meaz
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
fede
d716753d53 Spanish translation of last post 2021-02-22 11:13:41 -03:00
antilopa
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
antilopa
9a3d59f2f1 added a line break for readabilty 2021-02-22 14:30:47 +01:00
antilopa
65882ccf66 corrected post date from 2020 to 2021 2021-02-22 14:30:07 +01:00
antilopa
7c93cc2be5 corrected some typos 2021-02-22 14:19:44 +01:00
muppeth
b8d9e419b3 blog post about the downtime because of the loose cable 2021-02-22 13:22:00 +01:00
meaz
592380c04f Fix typo in russian version 2021-02-20 09:55:49 +01:00
meaz
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
antilopa
881d33ed25 re-enable extra storage forms 2021-02-18 00:15:09 +01:00
meaz
e1cd829666 Add if to avoid errors + fix few other errors + fix erros with PP 2021-02-14 11:30:15 +01:00
antilopa
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
meaz
882ae50c89 antilopa's suggestion into other language page 2021-02-13 06:10:34 +01:00
meaz
611ac540c4 Merge branch 'master' into contact_gpg 2021-02-13 04:57:20 +00:00
antilopa
9c3f317367 suggestion for better layout 2021-02-12 21:09:03 +01:00
antilopa
027fec6c0f Merge pull request 'Remove badge from services' (#189) from badge into master 
Reviewed-on: #189
 2021-02-12 19:43:08 +00:00
antilopa
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
meaz
e19910ab3c Merge branch 'master' into badge 2021-02-09 21:45:47 +00:00
meaz
6592f11d51 Merge branch 'master' into contact_gpg 2021-02-09 21:45:07 +00:00
meaz
19c9560579 Merge branch 'master' into vagrant_grub 2021-02-09 21:44:44 +00:00
meaz
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
meaz
ecc4d0704b fix error with grub when using vagrant 2021-02-09 22:43:10 +01:00
meaz
407990f10d Update contact with new gpg key for cryptdisroot 2021-02-09 22:40:29 +01:00
meaz
ec9e2ba313 Merge branch 'master' into email_size 2021-02-09 05:47:25 +00:00
meaz
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
meaz
cbd0fdcfc6 change from 70 to 64 in case the calculation of the message size is off 2021-02-07 08:37:17 +01:00
meaz
bfcbd48d2d change Attachement size limit info to 70MB 2021-02-07 08:34:42 +01:00
meaz
0b630c479d Choose what Grav version to install + minors improvments / if statement 2021-02-06 00:20:12 +01:00
meaz
223f2e0776 Remove badge from services 2021-02-04 06:34:53 +01:00
Fede.-
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
meaz
8cbcf4c100 Merge pull request 'blog post end 2020' (#187) from muppwrite into master 
Reviewed-on: #187
 2020-12-31 10:58:01 +00:00