Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

C

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

Snippets Groups Projects

a44dea22

Verified Commit a44dea22 authored 5 years ago by Timm Fitschen

Downloads
- Plain Diff

Merge branch 'dev' of gitlab.com:caosdb/caosdb-server into dev

parents bb7695e2 2568957c

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 25 additions, 5 deletions

CHANGELOG.md
conf/core/server.conf 1 addition, 0 deletions

conf/core/server.conf
scripting/home/readme.md 3 additions, 0 deletions

scripting/home/readme.md
src/main/java/caosdb/server/ServerProperties.java 1 addition, 0 deletions

src/main/java/caosdb/server/ServerProperties.java
src/main/java/caosdb/server/scripting/ServerSideScriptingCaller.java 36 additions, 3 deletions

...va/caosdb/server/scripting/ServerSideScriptingCaller.java
src/test/java/caosdb/server/scripting/TestServerSideScriptingCaller.java 81 additions, 0 deletions

...aosdb/server/scripting/TestServerSideScriptingCaller.java

with 147 additions and 8 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