Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ For all flags use the `--help` flag.

## Contributions

To contribute, please fork, change, test locally (see above) and create a pull request against `master`.
To contribute, please fork, change, test locally (see above) and create a pull request against `main`.

You can use [rake](http://rake.rubyforge.org/) to comfortably create content.

Expand Down Expand Up @@ -84,13 +84,13 @@ For help on syntax have a look at:

## Map

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.
The map is fed by [mapdata.js](https://github.com/DE-RSE/de-rse.github.io/blob/main/_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.

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)

## Events

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.
Events are included per year from <https://github.com/DE-RSE/de-rse.github.io/tree/main/_includes/events>. No language specific remarks in favor of maintainability.

## Converting slack signup domain list

Expand Down
2 changes: 1 addition & 1 deletion _drafts/i-am-a-test-draft.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ It's simple, really.
Once you're finished, save me under a new name (e.g., "my-real-draft.md") in the `_drafts` directory (where I also live).
Then, run `rake publish` and pick me from all the drafts listed, to publish me.

Once you're done, simply push your clone of the `master` branch back to your repository, and create a *pull request* against `master` on [my repository](https://github.com/DE-RSE/www).
Once you're done, simply push your clone of the `main` branch back to your repository, and create a *pull request* against `main` on [my repository](https://github.com/DE-RSE/www).

You're done :).
2 changes: 1 addition & 1 deletion _posts/2017-03-22-welcome-to-the-de-rse-blog.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ menulang: en

This weblog will contain posts on subjects that are relevant to the Research Software Engineers community.

**You, too**, can contribute (in English or German). Simply clone [this website's GitHub repository](https://github.com/DE-RSE/de-rse.github.io/), check out the [README](https://github.com/DE-RSE/de-rse.github.io/blob/master/README.md) (we use [Jekyll](https://jekyllrb.com/), and it's easy to create and publish drafts with `rake`), create a blog post, and submit it to us via a GitHub pull request against `master`!
**You, too**, can contribute (in English or German). Simply clone [this website's GitHub repository](https://github.com/DE-RSE/de-rse.github.io/), check out the [README](https://github.com/DE-RSE/de-rse.github.io/blob/main/README.md) (we use [Jekyll](https://jekyllrb.com/), and it's easy to create and publish drafts with `rake`), create a blog post, and submit it to us via a GitHub pull request against `main`!

Happy reading, happy contributing!

Expand Down
2 changes: 1 addition & 1 deletion _posts/2017-03-22-willkommen-beim-de-rse-blog.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ menulang: de

Dieses Weblog wird Artikel beinhalten, die für die Research Software Engineers Community relevant sind.

**Jede\*r** kann beitragen (auf Deutsch oder Englisch). Einfach das [GitHub repository dieser Website](https://github.com/DE-RSE/de-rse.github.io/) klonen, sich die [README](https://github.com/DE-RSE/de-rse.github.io/blob/master/README.md) anschauen (wir benutzen [Jekyll](https://jekyllrb.com/) und es ist einfach, mit `rake` Artikelentwürfe zu generieren und zu veröffentlichen), einen Artikel schreiben und ihn per GitHub Pull Request gegen `master` einreichen!
**Jede\*r** kann beitragen (auf Deutsch oder Englisch). Einfach das [GitHub repository dieser Website](https://github.com/DE-RSE/de-rse.github.io/) klonen, sich die [README](https://github.com/DE-RSE/de-rse.github.io/blob/main/README.md) anschauen (wir benutzen [Jekyll](https://jekyllrb.com/) und es ist einfach, mit `rake` Artikelentwürfe zu generieren und zu veröffentlichen), einen Artikel schreiben und ihn per GitHub Pull Request gegen `main` einreichen!

Viel Spaß beim Lesen und Beitragen!

Expand Down
2 changes: 1 addition & 1 deletion de/join.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Termine für die monatlichen Calls findet Ihr [hier](https://pad.okfn.de/p/opens

Der Blog auf der Webseite wird von der Community gemeinschaftlich gestaltet.
Deine Ideen, Themen und Beiträge auf Deutsch, English, oder beidem sind sehr willkommen!
In der Datei [README.md](https://github.com/DE-RSE/de-rse.github.io/blob/master/README.md)
In der Datei [README.md](https://github.com/DE-RSE/de-rse.github.io/blob/main/README.md)
findest du eine Anleitung wie Du eine Vorschau der Seite auf deinem eigenen Rechner bekommen
kannst.

Expand Down
2 changes: 1 addition & 1 deletion de/map.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Andernorts in Europa und in der Welt werden Personen, die wissenschaftliche Soft

de-RSE adressiert gleichermaßen Software entwickelnde Wissenschaftlerinnen und Wissenschaftler, in der Forschung tätige Informatikerinnen und Informatiker und andere aus den Computerwissenschaften stammende Personen, skriptende Administratorinnen und Administratoren, (Post-)Doktorandinnen und (Post-)Doktoranden, in der Forschung tätige Studentinnen und Studenten, Softwareprojektmanagerinnen und -projektmanager sowie all jene, die einen Beitrag zur Softwareentwicklung in Wissenschaft und Forschung leisten.

Zeig, dass Du dazu gehörst: <https://github.com/DE-RSE/de-rse.github.io/blob/master/_includes/mapdata.js>
Zeig, dass Du dazu gehörst: <https://github.com/DE-RSE/de-rse.github.io/blob/main/_includes/mapdata.js>

Wie-andere-RSE-definieren: <https://www.de-rse.org/de/map.html#wie-andere-rse-definieren>

Expand Down
2 changes: 1 addition & 1 deletion en/join.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Dates and times for the monthly community calls are [listed here](https://pad.ok

The website hosts a blog with contributions from the community members.
Your ideas, topics and posts in German, English, or both are very welcome!
The [README.md](https://github.com/DE-RSE/de-rse.github.io/blob/master/README.md) includes instructions for getting a local preview of the site.
The [README.md](https://github.com/DE-RSE/de-rse.github.io/blob/main/README.md) includes instructions for getting a local preview of the site.

## Local RSE groups

Expand Down
2 changes: 1 addition & 1 deletion en/map.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Elsewhere in Europe and the world, people who develop scientific software or res

de-RSE addresses both, software-developing researchers, PhD students and postdocs as well as computer scientists and other computer science professionals, scripting administrators and software project managers active in research - and all those who professionally contribute to software development in science and research.

Is this you? Then add yourself and show who we are: <https://github.com/DE-RSE/de-rse.github.io/blob/master/_includes/mapdata.js>
Is this you? Then add yourself and show who we are: <https://github.com/DE-RSE/de-rse.github.io/blob/main/_includes/mapdata.js>

What others say what an RSE is: <https://www.de-rse.org/en/map.html#what-others-say-what-an-rse-is>

Expand Down