-
- Downloads
Merge branch 'dev' into f-admin-tools
# Conflicts: # src/caosdb/utils/caosdb_admin.py
Showing
- .gitlab-ci.yml 10 additions, 6 deletions.gitlab-ci.yml
- .gitlab/merge_request_templates/Default.md 0 additions, 49 deletions.gitlab/merge_request_templates/Default.md
- CHANGELOG.md 73 additions, 0 deletionsCHANGELOG.md
- Makefile 15 additions, 0 deletionsMakefile
- README_SETUP.md 20 additions, 6 deletionsREADME_SETUP.md
- RELEASE_GUIDELINES.md 7 additions, 6 deletionsRELEASE_GUIDELINES.md
- examples/pycaosdb.ini 3 additions, 0 deletionsexamples/pycaosdb.ini
- setup.py 17 additions, 7 deletionssetup.py
- src/caosdb/apiutils.py 88 additions, 16 deletionssrc/caosdb/apiutils.py
- src/caosdb/common/administration.py 64 additions, 14 deletionssrc/caosdb/common/administration.py
- src/caosdb/common/datatype.py 54 additions, 2 deletionssrc/caosdb/common/datatype.py
- src/caosdb/common/models.py 352 additions, 146 deletionssrc/caosdb/common/models.py
- src/caosdb/configuration.py 43 additions, 1 deletionsrc/caosdb/configuration.py
- src/caosdb/connection/authentication/interface.py 1 addition, 1 deletionsrc/caosdb/connection/authentication/interface.py
- src/caosdb/connection/authentication/keyring.py 2 additions, 7 deletionssrc/caosdb/connection/authentication/keyring.py
- src/caosdb/connection/connection.py 1 addition, 1 deletionsrc/caosdb/connection/connection.py
- src/caosdb/schema-pycaosdb-ini.yml 90 additions, 0 deletionssrc/caosdb/schema-pycaosdb-ini.yml
- src/caosdb/utils/caosdb_admin.py 41 additions, 10 deletionssrc/caosdb/utils/caosdb_admin.py
- src/caosdb/utils/plantuml.py 80 additions, 6 deletionssrc/caosdb/utils/plantuml.py
- src/caosdb/yamlapi.py 39 additions, 2 deletionssrc/caosdb/yamlapi.py
Loading
Please register or sign in to comment