Merge branch 'dev' into f-move
No related branches found
No related tags found
This commit is part of merge request !5. Comments created here will be created in the context of that merge request.
Showing
- .gitlab-ci.yml 7 additions, 9 deletions.gitlab-ci.yml
- CHANGELOG.md 12 additions, 0 deletionsCHANGELOG.md
- DEPENDENCIES.md 1 addition, 0 deletionsDEPENDENCIES.md
- Makefile 6 additions, 4 deletionsMakefile
- README.md 3 additions, 1 deletionREADME.md
- README_SETUP.md 7 additions, 2 deletionsREADME_SETUP.md
- RELEASE_GUIDELINES.md 3 additions, 3 deletionsRELEASE_GUIDELINES.md
- caosdb-webui 1 addition, 1 deletioncaosdb-webui
- conf/core/server.conf 8 additions, 0 deletionsconf/core/server.conf
- doc/Query.md 6 additions, 6 deletionsdoc/Query.md
- doc/devel/Benchmarking.md 265 additions, 36 deletionsdoc/devel/Benchmarking.md
- misc/bend_symlinks/src/main.sh 3 additions, 1 deletionmisc/bend_symlinks/src/main.sh
- misc/bend_symlinks/src/utils.sh 2 additions, 0 deletionsmisc/bend_symlinks/src/utils.sh
- misc/bend_symlinks/test/test_suite.sh 9 additions, 4 deletionsmisc/bend_symlinks/test/test_suite.sh
- src/doc/CaosDB-Query-Language.md 1 addition, 1 deletionsrc/doc/CaosDB-Query-Language.md
- src/doc/Permissions.rst 3 additions, 2 deletionssrc/doc/Permissions.rst
- src/doc/administration/configuration.rst 9 additions, 6 deletionssrc/doc/administration/configuration.rst
- src/doc/administration/maintenance.rst 19 additions, 13 deletionssrc/doc/administration/maintenance.rst
- src/doc/administration/server_side_scripting.rst 1 addition, 1 deletionsrc/doc/administration/server_side_scripting.rst
- src/doc/conf.py 9 additions, 4 deletionssrc/doc/conf.py
Loading
Please register or sign in to comment