Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into refactoring/Upgrade-to-Spring-Boot-3
* main: (189 commits) No issue. Minor additions to BioC format description #4062 - ViewportTracker should focus on block-like elements #4032 - Allow using externalized strings from backend code #4060 - Clean up redundant code in annotation handlers #4026: Support for error tracking with Sentry #3673 - Update dependencies update dead link to the new file #4055 - Editor scrolls up when left sidebar is opened/closed [maven-release-plugin] prepare for next development iteration [maven-release-plugin] prepare release inception-28.2 #4052 - Admins no longer see all projects in the project overview #3673 - Update dependencies #4048 - Document navigation options not visible to manager when viewing other users document #3673 - Update dependencies #3673 - Update dependencies #1496 - Some spans are missing begin offset field #1511 - External recommender fails when CAS contains control characters #1496 - Some spans are missing begin offset field #4040 - Ability to store preferences from client-side code #1066 - Recommender status info ... % Conflicts: % inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/page/AnnotationPageBase.java % inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/annotation/BratAnnotationEditor.java % inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/service/DiamWebsocketController.java % inception/inception-documents/src/test/java/de/tudarmstadt/ukp/inception/documents/DocumentServiceImplConcurrencyTest.java % inception/inception-external-search-solr/pom.xml % inception/inception-html-editor/src/main/java/de/tudarmstadt/ukp/inception/htmleditor/docview/HtmlDocumentViewControllerImpl.java % inception/inception-html-editor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports % inception/inception-preferences/src/main/java/de/tudarmstadt/ukp/inception/preferences/config/PreferencesServiceAutoConfig.java % inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/service/LearningRecordServiceImpl.java % inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/service/RecommendationServiceImpl.java % inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/tasks/TrainingTask.java % inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/footer/RecommendationEventWebsocketControllerImplTest.java % inception/inception-support/pom.xml % inception/inception-ui-core/pom.xml % inception/inception-websocket/pom.xml % inception/pom.xml
- Loading branch information