Merge branch 'master' into mrtnhmtz-patch-1

Author: knarrff

Gemfile

@@ -10,4 +10,5 @@ gem 'rake'
 gem 'jekyll'
 gem "kramdown", ">= 2.3.0"
 gem 'jekyll-feed', group: :jekyll_plugins
+gem 'jekyll-redirect-from', group: :jekyll_plugins
 gem "kramdown-parser-gfm"

Gemfile.lock

@@ -49,16 +49,14 @@ GEM
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.3.9)
     rouge (3.22.0)
     safe_yaml (1.0.5)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    strscan (3.1.0)
 
 PLATFORMS
   ruby

_config.yml

@@ -20,3 +20,4 @@ page:
   extension: md
 plugins:
   - jekyll-feed
+  - jekyll-redirect-from

_includes/events/2015.md

@@ -0,0 +1 @@
+| RSS15 | 2015-10-01 - 2015-10-02 | Berlin | [RSS15 report](https://www.knowledge-exchange.info/event/software-sustainability) | Research Software Sustainability Workshop |

_includes/events/2016.md

@@ -0,0 +1 @@
+| RSE16 | 2016-09-15 - 2016-09-16 | Manchester | [RSE16](https://ukrse.github.io/conf2016.html) | |

_includes/events/2017.md

@@ -0,0 +1,11 @@
+| WoSSS17 | 7.-9.3.2017 | The Hague | [WoSSS17 report](https://doi.org/10.17026/dans-xfe-rn2w) | Workshop on Sustainable Software Sustainability |
+| Barcamp Open Science | 20.3.2017 | Berlin | [Barcamp Open Science 2017](https://web.archive.org/web/20170907213145/http://www.open-science-conference.eu/barcamp/) | free! |
+| Open Science Conference | 21.-22.3.2017 | Berlin | [OSC18](https://web.archive.org/web/20161016221713/http://www.open-science-conference.eu/) | |
+| Collaborations Workshop 2017 | 27.-29.3.2017 | Leeds | [https://www.software.ac.uk/cw17](https://www.software.ac.uk/cw17) | |
+| 2nd Conference on Non-Textual Information (S3) | 10.-11.5.2017 | Hannover | [https://events.tib.eu/nontextualinformation2017/](https://events.tib.eu/nontextualinformation2017/) | |
+| RDA-DE-Trainings-Workshop-2017 | 8.-9.6.2017 | Dresden | [https://www.forschungsdaten.org/index.php/RDA-DE-...-2017](https://www.forschungsdaten.org/index.php/RDA-DE-Trainings-Workshop-2017) | |
+| EuroSciPy 2017 | 28.8.-1.9.2017 | Erlangen | [EuroSciPy 2017](https://web.archive.org/web/20170828124453/https://www.euroscipy.org/2017/) | |
+| RSE17 | 7.-8.9.2017 | Manchester | [https://rse.ac.uk/conf2017](https://web.archive.org/web/20220121001058/https://rse.ac.uk/conf2017/) | |
+| Open-Access-Tage 2017 | 11.-13.9.2017 | Dresden | [https://open-access-tage.de/...](https://open-access-tage.de/open-access-tage-2017-dresden) | |
+| WSSSPE5.2 | 24.10.2017 | Auckland | [WSSSPE5.2](https://wssspe.researchcomputing.org.uk/category/wssspe5-2/) | [13th IEEE eScience](http://escience2017.org.nz) |  |
+| FORCE17 | 25.-27.10.2017 | Berlin | [FORCE17](https://force11.org/force2017/) | [open access week 2017](https://web.archive.org/web/20170429085134/http://www.openaccessweek.org/profiles/blogs/2017-open-access-week-theme) | |

_includes/events/2018.md

@@ -7,4 +7,5 @@
 | Research Software Engineers in the Geosciences | 12.4.2018 | Vienna | [session information](http://meetingorganizer.copernicus.org/EGU2018/session/29539) + [registration](https://docs.google.com/forms/d/e/1FAIpQLSeolsrBOqBuUIn7_mM7rhKU_iKSl1ezl2s8bAgTy8hrkJxRpg/viewform) | part of [EGU General Assembly](https://egu2018.eu/) |
 | de-RSE @ FROSCON13 | 25 August 2018 | [Sankt Augustin](https://event.dlr.de/veranstaltungsort/hochschule-bonn-rhein-sieg/) | [Event website](https://event.dlr.de/event/de-rse-workshop-auf-der-froscon/) - [Programme](https://programm.froscon.de/2018/schedule/1.html) | free! |
 | RSE18 | 15 October 2018 | University of Birmingham | [www.rse.ac.uk/conf2018](https://web.archive.org/web/20210511160658/https://rse.ac.uk/conf2018/) |
+| CRSC18 | 29-30 May 2018 | Ottawa | [CRSC18](https://society-rse.org/events/candian-rse-conference/) | Canadian Research Software Conference |
 | Developer Forum 2018 | 3-4 September 2018 | Humboldt-Universität zu Berlin | [attending.io/events/developer-forum-2018](https://attending.io/events/developer-forum-2018) |

_includes/events/2019.md

@@ -7,3 +7,6 @@
 | deRSE19 | 4.-6.6.2019 | Potsdam | [www.de-rse.org/de/conf2019/](https://www.de-rse.org/de/conf2019/) |
 | FrOSCon | 10.-11.8.2019 | Sankt Augustin | [froscon.de](https://www.froscon.de/) |
 | Fourth RSE conference| 17-19 September 2019 | University of Birmingham | [rse.ac.uk/conf2019/](https://web.archive.org/web/20211009200055/https://rse.ac.uk/conf2019/) |
+| CRSC19 | 2019-05-28 - 2019-05-29 | Montreal | [CRSC19](https://web.archive.org/web/20190717162435/https://www.canarie.ca/software/canadian-research-software-conference/) | Canadian Research Software Conference |
+| NL-RSE19 | 2019-11-20 | Amsterdam | [nl-rse.org/events/nl-rse19](https://nl-rse.org/events/nl-rse19) | |
+| WoSSS19 | 2019-04-24 - 2019-04-26 | The Hague | [WoSSS19 report](https://doi.org/10.5281/zenodo.3922154) | Workshop on Sustainable Software Sustainability |

_includes/events/2020.md

@@ -1,2 +1,7 @@
 | SORSE | 09/2020-12/2020 | online | [https://sorse.github.io/](https://sorse.github.io/) | A Series of Online Research Software Events |
 | deRSE20 - _cancelled_ | ~~25.-27.8.2020~~ | ~~Jena~~ | [www.de-rse.org/deRSE20/](https://www.de-rse.org/deRSE20/) | |
+| CRSC20 - _cancelled_ | ~~2020-05-26 - 2020-05-27~~ | Montreal | [CRSC20](https://web.archive.org/web/20200815192456/https://www.canarie.ca/software/canadian-research-software-conference/) | Canadian Research Software Conference |
+| FOSDEM'20 | 2020-02-01 - 2020-02-02 | Brussels | [FOSDEM'20](https://archive.fosdem.org/2020/) | |
+| RSDD20 | 2020-12-03 | online | [www.be-rse.org/rsdd2020](https://web.archive.org/web/20200922063305/https://www.be-rse.org/rsdd2020) | Research Software Developers Day |
+| NZRSE 2020 | 2020-09-08 - 2020-09-10 | online | [NZRSE 2020](https://www.rseconference.nz/2020-nzrse-conference/) | RSE Conference New Zealand |
+| RSE-HPC-2020 | 2020-11-12 | online | [RSE-HPC-2020](https://us-rse.org/rse-hpc-2020/) | co-located with [SC20](https://sc20.supercomputing.org/) |

_includes/events/2021.md

@@ -1 +1,7 @@
 | SeptembRSE | 2021-09-06 - 2021-09-30 | online | [https://septembrse.society-rse.org/](https://septembrse.society-rse.org/) | Funding available from de-RSE |
+| WoSSS21 | 2021-10-06 - 2021-10-08 | online | [WoSSS21](https://wosss.org/wosss21/home) | Workshop on Sustainable Software Sustainability |
+| Nordic-RSE Unconference 2021 | 2021-06-29 - 2021-06-30 | online | [CRSC21](https://nordic-rse.org/events/2021-online-unconference/) | |
+| FOSDEM'21 | 2021-02-06 - 2021-02-07 | online | [FOSDEM'21](https://archive.fosdem.org/2021/) | |
+| CRSC21 | 2021-07-06 - 2021-07-08 | online | [CRSC21](https://www.canarie.ca/event/crsc-2021/) | Canadian Research Software Conference |
+| NZRSE 2021 | 2021-09-15 - 2021-09-17 | online | [NZRSE 2021](https://www.rseconference.nz/2021-nzrse-conference/) | RSE Conference New Zealand |
+| RSE-HPC-2021 | 2021-11-15 | online | [RSE-HPC-2021](https://us-rse.org/rse-hpc-2021/) | co-located with [SC21](https://sc21.supercomputing.org/) |