Skip to content

Commit

Permalink
Merge branch 'staging' into feat/admin-panel
Browse files Browse the repository at this point in the history
  • Loading branch information
ff6347 authored Jan 12, 2024
2 parents 0d72f1b + b5c4355 commit e91ba64
Show file tree
Hide file tree
Showing 20 changed files with 50,012 additions and 31,548 deletions.
113 changes: 113 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
{
"files": ["README.md"],
"imageSize": 100,
"commit": false,
"commitConvention": "angular",
"contributors": [
{
"login": "JensWinter",
"name": "Jens Winter-Hübenthal",
"avatar_url": "https://avatars.githubusercontent.com/u/6548550?v=4",
"profile": "https://github.com/JensWinter",
"contributions": ["code"]
},
{
"login": "ff6347",
"name": "Fabian Morón Zirfas",
"avatar_url": "https://avatars.githubusercontent.com/u/315106?v=4",
"profile": "https://fabianmoronzirfas.me/",
"contributions": ["code"]
},
{
"login": "vogelino",
"name": "Lucas Vogel",
"avatar_url": "https://avatars.githubusercontent.com/u/2759340?v=4",
"profile": "https://github.com/vogelino",
"contributions": ["code"]
},
{
"login": "dnsos",
"name": "Dennis Ostendorf",
"avatar_url": "https://avatars.githubusercontent.com/u/15640196?v=4",
"profile": "https://github.com/dnsos",
"contributions": ["code"]
},
{
"login": "fdnklg",
"name": "Fabian",
"avatar_url": "https://avatars.githubusercontent.com/u/9034032?v=4",
"profile": "https://github.com/fdnklg",
"contributions": ["code"]
},
{
"login": "Jaszkowic",
"name": "Jonas Jaszkowic",
"avatar_url": "https://avatars.githubusercontent.com/u/10830180?v=4",
"profile": "https://github.com/Jaszkowic",
"contributions": ["code"]
},
{
"login": "julizet",
"name": "Julia Zet",
"avatar_url": "https://avatars.githubusercontent.com/u/52455010?v=4",
"profile": "https://github.com/julizet",
"contributions": ["code"]
},
{
"login": "lucasoeth",
"name": "lucasoeth",
"avatar_url": "https://avatars.githubusercontent.com/u/43838158?v=4",
"profile": "https://github.com/lucasoeth",
"contributions": ["code"]
},
{
"login": "raphael-arce",
"name": "Raphael.A",
"avatar_url": "https://avatars.githubusercontent.com/u/8709861?v=4",
"profile": "https://github.com/raphael-arce",
"contributions": ["code"]
},
{
"login": "sebastian-meier",
"name": "Sebastian Meier",
"avatar_url": "https://avatars.githubusercontent.com/u/302789?v=4",
"profile": "http://www.sebastianmeier.eu/",
"contributions": ["code"]
},
{
"login": "bnjmnsbl",
"name": "Benjamin Seibel",
"avatar_url": "https://avatars.githubusercontent.com/u/11134234?v=4",
"profile": "https://github.com/bnjmnsbl",
"contributions": ["code"]
},
{
"login": "Lisa-Stubert",
"name": "Lisa-Stubert",
"avatar_url": "https://avatars.githubusercontent.com/u/61182572?v=4",
"profile": "https://github.com/Lisa-Stubert",
"contributions": ["code"]
},
{
"login": "donni106",
"name": "Daniel",
"avatar_url": "https://avatars.githubusercontent.com/u/1942953?v=4",
"profile": "https://github.com/donni106",
"contributions": ["code"]
},
{
"login": "maximilianpalm",
"name": "Max",
"avatar_url": "https://avatars.githubusercontent.com/u/11571655?v=4",
"profile": "https://github.com/maximilianpalm",
"contributions": ["code"]
}
],
"contributorsPerLine": 7,
"skipCi": true,
"repoType": "github",
"repoHost": "https://github.com",
"projectName": "giessdenkiez-de",
"projectOwner": "technologiestiftung"
}

