Skip to content

Commit

Permalink
Sync development branch with main hotfixes
Browse files Browse the repository at this point in the history
Sync development branch with main hotfixes
  • Loading branch information
sven1103 authored Aug 13, 2024
2 parents da104d6 + 22c0c75 commit 00121b2
Show file tree
Hide file tree
Showing 31 changed files with 346 additions and 121 deletions.
42 changes: 42 additions & 0 deletions .github/ISSUE_TEMPLATE/01-feature-request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Feature Request
description: File a feature request.
title: "[Please create a short, descriptive title]"
labels: ["enhancement", "triage"]
projects: ["qbicsoftware/25"]
assignees:
- sven1103
- Shraddha0903
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this feature request.
- type: textarea
id: wanted
attributes:
label: What are you missing?
description: Also tell us, what is missing?
placeholder: Tell us what you would need!
value: "I am currently missing ... \nI would need ..."
validations:
required: true
- type: textarea
id: use-case
attributes:
label: Why do you need a solution?
description: Please explain your scenario (use case) and how it affects your experience
validations:
required: true
- type: textarea
id: examples
attributes:
label: Ideas
description: Maybe you have an idea how to solve it or have seen a solution from others.
- type: checkboxes
id: terms
attributes:
label: Code of Conduct
description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/qbicsoftware/data-manager-app?tab=coc-ov-file).
options:
- label: I agree to follow this project's Code of Conduct
required: true
46 changes: 46 additions & 0 deletions .github/ISSUE_TEMPLATE/02-bug-report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Bug Report
description: File a bug report.
title: "[Provide a short descriptive title]"
labels: ["bug", "triage"]
projects: ["qbicsoftware/25"]
assignees:
- sven1103
- Shraddha0903
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this bug report! We strongly encourage you to also add screenshots to describe the bug!
- type: textarea
id: what-happened
attributes:
label: What happened?
description: Also tell us, what did you expect to happen?
placeholder: Tell us what you see!
value: "A bug happened!"
validations:
required: true
- type: dropdown
id: browsers
attributes:
label: What browsers are you seeing the problem on?
multiple: true
options:
- Firefox
- Chrome
- Safari
- Microsoft Edge
- type: textarea
id: logs
attributes:
label: Relevant log output
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
render: shell
- type: checkboxes
id: terms
attributes:
label: Code of Conduct
description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/qbicsoftware/data-manager-app?tab=coc-ov-file).
options:
- label: I agree to follow this project's Code of Conduct
required: true
38 changes: 0 additions & 38 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
blank_issues_enabled: false
20 changes: 0 additions & 20 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

22 changes: 22 additions & 0 deletions .github/workflows/inactive_issue_handling.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Close inactive issues
on:
schedule:
- cron: "30 1 * * *"

jobs:
close-issues:
runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write
steps:
- uses: actions/stale@v9
with:
days-before-issue-stale: 30
days-before-issue-close: 30
stale-issue-label: "stale"
stale-issue-message: "This issue is stale because it has been open for 30 days with no activity."
close-issue-message: "This issue was closed because it has been inactive for 14 days since being marked as stale."
days-before-pr-stale: -1
days-before-pr-close: -1
repo-token: ${{ secrets.GITHUB_TOKEN }}
29 changes: 29 additions & 0 deletions .github/workflows/label_new_issues.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Label issues
on:
issues:
types:
- reopened
- opened
jobs:
label_issues:
runs-on: ubuntu-latest
permissions:
issues: write
steps:
- name: Checkout repository
uses: actions/checkout@v4
- run: gh issue edit "$NUMBER" --add-label "$LABELS"
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_REPO: ${{ github.repository }}
NUMBER: ${{ github.event.issue.number }}
LABELS: triage
- run: gh project list --owner qbicsoftware
env:
GH_TOKEN: ${{secrets.ISSUE_MANAGEMENT}}
- run: gh project item-add "$PROJECT" --owner qbicsoftware --url "$ISSUE_URL"
env:
PROJECT: 25
ISSUE_URL: ${{ github.event.issue.html_url }}
GH_TOKEN: ${{ secrets.ISSUE_MANAGEMENT }}
GH_REPO: ${{ github.repository }}
128 changes: 128 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
# Contributor Covenant Code of Conduct

