Merge branch 'develop' into 'feat/filter-datasets'
# Conflicts: # api/src/engine/connectors/datashield/main.connector.ts
No related branches found
No related tags found
Showing
- .gitbook/assets/image (1).png 0 additions, 0 deletions.gitbook/assets/image (1).png
- .gitbook/assets/image (2).png 0 additions, 0 deletions.gitbook/assets/image (2).png
- .gitbook/assets/image (3).png 0 additions, 0 deletions.gitbook/assets/image (3).png
- .gitbook/assets/image.png 0 additions, 0 deletions.gitbook/assets/image.png
- .gitlab-ci.yml 20 additions, 0 deletions.gitlab-ci.yml
- README.md 6 additions, 8 deletionsREADME.md
- SUMMARY.md 7 additions, 1 deletionSUMMARY.md
- api/docker-compose.yml 2 additions, 2 deletionsapi/docker-compose.yml
- api/src/auth/auth.resolver.spec.ts 13 additions, 3 deletionsapi/src/auth/auth.resolver.spec.ts
- api/src/auth/auth.resolver.ts 24 additions, 6 deletionsapi/src/auth/auth.resolver.ts
- api/src/config/matomo.config.ts 10 additions, 0 deletionsapi/src/config/matomo.config.ts
- api/src/engine/connectors/datashield/main.connector.ts 27 additions, 1 deletionapi/src/engine/connectors/datashield/main.connector.ts
- api/src/engine/connectors/exareme/converters.ts 8 additions, 0 deletionsapi/src/engine/connectors/exareme/converters.ts
- api/src/engine/connectors/exareme/main.connector.ts 17 additions, 22 deletionsapi/src/engine/connectors/exareme/main.connector.ts
- api/src/engine/engine.interfaces.ts 1 addition, 1 deletionapi/src/engine/engine.interfaces.ts
- api/src/engine/engine.resolver.ts 7 additions, 5 deletionsapi/src/engine/engine.resolver.ts
- api/src/engine/models/configuration.model.ts 4 additions, 0 deletionsapi/src/engine/models/configuration.model.ts
- api/src/engine/models/configuration/matomo.model.ts 13 additions, 0 deletionsapi/src/engine/models/configuration/matomo.model.ts
- api/src/files/files.controller.ts 2 additions, 1 deletionapi/src/files/files.controller.ts
- api/src/main/app.module.ts 2 additions, 1 deletionapi/src/main/app.module.ts
Please register or sign in to comment