Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

C

caosdb-server
- Activity
- Members
- Labels
- Environments
- Incidents

Snippets Groups Projects

8981d65a

Verified Commit 8981d65a authored 2 years ago by Timm Fitschen

Downloads
- Plain Diff

Merge branch 'dev' into f-bracket-has

parents f5f99d39 f1730eb4

No related branches found

No related tags found

2 merge requests!96DOC: Added CITATION.cff to the list of files in the release guide where the...,!86FIX: fix for 203

Pipeline #35593 passed 2 years ago

Stage: info

Stage: test

Stage: deploy

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 14 additions, 0 deletions

CHANGELOG.md
DEPENDENCIES.md 1 addition, 0 deletions

DEPENDENCIES.md
README_SETUP.md 49 additions, 16 deletions

README_SETUP.md
conf/core/server.conf 1 addition, 1 deletion

conf/core/server.conf
src/main/java/org/caosdb/server/jobs/Job.java 1 addition, 1 deletion

src/main/java/org/caosdb/server/jobs/Job.java
src/main/java/org/caosdb/server/jobs/core/AccessControl.java 31 additions, 31 deletions

src/main/java/org/caosdb/server/jobs/core/AccessControl.java
src/main/java/org/caosdb/server/jobs/core/Inheritance.java 1 addition, 1 deletion

src/main/java/org/caosdb/server/jobs/core/Inheritance.java

with 98 additions and 50 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment