Commit graph

2041 commits

Author SHA1 Message Date
d02a0d7a2d Merge branch 'master' into BLOG_SP_01-2021-03 2021-03-28 20:12:34 +00:00
01fadb7320 Merge pull request 'news01-blog-it' (#210) from news01-blog-it into master
Reviewed-on: #210
2021-03-28 20:11:36 +00:00
l3o
a16092b1a5 Corrected minor translation errors 2021-03-28 21:11:07 +02:00
l3o
ff1c5653aa Translated article news 01 in italian 2021-03-28 20:58:04 +02:00
02be9051a7 Small fixes on SP translation 2021-03-27 16:48:17 -03:00
656d649a76 Last post translation into Sp + Fixed dead link in NC service section 2021-03-27 16:39:19 -03:00
5e22f63cc2 quick fix 2021-03-27 14:53:01 +01:00
39b970ff04 Merge pull request 'DisNews #1 - March 2021' (#208) from 2021-#3 into master
Reviewed-on: #208
2021-03-27 13:24:43 +00:00
cc1bc39b0d DisNews #1 - March 2021 2021-03-27 13:54:26 +01:00
cb017dc04c
remove coronavirus image 2021-03-22 13:19:56 +01:00
e29311042d While at it, corrected annoying white strip on the bottom of EN home page 2021-03-22 12:30:01 +01:00
b6cd258e8e Moved Change Log item menu to footer, added new picture 2021-03-22 12:27:09 +01:00
e9c96371c5
add changelog to website 2021-03-20 11:48:20 +01:00
c1fe514ebb
add changelog symbolic link in gitignore 2021-03-20 11:47:50 +01:00
5b9124c0f3
fix problem with gpm + PP and add changelog 2021-03-20 11:46:26 +01:00
a0566b9e01
add changelog repo 2021-03-20 11:23:34 +01:00
ebc24b78a8 Merge pull request 'Add if to avoid errors + fix few other errors + fix erros with PP' (#194) from vagrant_if into master
Reviewed-on: #194
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2021-03-09 13:38:47 +00:00
f6ef0dd5e2 Merge branch 'master' into vagrant_if 2021-03-03 10:51:15 +00:00
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
57559db9ad
Correct typo in english form 2021-03-03 10:22:26 +01:00
6dd7b8b18f update overview feb 2021 (#204) 2021-03-02 13:05:04 +00:00
865dfb4896 update overview feb 2021 2021-03-02 13:37:52 +01:00
1605fb86cd Merge pull request 'yearly overview 2020' (#203) from overview2020 into master
Reviewed-on: #203
2021-03-02 10:09:31 +00:00
22b6c2479b Merge branch 'master' into overview2020 2021-03-02 10:09:12 +00:00
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
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