Skip to content

Commit

Permalink
Merge pull request #4 from maehr/update
Browse files Browse the repository at this point in the history
Update
  • Loading branch information
maehr authored Nov 25, 2024
2 parents d39a1dd + a0be915 commit c2a2dc6
Show file tree
Hide file tree
Showing 33 changed files with 2,324 additions and 214 deletions.
68 changes: 68 additions & 0 deletions .github/ISSUE_TEMPLATE/intersting_stuff.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
name: 🌟 Add Interesting Stuff
description: Share links to interesting resources, articles, or tools.
labels: ['interesting stuff']
body:
- type: textarea
id: title
attributes:
label: Title
description: 'Provide a concise title for the resource.'
placeholder: "E.g., 'The Good Robot Podcast'"
required: true

- type: input
id: path
attributes:
label: URL
description: 'Paste the full link to the resource.'
placeholder: "E.g., 'https://www.thegoodrobot.co.uk/listennow'"
required: true

- type: textarea
id: description
attributes:
label: Description
description: 'Provide a detailed description of the resource. Mention its purpose, audience, or unique features.'
placeholder: "E.g., 'A podcast exploring what feminism can bring to the tech industry.'"
required: true

- type: input
id: author
attributes:
label: Author or Contributor
description: 'Provide your name or the name of the original author.'
placeholder: "E.g., '[Your Name](https://github.com/yourprofile)'"
required: true

- type: input
id: date
attributes:
label: Date Added
description: 'Provide the date the resource was added in YYYY-MM-DD format.'
placeholder: "E.g., '2024-11-21'"
required: true

- type: dropdown
id: categories
attributes:
label: Categories
description: 'Select the category that best fits the resource.'
multiple: true
options:
- Podcast
- Article
- Tool
- Guide
- Video
- Research
- Other
required: true

- type: checkboxes
id: code_of_conduct
attributes:
label: Code of Conduct
description: "Confirm that you have read and agree to abide by the project's Code of Conduct (Contributor Covenant)."
options:
- label: 'I have read and agree to the Code of Conduct.'
required: true
2 changes: 1 addition & 1 deletion .github/_quarto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ website:
- text: Contributing
href: CONTRIBUTING.md
- text: License (Data)
href: LICENSE-CCBYNCSA.md
href: LICENSE-CCBYSA.md
- text: License (Code)
href: LICENSE-AGPL.md
- text: Security
Expand Down
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -117,4 +117,4 @@ keywords:
- Critical Algorithm Studies
- Machine Learning
- Digital Humanities
license: CC-BY-NC-SA-4.0
license: CC-BY-SA-4.0
54 changes: 22 additions & 32 deletions LICENSE-CCBYNCSA.md → LICENSE-CCBYSA.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Attribution-NonCommercial-ShareAlike 4.0 International
Attribution-ShareAlike 4.0 International

=======================================================================

Expand Down Expand Up @@ -54,18 +54,18 @@ exhaustive, and do not form part of our licenses.

=======================================================================

Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International
Public License
Creative Commons Attribution-ShareAlike 4.0 International Public
License

