Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

C

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

Snippets Groups Projects

2f7c7c50

Verified Commit 2f7c7c50 authored 4 years ago by Timm Fitschen

Downloads
- Plain Diff

Merge branch 'f-fsm' into f-fsm-v0.2

parents 08d61b2d 25a16cb3

No related branches found

No related tags found

3 merge requests!21Release v0.4.0,!7F fsm,!6Draft: F acm permissions2

Pipeline #6006 passed 4 years ago

Stage: test

Stage: deploy

Changes 8
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 8 additions, 9 deletions

.gitlab-ci.yml
CHANGELOG.md 5 additions, 0 deletions

CHANGELOG.md
README.md 33 additions, 11 deletions

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

conf/core/server.conf
src/doc/administration/server_side_scripting.rst 1 addition, 1 deletion

src/doc/administration/server_side_scripting.rst
src/main/java/org/caosdb/server/database/DatabaseAccessManager.java 4 additions, 6 deletions

...ava/org/caosdb/server/database/DatabaseAccessManager.java
src/test/java/org/caosdb/server/database/DatabaseAccessManagerTest.java 81 additions, 0 deletions

...org/caosdb/server/database/DatabaseAccessManagerTest.java
src/test/java/org/caosdb/server/query/QueryTest.java 5 additions, 1 deletion

src/test/java/org/caosdb/server/query/QueryTest.java

with 138 additions and 29 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