Skip to content

Commit

Permalink
[GITFLOW]merging 'release-1.77.0' into 'master'
Browse files Browse the repository at this point in the history
  • Loading branch information
jenkins committed Dec 2, 2022
2 parents a1293de + 51ed64a commit 914d50e
Show file tree
Hide file tree
Showing 1,062 changed files with 22,759 additions and 8,649 deletions.
17 changes: 9 additions & 8 deletions .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Bug Report
about: Report an error you encountered while using or developing SORMAS.
about: Report an error you encountered while using SORMAS.
title: ''
labels: bug
assignees: ''
Expand All @@ -11,26 +11,27 @@ assignees: ''
Please read the Contributing guidelines (https://github.com/hzi-braunschweig/SORMAS-Project/blob/development/docs/CONTRIBUTING.md) before submitting an issue. You don't have to remove this comment or any other comment from this issue as they will automatically be hidden.
-->
### Bug Description
<!-- Mandatory -->
<!-- Mandatory: Describe the actual behaviour or situation -->

### Steps to Reproduce

#### Steps to Reproduce
<!-- Optional; please add more steps if necessary -->
1.
2.

### Expected Behavior
<!-- Optional -->

### Screenshots
#### Screenshots
<!-- Optional -->

### System Details
#### System Details
<!-- Mandatory; you only have to specify the Server URL if the error appeared on a publicly available test server -->
* Device:
* SORMAS version:
* Android version/Browser:
* Server URL:
* User Role:

### Expected Behavior
<!-- Optional -->

### Additional Information
<!-- Optional -->
43 changes: 43 additions & 0 deletions .github/ISSUE_TEMPLATE/finding.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
---
name: Finding
about: Report an unexpected behaviour you encountered while using or developing SORMAS.
title: ''
labels: finding
assignees: ''

---

<!--
Please read the Contributing guidelines (https://github.com/hzi-braunschweig/SORMAS-Project/blob/development/docs/CONTRIBUTING.md) before submitting an issue. You don't have to remove this comment or any other comment from this issue as they will automatically be hidden.
-->
### Problem Description
<!-- Mandatory: Describe the actual behaviour or situation -->


#### Steps to Reproduce
<!-- Optional; please add more steps if necessary -->
1.
2.

#### Screenshots
<!-- Optional -->

#### System Details
<!-- Mandatory; you only have to specify the Server URL if the error appeared on a publicly available test server -->
* Device:
* SORMAS version:
* Android version/Browser:
* Server URL:
* User Role:

### Expected Behavior
<!-- Optional -->


<!-- If converted to other type:
- Rewrite Expected Behavior to Proposed Change
- Insert other headings here: Acceptance Criteria, Implementation Details
-->

### Additional Information
<!-- Optional -->
28 changes: 14 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,17 @@ If you want to set up a SORMAS instance for production, testing or development p
## Project Structure
The project consists of the following modules:

- **sormas-api:** General business logic and definitions for data exchange between app and server
- **sormas-app:** The Android app
- **sormas-backend:** Server entity services, facades, etc.
- **sormas-base:** Base project that also contains build scripts
- **sormas-base/dependencies:** Dependencies to be deployed with the payara server
- **sormas-cargoserver:** Setup for a local dev server using maven-cargo
- **sormas-e2e-performance-tests:** Automated performance tests addressing the ReST interface (sormas-rest)
- **sormas-e2e-tests:** Automated frontend tests addressing sormas-ui **and** API tests against sormas-rest. The API steps are partly used to prepare data for UI tests.
- **sormas-ear:** The ear needed to build the application
- **sormas-keycloak-service-provider:** Custom Keycloak SPI for SORMAS
- **sormas-rest:** The REST interface; see [`sormas-rest/README.md`](sormas-rest/README.md)
- **sormas-ui:** The web application
- **sormas-widgetset:** The GWT widgetset generated by Vaadin
- **sormas-e2e-tests:** Automated tests addressing the sormas-ui, and the ReST interface
- [**sormas-api:**](/sormas-api) General business logic and definitions for data exchange between app and server
- [**sormas-app:**](/sormas-app) The Android app
- [**sormas-backend:**](/sormas-backend) Server entity services, facades, etc.
- [**sormas-base:**](/sormas-base) Base project that also contains build scripts
- [**sormas-base/dependencies:**](/sormas-base/dependencies) Dependencies to be deployed with the payara server
- [**sormas-cargoserver:**](/sormas-cargoserver) Setup for a local dev server using maven-cargo
- [**sormas-e2e-performance-tests:**](/sormas-e2e-performance-tests) Automated performance tests addressing the ReST interface (sormas-rest)
- [**sormas-e2e-tests:**](/sormas-e2e-tests) Automated frontend tests addressing sormas-ui **and** API tests against sormas-rest. The API steps are partly used to prepare data for UI tests.
- [**sormas-ear:**](/sormas-ear) The ear needed to build the application
- [**sormas-keycloak-service-provider:**](/sormas-keycloak-service-provider) Custom Keycloak SPI for SORMAS
- [**sormas-rest:**](/sormas-rest) The REST interface; see [`sormas-rest/README.md`](sormas-rest/README.md)
- [**sormas-ui:**](/sormas-ui) The web application
- [**sormas-widgetset:**](/sormas-widgetset) The GWT widgetset generated by Vaadin
- [**sormas-e2e-tests:**](/sormas-e2e-tests) Automated tests addressing the sormas-ui, and the ReST interface
Loading

0 comments on commit 914d50e

Please sign in to comment.