Commit 8ee7cc03 authored 6 years ago by Alexander Schlemmer

Merge branch 'f-server-side-scripting' of...

Merge branch 'f-server-side-scripting' of gitlab.gwdg.de:bmp-caosdb/caosdb-server into f-server-side-scripting

parents 354c1c93 19124d74

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/caosdb/server/accessControl/UserSources.java 2 additions, 1 deletion

src/main/java/caosdb/server/accessControl/UserSources.java
src/main/java/caosdb/server/database/backend/transaction/DeleteEntityProperties.java 1 addition, 4 deletions

.../database/backend/transaction/DeleteEntityProperties.java
src/main/java/caosdb/server/database/backend/transaction/DeleteFile.java 1 addition, 1 deletion

...aosdb/server/database/backend/transaction/DeleteFile.java
src/main/java/caosdb/server/database/backend/transaction/DeleteSparseEntity.java 1 addition, 4 deletions

...rver/database/backend/transaction/DeleteSparseEntity.java
src/main/java/caosdb/server/database/backend/transaction/GetChildren.java 1 addition, 1 deletion

...osdb/server/database/backend/transaction/GetChildren.java
src/main/java/caosdb/server/database/backend/transaction/GetDependentEntities.java 1 addition, 1 deletion

...er/database/backend/transaction/GetDependentEntities.java
src/main/java/caosdb/server/database/backend/transaction/GetFileIterator.java 1 addition, 1 deletion

.../server/database/backend/transaction/GetFileIterator.java
src/main/java/caosdb/server/database/backend/transaction/GetIDByName.java 1 addition, 1 deletion

...osdb/server/database/backend/transaction/GetIDByName.java
src/main/java/caosdb/server/database/backend/transaction/InsertEntityDatatype.java 0 additions, 3 deletions

...er/database/backend/transaction/InsertEntityDatatype.java
src/main/java/caosdb/server/database/backend/transaction/InsertEntityProperties.java 3 additions, 3 deletions

.../database/backend/transaction/InsertEntityProperties.java
src/main/java/caosdb/server/database/backend/transaction/InsertFile.java 2 additions, 3 deletions

...aosdb/server/database/backend/transaction/InsertFile.java
src/main/java/caosdb/server/database/backend/transaction/InsertLogRecord.java 2 additions, 2 deletions

.../server/database/backend/transaction/InsertLogRecord.java
src/main/java/caosdb/server/database/backend/transaction/InsertSparseEntity.java 0 additions, 3 deletions

...rver/database/backend/transaction/InsertSparseEntity.java
src/main/java/caosdb/server/database/backend/transaction/RegisterSubDomain.java 1 addition, 1 deletion

...erver/database/backend/transaction/RegisterSubDomain.java
src/main/java/caosdb/server/database/backend/transaction/RetrieveAll.java 1 addition, 1 deletion

...osdb/server/database/backend/transaction/RetrieveAll.java
src/main/java/caosdb/server/database/backend/transaction/RetrieveAllUncheckedFiles.java 1 addition, 1 deletion

...tabase/backend/transaction/RetrieveAllUncheckedFiles.java
src/main/java/caosdb/server/database/backend/transaction/RetrieveDatatypes.java 1 addition, 1 deletion

...erver/database/backend/transaction/RetrieveDatatypes.java
src/main/java/caosdb/server/database/backend/transaction/RetrieveFullEntity.java 11 additions, 3 deletions

...rver/database/backend/transaction/RetrieveFullEntity.java
src/main/java/caosdb/server/database/backend/transaction/RetrieveLogRecord.java 3 additions, 3 deletions

...erver/database/backend/transaction/RetrieveLogRecord.java
src/main/java/caosdb/server/database/backend/transaction/RetrieveParents.java 2 additions, 2 deletions

.../server/database/backend/transaction/RetrieveParents.java

with 36 additions and 40 deletions

Please register or to comment