## Our Pledge

We as members, contributors, and leaders pledge to make participation in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
nationality, personal appearance, race, religion, or sexual identity
and orientation.

We pledge to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community.

## Our Standards

Examples of behavior that contributes to a positive environment for our
community include:

* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the
overall community

Examples of unacceptable behavior include:

* The use of sexualized language or imagery, and sexual attention or
advances of any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Enforcement Responsibilities

Community leaders are responsible for clarifying and enforcing our standards of
acceptable behavior and will take appropriate and fair corrective action in
response to any behavior that they deem inappropriate, threatening, offensive,
or harmful.

Community leaders have the right and responsibility to remove, edit, or reject
comments, commits, code, wiki edits, issues, and other contributions that are
not aligned to this Code of Conduct, and will communicate reasons for moderation
decisions when appropriate.

## Scope

This Code of Conduct applies within all community spaces, and also applies when
an individual is officially representing the community in public spaces.
Examples of representing our community include using an official e-mail address,
posting via an official social media account, or acting as an appointed
representative at an online or offline event.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
[email protected].
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
reporter of any incident.

## Enforcement Guidelines

Community leaders will follow these Community Impact Guidelines in determining
the consequences for any action they deem in violation of this Code of Conduct:

### 1. Correction

**Community Impact**: Use of inappropriate language or other behavior deemed
unprofessional or unwelcome in the community.

**Consequence**: A private, written warning from community leaders, providing
clarity around the nature of the violation and an explanation of why the
behavior was inappropriate. A public apology may be requested.

### 2. Warning

**Community Impact**: A violation through a single incident or series
of actions.

**Consequence**: A warning with consequences for continued behavior. No
interaction with the people involved, including unsolicited interaction with
those enforcing the Code of Conduct, for a specified period of time. This
includes avoiding interactions in community spaces as well as external channels
like social media. Violating these terms may lead to a temporary or
permanent ban.

### 3. Temporary Ban

**Community Impact**: A serious violation of community standards, including
sustained inappropriate behavior.

**Consequence**: A temporary ban from any sort of interaction or public
communication with the community for a specified period of time. No public or
private interaction with the people involved, including unsolicited interaction
with those enforcing the Code of Conduct, is allowed during this period.
Violating these terms may lead to a permanent ban.

### 4. Permanent Ban

**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within
the community.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 2.0, available at
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.

Community Impact Guidelines were inspired by [Mozilla's code of conduct
enforcement ladder](https://github.com/mozilla/diversity).

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see the FAQ at
https://www.contributor-covenant.org/faq. Translations are available at
https://www.contributor-covenant.org/translations.
2 changes: 1 addition & 1 deletion application-commons/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>datamanager</artifactId>
<groupId>life.qbic</groupId>
<version>1.2.1</version>
<version>1.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>application-commons</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion broadcasting/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>datamanager</artifactId>
<groupId>life.qbic</groupId>
<version>1.2.1</version>
<version>1.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>broadcasting</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions domain-concept/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>life.qbic</groupId>
<artifactId>datamanager</artifactId>
<version>1.2.1</version>
<version>1.2.4</version>
</parent>

<artifactId>domain-concept</artifactId>
Expand All @@ -27,7 +27,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
</dependency>
</dependencies>

Expand Down
6 changes: 3 additions & 3 deletions email-service-provider/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>life.qbic</groupId>
<artifactId>datamanager</artifactId>
<version>1.2.1</version>
<version>1.2.4</version>
</parent>

<groupId>life.qbic.infrastructure</groupId>
Expand All @@ -21,13 +21,13 @@
<dependency>
<groupId>life.qbic</groupId>
<artifactId>identity</artifactId>
<version>1.2.1</version>
<version>1.2.4</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>life.qbic</groupId>
<artifactId>project-management</artifactId>
<version>1.2.1</version>
<version>1.2.4</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
Loading

0 comments on commit 00121b2

Please sign in to comment.