By exercising the Licensed Rights (defined below), You accept and agree
to be bound by the terms and conditions of this Creative Commons
Attribution-NonCommercial-ShareAlike 4.0 International Public License
("Public License"). To the extent this Public License may be
interpreted as a contract, You are granted the Licensed Rights in
consideration of Your acceptance of these terms and conditions, and the
Licensor grants You such rights in consideration of benefits the
Licensor receives from making the Licensed Material available under
these terms and conditions.
Attribution-ShareAlike 4.0 International Public License ("Public
License"). To the extent this Public License may be interpreted as a
contract, You are granted the Licensed Rights in consideration of Your
acceptance of these terms and conditions, and the Licensor grants You
such rights in consideration of benefits the Licensor receives from
making the Licensed Material available under these terms and
conditions.


Section 1 -- Definitions.
Expand All @@ -84,7 +84,7 @@ Section 1 -- Definitions.
and Similar Rights in Your contributions to Adapted Material in
accordance with the terms and conditions of this Public License.

c. BY-NC-SA Compatible License means a license listed at
c. BY-SA Compatible License means a license listed at
creativecommons.org/compatiblelicenses, approved by Creative
Commons as essentially the equivalent of this Public License.

Expand All @@ -108,7 +108,7 @@ Section 1 -- Definitions.

g. License Elements means the license attributes listed in the name
of a Creative Commons Public License. The License Elements of this
Public License are Attribution, NonCommercial, and ShareAlike.
Public License are Attribution and ShareAlike.

h. Licensed Material means the artistic or literary work, database,
or other material to which the Licensor applied this Public
Expand All @@ -122,29 +122,21 @@ Section 1 -- Definitions.
j. Licensor means the individual(s) or entity(ies) granting rights
under this Public License.

k. NonCommercial means not primarily intended for or directed towards
commercial advantage or monetary compensation. For purposes of
this Public License, the exchange of the Licensed Material for
other material subject to Copyright and Similar Rights by digital
file-sharing or similar means is NonCommercial provided there is
no payment of monetary compensation in connection with the
exchange.

l. Share means to provide material to the public by any means or
k. Share means to provide material to the public by any means or
process that requires permission under the Licensed Rights, such
as reproduction, public display, public performance, distribution,
dissemination, communication, or importation, and to make material
available to the public including in ways that members of the
public may access the material from a place and at a time
individually chosen by them.

m. Sui Generis Database Rights means rights other than copyright
l. Sui Generis Database Rights means rights other than copyright
resulting from Directive 96/9/EC of the European Parliament and of
the Council of 11 March 1996 on the legal protection of databases,
as amended and/or succeeded, as well as other essentially
equivalent rights anywhere in the world.

n. You means the individual or entity exercising the Licensed Rights
m. You means the individual or entity exercising the Licensed Rights
under this Public License. Your has a corresponding meaning.


Expand All @@ -158,10 +150,9 @@ Section 2 -- Scope.
exercise the Licensed Rights in the Licensed Material to:

a. reproduce and Share the Licensed Material, in whole or
in part, for NonCommercial purposes only; and
in part; and

b. produce, reproduce, and Share Adapted Material for
NonCommercial purposes only.
b. produce, reproduce, and Share Adapted Material.

2. Exceptions and Limitations. For the avoidance of doubt, where
Exceptions and Limitations apply to Your use, this Public
Expand Down Expand Up @@ -229,9 +220,7 @@ Section 2 -- Scope.
Rights, whether directly or through a collecting society
under any voluntary or waivable statutory or compulsory
licensing scheme. In all other cases the Licensor expressly
reserves any right to collect such royalties, including when
the Licensed Material is used other than for NonCommercial
purposes.
reserves any right to collect such royalties.


Section 3 -- License Conditions.
Expand Down Expand Up @@ -276,6 +265,7 @@ following conditions.
reasonable to satisfy the conditions by providing a URI or
hyperlink to a resource that includes the required
information.

3. If requested by the Licensor, You must remove any of the
information required by Section 3(a)(1)(A) to the extent
reasonably practicable.
Expand All @@ -287,7 +277,7 @@ following conditions.

1. The Adapter's License You apply must be a Creative Commons
license with the same License Elements, this version or
later, or a BY-NC-SA Compatible License.
later, or a BY-SA Compatible License.

2. You must include the text of, or the URI or hyperlink to, the
Adapter's License You apply. You may satisfy this condition
Expand All @@ -307,8 +297,7 @@ apply to Your use of the Licensed Material:

a. for the avoidance of doubt, Section 2(a)(1) grants You the right
to extract, reuse, reproduce, and Share all or a substantial
portion of the contents of the database for NonCommercial purposes
only;
portion of the contents of the database;

b. if You include all or a substantial portion of the database
contents in a database in which You have Sui Generis Database
Expand Down Expand Up @@ -415,6 +404,7 @@ Section 8 -- Interpretation.
that apply to the Licensor or You, including from the legal
processes of any jurisdiction or authority.


=======================================================================

Creative Commons is not a party to its public
Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This repository contains the materials for the course "Decoding Inequality: Krit
[![GitHub forks](https://img.shields.io/github/forks/DHBern/decoding-inequality-2025.svg)](https://github.com/DHBern/decoding-inequality-2025/network)
[![GitHub stars](https://img.shields.io/github/stars/DHBern/decoding-inequality-2025.svg)](https://github.com/DHBern/decoding-inequality-2025/stargazers)
[![Code license](https://img.shields.io/github/license/DHBern/decoding-inequality-2025.svg)](https://github.com/DHBern/decoding-inequality-2025/blob/main/LICENSE-AGPL.md)
[![Data license](https://img.shields.io/github/license/DHBern/decoding-inequality-2025.svg)](https://github.com/DHBern/decoding-inequality-2025/blob/main/LICENSE-CCBYNCSA.md)
[![Data license](https://img.shields.io/github/license/DHBern/decoding-inequality-2025.svg)](https://github.com/DHBern/decoding-inequality-2025/blob/main/LICENSE-CCBYSA.md)
[![DOI](https://zenodo.org/badge/ZENODO_RECORD.svg)](https://zenodo.org/badge/latestdoi/ZENODO_RECORD)

<!-- ## Repository Structure
Expand Down Expand Up @@ -105,8 +105,7 @@ This project is maintained by [@DHBern](https://github.com/DHBern). Please under

## Roadmap

- [ ] Syllabus with reading list
- [ ] Assignments
- [x] Syllabus with reading list
- [ ] Slides for lectures
- [ ] Additional resources (e.g., links to papers, blog posts, etc.)
- [ ] Blog posts, posters, or other materials produced by students
Expand All @@ -122,11 +121,13 @@ We use [SemVer](http://semver.org/) for versioning. The available versions are l
## Authors and acknowledgment

- **Digital Humanities University of Bern** - _Initial work_ - [DHBern](https://github.com/DHBern)
- **Rachel Huber** - _Instructor_ - [HistoRaHub](https://github.com/HistoRaHub)
- **Moritz Mähr** - _Instructor_ - [maehr](https://github.com/maehr)

See also the list of [contributors](https://github.com/DHBern/decoding-inequality-2025/graphs/contributors) who contributed to this project.

## License

The data in this repository is released under the Creative Commons Attribution 4.0 International (CC BY 4.0) License - see the [LICENSE-CCBYNCSA](LICENSE-CCBYNCSA.md) file for details. By using this data, you agree to give appropriate credit to the original author(s) and to indicate if any modifications have been made.
The data in this repository is released under the Creative Commons Attribution 4.0 International (CC BY 4.0) License - see the [LICENSE-CCBYSA](LICENSE-CCBYSA.md) file for details. By using this data, you agree to give appropriate credit to the original author(s) and to indicate if any modifications have been made.

The code in this repository is released under the GNU Affero General Public License v3.0 - see the [LICENSE-AGPL](LICENSE-AGPL.md) file for details. By using this code, you agree to make any modifications available under the same license.
39 changes: 17 additions & 22 deletions _quarto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,40 +19,35 @@ website:
navbar:
logo: android-chrome-512x512.png
logo-alt: ''
logo-href: ''
title: Decoding Inequality 2025
tools:
- icon: github
url: https://github.com/DHBern/decoding-inequality-2025/
left:
- text: Kursbeschreibung
href: index.qmd
- text: Syllabus
href: syllabus.qmd
- href: contents/home.qmd
text: Kursbeschreibung
- href: contents/syllabus.qmd
- href: contents/interesting-stuff.qmd
- href: contents/blog.qmd
- href: contents/about.qmd

sidebar:
collapse-level: 1
contents:
# - section: decoding-inequality-2025
# href: index.qmd
# contents:
# - text: Changelog
# href: CHANGELOG.md
# - text: Code of Conduct
# href: CODE_OF_CONDUCT.md
# - text: Contributing
# href: CONTRIBUTING.md
# - text: License (Data)
# href: LICENSE-CCBYNCSA.md
# - text: License (Code)
# href: LICENSE-AGPL.md
# - text: Security
# href: SECURITY.md
- href: index.qmd
- href: contents/home.qmd
text: Kursbeschreibung
- href: syllabus.qmd
# contents: project-management/*
- href: contents/syllabus.qmd
- href: contents/interesting-stuff.qmd
- section: Blog
href: contents/blog.qmd
contents: contents/posts/*
- href: contents/about.qmd

format:
html:
link-external-icon: true
link-external-newwindow: true
toc: true
theme: cosmo
code-copy: true
Expand Down
Empty file removed analysis/.gitkeep
Empty file.
Binary file added assets/files/9783657796823-71011.pdf
Binary file not shown.
Binary file not shown.
Binary file added assets/images/huber.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/maehr.webp
Binary file not shown.
Empty file removed build/debug/.gitkeep
Empty file.
58 changes: 58 additions & 0 deletions contents/about.qmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
---
date: 2024-11-21
date-modified: last-modified
lang: de-CH
links:
- name: Rachel Huber
url: https://rachelhuber.ch/
- name: Moritz Mähr
url: https://moritzmaehr.ch/
---

# Über uns

## Dr. Rachel Huber, [Assoziierte Forschende](https://www.dh.unibe.ch/ueber_uns/personen/dr_huber_rachel/index_ger.html)

![](/assets/images/huber.jpg){width="200px"}

[Rachel Huber](https://rachelhuber.ch/) studierte Kulturmanagement in Zürich, Kulturwissenschaften in Luzern und Globalgeschichte an der Excellenzuni Hamburg. Sie arbeitete als wissenschaftliche Mitarbeiterin und promovierte mit Schwerpunkt Digital History, Erinnerungskulturen und Diskriminierungsgeschichte in den USA von 2016-2021 an der Universität Luzern am Lehrstuhl von Prof. Dr. Aram Mattioli. Von 2022-2023 arbeitete sie, ebenfalls am Historischen Seminar der Universität Luzern, als Posdoc und Projektleiterin. Beim OA  Journal «Public History Weekly» war sie von 2018-2020 als Redaktionsmitglied tätig und von 2022 bis 2023 leitete sie das Drittmittelprojekt «Auslegeordnung Erinnerungskultur Zürich». Die Auftragsforschung wurde vom Präsidialdepartement Zürich vergeben.

::: {.callout-tip title="Neustes Buch: Die Frauen der Red-Power-Bewegung" collapse="true"}
<iframe src="/assets/files/huber-2023-die-frauen-der-red-power-bewegung.pdf" width="100%" height="600px" loading="lazy" allowfullscreen title="Die Frauen der Red-Power-Bewegung">
This browser does not support PDFs. Please download the PDF <a href="/assets/files/huber-2023-die-frauen-der-red-power-bewegung.pdf">download the PDF</a> to view it.
</iframe>
:::

### Forschungsinteressen

- Erinnerungskulturen
- Digital Memory
- Digital History
- (Digital) Public History
- Globalgeschichte
- Minderheitengeschichte
- Schweizer und US-Geschichte

## Dr. sc. Moritz Mähr, [Assoziierter Forschender](https://www.dh.unibe.ch/ueber_uns/personen/dr_sc_maehr_moritz/index_ger.html)

![](/assets/images/maehr.webp){width="200px"}

[Moritz Mähr](https://moritzmaehr.ch/) ist assoziierter Forscher in Digital Humanities an der Universität Bern und digitaler Projektleiter von [Stadt.Geschichte.Basel](https://www.stadtgeschichtebasel.ch/) an der Universität Basel. Er studierte Geschichte und Philosophie des Wissens, Informatik sowie Bank- und Finanzwesen in Zürich und Berlin. Von 2018 bis 2022 war er wissenschaftlicher Mitarbeiter an der Professur für Technikgeschichte der ETH Zürich. Er schrieb eine Dissertation über die [Digitalisierung der Migrationsbehörden in der Schweiz in den 1960er Jahren](https://doi.org/10.30965/9783657796823). Die Studie war Teil des vom SNF geförderten Projekts [Trading Zones](https://data.snf.ch/grants/grant/188795). Seine Forschungsinteressen liegen im Bereich der Science and Technology Studies, der Digital Humanities und der Computergeschichte. Er ist ein Verfechter von Open Science, Open Access und Open Source.

::: {.callout-tip title="Neustes Buch: Wie der Verwaltungscomputer die Arbeitsmigration programmierte" collapse="true"}
<iframe src="/assets/files/9783657796823-71011.pdf" width="100%" height="600px" loading="lazy" allowfullscreen title="Wie der Verwaltungscomputer die Arbeitsmigration programmierte">
This browser does not support PDFs. Please download the PDF <a href="/assets/files/9783657796823-71011.pdf">download the PDF</a> to view it.
</iframe>
:::

### Forschungsinteressen

- Science and Technology Studies (STS)
- Digital Humanities (DH)
- Computergeschichte (History of Computing)
- Social network analysis und Graphen
- Natural Language Processing
Loading

0 comments on commit c2a2dc6

Please sign in to comment.