2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @ff6347 @dnsos @vogelino
* @ff6347 @raphael-arce @Jaszkowic @vogelino
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
if: "!contains(github.event.head_commit.message, 'skip ci')"
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/demo-branch-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ jobs:
name: Syncing branches
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 14.17.5
- name: Opening pull request
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ jobs:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, 'skip ci')"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js from .nvmrc
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
- run: npm ci
Expand All @@ -68,10 +68,10 @@ jobs:
new-release-published: ${{ steps.semantic-release.outputs.new_release_published }}
new-release-version: ${{ steps.semantic-release.outputs.new_release_version }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
persist-credentials: false
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
- run: npm ci
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.7.0
20.10.0
40 changes: 40 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
![Node.js CI](https://github.com/technologiestiftung/giessdenkiez-de/workflows/Node.js%20CI/badge.svg?branch=master) ![love badge](https://img.shields.io/badge/Built%20with-%E2%99%A5-red) ![citylab badge](https://img.shields.io/badge/@-CityLAB%20Berlin-blue)
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-14-orange.svg?style=flat-square)](#contributors-)
<!-- ALL-CONTRIBUTORS-BADGE:END -->

# [![Logo of _Gieß den Kiez_](./docs/images/logo.svg)](https://www.giessdenkiez.de)

Expand Down Expand Up @@ -26,3 +29,40 @@ This project is composed of multiple repositories:
## Documentation

You can find the projects documentation in this repos [wiki](https://github.com/technologiestiftung/giessdenkiez-de/wiki).

## Contributors ✨

Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):

<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
<!-- prettier-ignore-start -->
<!-- markdownlint-disable -->
<table>
<tbody>
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/JensWinter"><img src="https://avatars.githubusercontent.com/u/6548550?v=4?s=100" width="100px;" alt="Jens Winter-Hübenthal"/><br /><sub><b>Jens Winter-Hübenthal</b></sub></a><br /><a href="https://github.com/technologiestiftung/giessdenkiez-de/commits?author=JensWinter" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://fabianmoronzirfas.me/"><img src="https://avatars.githubusercontent.com/u/315106?v=4?s=100" width="100px;" alt="Fabian Morón Zirfas"/><br /><sub><b>Fabian Morón Zirfas</b></sub></a><br /><a href="https://github.com/technologiestiftung/giessdenkiez-de/commits?author=ff6347" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/vogelino"><img src="https://avatars.githubusercontent.com/u/2759340?v=4?s=100" width="100px;" alt="Lucas Vogel"/><br /><sub><b>Lucas Vogel</b></sub></a><br /><a href="https://github.com/technologiestiftung/giessdenkiez-de/commits?author=vogelino" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/dnsos"><img src="https://avatars.githubusercontent.com/u/15640196?v=4?s=100" width="100px;" alt="Dennis Ostendorf"/><br /><sub><b>Dennis Ostendorf</b></sub></a><br /><a href="https://github.com/technologiestiftung/giessdenkiez-de/commits?author=dnsos" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/fdnklg"><img src="https://avatars.githubusercontent.com/u/9034032?v=4?s=100" width="100px;" alt="Fabian"/><br /><sub><b>Fabian</b></sub></a><br /><a href="https://github.com/technologiestiftung/giessdenkiez-de/commits?author=fdnklg" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Jaszkowic"><img src="https://avatars.githubusercontent.com/u/10830180?v=4?s=100" width="100px;" alt="Jonas Jaszkowic"/><br /><sub><b>Jonas Jaszkowic</b></sub></a><br /><a href="https://github.com/technologiestiftung/giessdenkiez-de/commits?author=Jaszkowic" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/julizet"><img src="https://avatars.githubusercontent.com/u/52455010?v=4?s=100" width="100px;" alt="Julia Zet"/><br /><sub><b>Julia Zet</b></sub></a><br /><a href="https://github.com/technologiestiftung/giessdenkiez-de/commits?author=julizet" title="Code">💻</a></td>
</tr>
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/lucasoeth"><img src="https://avatars.githubusercontent.com/u/43838158?v=4?s=100" width="100px;" alt="lucasoeth"/><br /><sub><b>lucasoeth</b></sub></a><br /><a href="https://github.com/technologiestiftung/giessdenkiez-de/commits?author=lucasoeth" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/raphael-arce"><img src="https://avatars.githubusercontent.com/u/8709861?v=4?s=100" width="100px;" alt="Raphael.A"/><br /><sub><b>Raphael.A</b></sub></a><br /><a href="https://github.com/technologiestiftung/giessdenkiez-de/commits?author=raphael-arce" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://www.sebastianmeier.eu/"><img src="https://avatars.githubusercontent.com/u/302789?v=4?s=100" width="100px;" alt="Sebastian Meier"/><br /><sub><b>Sebastian Meier</b></sub></a><br /><a href="https://github.com/technologiestiftung/giessdenkiez-de/commits?author=sebastian-meier" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/bnjmnsbl"><img src="https://avatars.githubusercontent.com/u/11134234?v=4?s=100" width="100px;" alt="Benjamin Seibel"/><br /><sub><b>Benjamin Seibel</b></sub></a><br /><a href="https://github.com/technologiestiftung/giessdenkiez-de/commits?author=bnjmnsbl" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Lisa-Stubert"><img src="https://avatars.githubusercontent.com/u/61182572?v=4?s=100" width="100px;" alt="Lisa-Stubert"/><br /><sub><b>Lisa-Stubert</b></sub></a><br /><a href="https://github.com/technologiestiftung/giessdenkiez-de/commits?author=Lisa-Stubert" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/donni106"><img src="https://avatars.githubusercontent.com/u/1942953?v=4?s=100" width="100px;" alt="Daniel"/><br /><sub><b>Daniel</b></sub></a><br /><a href="https://github.com/technologiestiftung/giessdenkiez-de/commits?author=donni106" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/maximilianpalm"><img src="https://avatars.githubusercontent.com/u/11571655?v=4?s=100" width="100px;" alt="Max"/><br /><sub><b>Max</b></sub></a><br /><a href="https://github.com/technologiestiftung/giessdenkiez-de/commits?author=maximilianpalm" title="Code">💻</a></td>
</tr>
</tbody>
</table>

<!-- markdownlint-restore -->
<!-- prettier-ignore-end -->

<!-- ALL-CONTRIBUTORS-LIST:END -->

This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
Loading

0 comments on commit e91ba64

Please sign in to comment.