Skip to content

Commit 453bec7

Browse files
authored
Merge branch 'DE-RSE:master' into gh-pages
2 parents 3ed0591 + 75aa33d commit 453bec7

File tree

104 files changed

+2608
-180
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+2608
-180
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,7 @@ Network Trash Folder
3030
Temporary Items
3131
.apdisk
3232

33+
34+
.jekyll-metadata
35+
36+
assets/img/blog/2023/2023-09-13 13.39.29.xcf

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ gem 'rake'
1010
gem 'jekyll'
1111
gem "kramdown", ">= 2.3.0"
1212
gem 'jekyll-feed', group: :jekyll_plugins
13+
gem "kramdown-parser-gfm"

Gemfile.lock

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.7.0)
4+
addressable (2.8.0)
55
public_suffix (>= 2.0.2, < 5.0)
66
colorator (1.1.0)
77
concurrent-ruby (1.1.7)
@@ -35,19 +35,21 @@ GEM
3535
listen (~> 3.0)
3636
kramdown (2.3.1)
3737
rexml
38+
kramdown-parser-gfm (1.1.0)
39+
kramdown (~> 2.0)
3840
liquid (4.0.3)
3941
listen (3.2.1)
4042
rb-fsevent (~> 0.10, >= 0.10.3)
4143
rb-inotify (~> 0.9, >= 0.9.10)
4244
mercenary (0.3.6)
4345
pathutil (0.16.2)
4446
forwardable-extended (~> 2.6)
45-
public_suffix (4.0.5)
47+
public_suffix (4.0.6)
4648
rake (12.3.3)
4749
rb-fsevent (0.10.4)
4850
rb-inotify (0.10.1)
4951
ffi (~> 1.0)
50-
rexml (3.2.4)
52+
rexml (3.3.9)
5153
rouge (3.22.0)
5254
safe_yaml (1.0.5)
5355
sass (3.7.4)
@@ -63,6 +65,7 @@ DEPENDENCIES
6365
jekyll
6466
jekyll-feed
6567
kramdown (>= 2.3.0)
68+
kramdown-parser-gfm
6669
rake
6770
tzinfo-data
6871

README.md

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ This repository contains the source files for the de-RSE website. Its official h
44

