Skip to content

Commit

Permalink
Merge branch 'main' into refactoring/Upgrade-to-Spring-Boot-3
Browse files Browse the repository at this point in the history
* main:
  #4347 - CAS doctor fails to generate a proper report on projects not containing INITIAL_CASes
  #4349 - Project has date in the 70ies if no data is set in JSON
  #4344 - Allow format to inject default namespace if document does not specify one
  #4342 - Show document size in documents table
  #4342 - Show document size in documents table
  No issue: Optimize tracking be excluding elements that contain no text
  No issue: Avoid scrollbar appearing at wrong level
  #4340 - Allow pruning elements in XML policy
  #4338 - Spurious empty annotations in RecogitoJS editor
  #4324 - Allow configuring UID GID etc in Kubernetes
  #4335 - Promote UIMA JSON CAS 0.4.0 to non-experimental
  #4326 - Upgrade dependencies
  #4330 - Remove default memory limit for INCEpTION in Dockerfile
  #4229 - Better project template selection
  #4330 - Remove default memory limit for INCEpTION in Dockerfile
  #4229 - Better project template selection

% Conflicts:
%	inception/inception-external-editor/src/main/java/de/tudarmstadt/ukp/inception/externaleditor/xhtml/XHtmlXmlDocumentViewControllerImpl.java
  • Loading branch information
reckart committed Dec 5, 2023
2 parents 528a648 + 72004bf commit 4aa1324
Show file tree
Hide file tree
Showing 73 changed files with 4,903 additions and 2,677 deletions.
464 changes: 266 additions & 198 deletions inception/inception-brat-editor/src/main/ts_template/package-lock.json

Large diffs are not rendered by default.

522 changes: 312 additions & 210 deletions inception/inception-diam-editor/src/main/ts_template/package-lock.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
"sass": "${sass.version}",
"svelte": "${svelte.version}",
"svelte-preprocess": "${svelte-preprocess.version}",
"temp-write": "${temp-write.version}",
"typescript": "${typescript.version}",
"@typescript-eslint/eslint-plugin": "${typescript-eslint-eslint-plugin.version}",
"@typescript-eslint/parser": "${typescript-eslint-parser.version}",
Expand Down
Loading

0 comments on commit 4aa1324

Please sign in to comment.