Commit Graph

1801 Commits

Author SHA1 Message Date
muppeth dea3ec202c
Added git.ignore since we need that as fullbar comes from other repo 2021-04-02 12:02:43 +02:00
meaz 11150e3aff Merge branch 'master' into changelog 2021-04-02 07:11:18 +00:00
antilopa 07839ffbe7 Fixed order of tasks so changelog is created before it is renamed 2021-04-01 22:05:48 +02:00
Fede.- eb61ca8f41 Merge pull request 'BLOG_SP_01-2021-03' (#209) from BLOG_SP_01-2021-03 into master
Reviewed-on: #209
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2021-03-29 18:23:21 +00:00
meaz 142377cb8b
change mv to cp 2021-03-29 08:55:32 +02:00
meaz e259ae21ad
fix changelog name 2021-03-29 08:49:50 +02:00
meaz 2e28825d29
fix path for changelog file name change 2021-03-29 08:39:43 +02:00
meaz 6837d29332
change changelog file name 2021-03-29 08:33:56 +02:00
meaz c90d3082ba Merge branch 'master' into changelog 2021-03-29 06:07:22 +00:00
meaz ccf2ad726e
change path to match theme repo + change file name to match template 2021-03-29 08:01:20 +02:00
Fede.- d02a0d7a2d Merge branch 'master' into BLOG_SP_01-2021-03 2021-03-28 20:12:34 +00:00
Fede.- 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
Fede.- 02be9051a7 Small fixes on SP translation 2021-03-27 16:48:17 -03:00
Fede.- 656d649a76 Last post translation into Sp + Fixed dead link in NC service section 2021-03-27 16:39:19 -03:00
muppeth 5e22f63cc2 quick fix 2021-03-27 14:53:01 +01:00
Fede.- 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
muppeth cc1bc39b0d DisNews #1 - March 2021 2021-03-27 13:54:26 +01:00
meaz cb017dc04c
remove coronavirus image 2021-03-22 13:19:56 +01:00
antilopa e29311042d While at it, corrected annoying white strip on the bottom of EN home page 2021-03-22 12:30:01 +01:00
antilopa b6cd258e8e Moved Change Log item menu to footer, added new picture 2021-03-22 12:27:09 +01:00
meaz e9c96371c5
add changelog to website 2021-03-20 11:48:20 +01:00
meaz c1fe514ebb
add changelog symbolic link in gitignore 2021-03-20 11:47:50 +01:00
meaz 5b9124c0f3
fix problem with gpm + PP and add changelog 2021-03-20 11:46:26 +01:00
meaz a0566b9e01
add changelog repo 2021-03-20 11:23:34 +01:00
meaz 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
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