55
The site is made to be built with [Jekyll](https://jekyllrb.com/) >= 3.4.1.
66

7+
You can use [RVM](https://rvm.io/) to install and use a suitable Ruby version, e.g., `rvm use 2.7`.
8+
79
To build, run `bundle install` once (or skip that if you have dependencies already installed and bundler does not work for you) and then `bundle exec jekyll build`.
810
To preview locally, run `bundle exec jekyll serve --incremental` and browse to <http://localhost:4000>.
911
The `--incremental` flag helps speeding up the previews.
10-
To include drafts in the preview add the `--drafts` flag.
12+
To include drafts and future blog posts in the preview add the `--drafts` and `--future` flags.
1113
To see where exactly something breaks or takes long, add the `--verbose` flag.
1214
For all flags use the `--help` flag.
1315

@@ -65,32 +67,32 @@ Blog posts will be displayed ordered by publication date on `blog.html`. They al
6567
You can also redirect pages to another URL by using the `layout: redirect` and defining a page to redirect to using a [meta refresh](https://en.wikipedia.org/wiki/Meta_refresh).
6668

6769
---
68-
title:
70+
title:
6971
layout: redirect
7072
redirect_page_to: https://xkcd.com
7173
---
7274

7375
## kramdown
7476

75-
For help on syntax have a look at:
77+
For help on syntax have a look at:
7678

7779
- [quick reference](https://kramdown.gettalong.org/quickref.html)
78-
- or [syntax](https://kramdown.gettalong.org/quickref.html)
80+
- or [syntax](https://kramdown.gettalong.org/quickref.html)
7981

8082
## Map
8183

8284
The map is fed by [mapdata.js](https://github.com/DE-RSE/de-rse.github.io/blob/master/_includes/mapdata.js). Adding someone to the map is as simple as adding a new section in this geoJSON file. Coordinates are available from [http://geojson.io/](http://geojson.io/) . Right now pictures should be 75px high. Inspiration for a nice testimonial can be found at Stephan Druskat's entry.
83-
85+
8486
The map appeared on Dec 6th 2017 on the website. It's based on [leaflet](http://leafletjs.com) v1.2 and [Leaflet.markercluster](https://github.com/Leaflet/Leaflet.markercluster)
85-
87+
8688
## Events
87-
88-
Events are included per year from https://github.com/DE-RSE/de-rse.github.io/tree/master/_includes/events. No language specific remarks in favor of maintainability.
89+
90+
Events are included per year from <https://github.com/DE-RSE/de-rse.github.io/tree/master/_includes/events>. No language specific remarks in favor of maintainability.
8991

9092
## Converting slack signup domain list
9193

92-
Direct sign up domain list from https://de-rse.slack.com/admin/settings#signup_mode .
93-
Domains get added as people request invites.
94+
Direct sign up domain list from <https://de-rse.slack.com/admin/settings#signup_mode>.
95+
Domains get added as people request invites.
9496

9597
```
9698
echo "mpi-cbg.de,mpg.de,tu-dresden.de,crt-dresden.de,hu-berlin.de,tib.eu,dlr.de,gfz-potsdam.de,fmp-berlin.de,rfii.de,uni-goettingen.de,gcdh.de,uni-bielefeld.de,uni-bonn.de,dfg.de,awi.de,geomar.de,uni-muenster.de,helmholtz-hzi.de,tu-berlin.de,pik-potsdam.de,leibniz-fli.de,uni-wuerzburg.de,helmholtz.de,uni-konstanz.de,ac.uk,tu-braunschweig.de,sub.uni-goettingen.de,gwdg.de,fu-berlin.de,hzdr.de" | tr "," "\n" | sort | awk '{print "<li>"$1"</li>" ;}'

_config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ highlighter: rouge
1111
permalink: /blog/:categories/:year/:month/:day/:title.html
1212
timezone: Europe/Berlin
1313
excerpt_separator: <!--more-->
14+
future: false
1415
post:
1516
template: _post.txt
1617
extension: md

_drafts/2023-02-22-deRSE23.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
title: "deRSE23"
3+
layout: post
4+
author: Frank Löffler
5+
menulang: de
6+
---
7+
8+
## deRSE23 in Zahlen:
9+
- 148 Teilnehmende
10+
- 3 Tage (inklusive Workshoptag)
11+
- 60 Vorträge
12+
- 24 Poster
13+
- 4 Workshops
14+
- 3 Demos
15+
- 2 Keynotes
16+
17+
## Stichpunkte
18+
- zusammen mit Konferenz SE23
19+
- unzählige alte und neue Kontakte
20+
- Diskussionen teilweise bis nach Mitternacht
21+
22+

_includes/events/2018.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
| Community Building Workshop | 24.1.2018 | Heidelberg |
2-
| International RSE Leaders Workshop | 30.-31.1.2018 | London | [https://rse.ac.uk/rse-international-leaders-meeting/](https://rse.ac.uk/rse-international-leaders-meeting/) |
2+
| International RSE Leaders Workshop | 30.-31.1.2018 | London | [https://rse.ac.uk/rse-international-leaders-meeting/](https://web.archive.org/web/20210614093851/https://rse.ac.uk/rse-international-leaders-meeting/) |
33
| Workshop "Research Software Engineering und Digital Humanities. Reflexion, Kartierung, Organisation." | 27.2.2018 | Cologne | [DHd 2018](http://dhd2018.uni-koeln.de/programm-dienstag/) |
44
| Barcamp Open Science | 12.3.2018 | Berlin | [http://www.barcamp-open-science.eu/](http://www.barcamp-open-science.eu/) | free! |
55
| RDA 11th Plenary Meeting | 21.-23.3.2018 | Berlin | [https://www.rd-alliance.org/](https://www.rd-alliance.org/plenaries/rda-eleventh-plenary-meeting-berlin-germany) |
66
| Collaborations Workshop 2018 | 26.-28.3.2018 | Cardiff | [www.software.ac.uk/cw18](https://www.software.ac.uk/cw18) | |
77
| 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/) |
88
| 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! |
9-
| RSE18 | 15 October 2018 | University of Birmingham | [www.rse.ac.uk/conf2018](https://www.rse.ac.uk/conf2018/) |
10-
| 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) |
9+
| RSE18 | 15 October 2018 | University of Birmingham | [www.rse.ac.uk/conf2018](https://web.archive.org/web/20210511160658/https://rse.ac.uk/conf2018/) |
10+
| 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
| Collaborations Workshop 2019 | 1.-3.4.2019 | Loughborough | [www.software.ac.uk/cw19](https://www.software.ac.uk/cw19) | |
77
| deRSE19 | 4.-6.6.2019 | Potsdam | [www.de-rse.org/de/conf2019/](https://www.de-rse.org/de/conf2019/) |
88
| FrOSCon | 10.-11.8.2019 | Sankt Augustin | [froscon.de](https://www.froscon.de/) |
9-
| Fourth RSE conference| 17-19 September 2019 | University of Birmingham | [rse.ac.uk/conf2019/](https://rse.ac.uk/conf2019/) |
9+
| 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/) |

_includes/events/2021.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
| SeptembRSE | 2021-09-06 - 2021-09-30 | online | [https://septembrse.society-rse.org/](https://septembrse.society-rse.org/) | Funding available from de-RSE |

_includes/events/2022.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
| rSE22 | 2022-02-21 - 2022-02-25 | online | [Talks track](https://se-2022.gi.de/program/rse-workshops-und-bof); [Workshops](https://se-2022.gi.de/rse22workshops) | Run as part of GI [SE2022](https://se-2022.gi.de/) |
2+
| RSECon UK 2022 | 2022-09-06 - 2022-09-08 | Newcastle, UK | [society-rse.org/rse-conference-2022/](https://society-rse.org/rse-conference-2022/) | |

0 commit comments

Comments
 (0)