Merg Staging into Main #335
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* adapt OpenAPI * adapt Transformers * handle downwards compatibility (default types for existing database values) * add some tests HINT: switch to new model in UI first as 'type' property of schedule events is now required for Observation API calls
…p_to More2-3 extend study and group to duration
…ORE2-Relative_Study_Start
# Conflicts: # studymanager/src/main/java/io/redlink/more/studymanager/model/scheduler/Event.java # studymanager/src/main/java/io/redlink/more/studymanager/model/scheduler/RecurrenceRule.java
Feature relative study start
…nt-start-date-in-participant-list Tt 108 smb smf show participant start date in participant list
Bufixes relative study start
…m-mobile-app-correctly-about-status-changes #298: Translate Study-States to states the app actually knows about
* change calculation of untilDate of absolute recurring observation * add calculation of study end for absolute recurring observations
If the duration is not explicitly set, we assume the duration from participant-start until study-end.
…-end / study-duration
More #302: fix bug where study duration by end date was calculated incorrectly
Bumps `spring-boot.version` from 3.3.0 to 3.3.1. Updates `org.springframework.boot:spring-boot-dependencies` from 3.3.0 to 3.3.1 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.3.0...v3.3.1) Updates `org.springframework.boot:spring-boot-maven-plugin` from 3.3.0 to 3.3.1 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.3.0...v3.3.1) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-dependencies dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework.boot:spring-boot-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
…pring-boot.version-3.3.1 Bump spring-boot.version from 3.3.0 to 3.3.1
…pants_and_integrations Study-Export should include Participants and Integrations
Integrate Cleanup-Improvements
add staging branch to Build-and-Deploy block
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.