Commits · master · ICAT / icat-plus

01 Feb, 2023 6 commits
- hot fix for fixing both test and prod env · 0a6c6236
  Marjolaine Bodin authored Feb 01, 2023
  
  0a6c6236
- fix linter issue · c490c35d
  Marjolaine Bodin authored Feb 01, 2023
  
  c490c35d
- fix linter issue · 8fced62f
  Marjolaine Bodin authored Feb 01, 2023
  
  8fced62f
- Update app/restore.config.example.js · 393f9cb0
  Alejandro De Maria Antolinos authored Feb 01, 2023
  
  393f9cb0
- Update app/tracking.config.example.js · b4119b79
  Alejandro De Maria Antolinos authored Feb 01, 2023
  
  b4119b79
- Merge branch '345-possibility-to-refresh-the-session' into 'master' · f7bad82b
  Alejandro De Maria Antolinos authored Feb 01, 2023
```
api method for refreshing session

Closes #345

See merge request !467
```
  f7bad82b
23 Jan, 2023 4 commits
- Merge branch 'fix-config_copy' into 'master' · ca04b65b
  Marjolaine Bodin authored Jan 23, 2023
```
add investigation config file in copy

See merge request !472
```
  ca04b65b
- add investigation config file in copy · 64f38947
  Marjolaine Bodin authored Jan 23, 2023
  
  64f38947
- Merge branch 'ci_restore_deploy' into 'master' · c134414b
  Marjolaine Bodin authored Jan 23, 2023
```
Restore build and deploy jobs

See merge request !471
```
  c134414b
- Restore build and deploy jobs · a8330b8c
  Marjolaine Bodin authored Jan 23, 2023
  
  a8330b8c
20 Jan, 2023 2 commits
- Merge branch '339-update_sample_desc' into 'master' · 3b80e36a
  Marjolaine Bodin authored Jan 20, 2023
```
Resolve "Improve samples"

See merge request !463
```
  3b80e36a
- Resolve "Improve samples" · da4757cd
  Marjolaine Bodin authored Jan 20, 2023
  
  da4757cd
19 Jan, 2023 7 commits
- Merge branch 'fix-compose_tests' into 'master' · f89be360
  Marjolaine Bodin authored Jan 19, 2023
```
Resolve "fix compose tests"

See merge request !470
```
  f89be360
- Resolve "fix compose tests" · 50cc43d8
  Marjolaine Bodin authored Jan 19, 2023
  
  50cc43d8
- comment for session refresh · c3fc0103
  Marcus Lewerenz authored Jan 19, 2023
  
  c3fc0103
- Merge branch '348-adapt_documentation' into 'master' · 27cbb626
  Marjolaine Bodin authored Jan 19, 2023
```
Resolve "Adapt documentation"

Closes #348

See merge request !469
```
  27cbb626
- Resolve "Adapt documentation" · 322e0597
  Marjolaine Bodin authored Jan 19, 2023
  
  322e0597
- Merge branch '242-improve_mint_doi_tests' into 'master' · 8464946b
  Marjolaine Bodin authored Jan 19, 2023
```
Resolve "DOI minting needs improvement and to be included in tests"

Closes #242

See merge request !447
```
  8464946b
- Resolve "DOI minting needs improvement and to be included in tests" · c524945c
  Marjolaine Bodin authored Jan 19, 2023
  
  c524945c
06 Jan, 2023 1 commit
- Proposal for merge 345 · 9d97b4ce
  Alejandro De Maria Antolinos authored Jan 06, 2023
  
  9d97b4ce
05 Jan, 2023 1 commit

Merge branch '345-possibility-to-refresh-the-session' of... · 4ba0f50a

Alejandro De Maria Antolinos authored Jan 05, 2023

Merge branch '345-possibility-to-refresh-the-session' of https://gitlab.esrf.fr/icat/icat-plus into 345-possibility-to-refresh-the-session

4ba0f50a

15 Dec, 2022 3 commits
- Merge branch 'fix_pages_job' into 'master' · 4ad148f0
  Marjolaine Bodin authored Dec 15, 2022
```
Fix coverage deploy page

See merge request !465
```
  4ad148f0
- Fix coverage deploy page · 8829f255
  Marjolaine Bodin authored Dec 15, 2022
  
  8829f255
- api method for refreshing session · 69c4ebfc
  Marcus Lewerenz authored Dec 15, 2022
  
  69c4ebfc
14 Dec, 2022 7 commits
- Update .gitlab-ci.yml file · 5d2647a7
  Alejandro De Maria Antolinos authored Dec 14, 2022
  
  5d2647a7
- Update .gitlab-ci.yml file · 0d1d2a48
  Alejandro De Maria Antolinos authored Dec 14, 2022
  
  0d1d2a48
- Update .gitlab-ci.yml file · b5b2a45c
  Alejandro De Maria Antolinos authored Dec 14, 2022
  
  b5b2a45c
- Update .gitlab-ci.yml file · f1b27a9c
  Alejandro De Maria Antolinos authored Dec 14, 2022
  
  f1b27a9c
- Update .gitlab-ci.yml file · 07d96aa6
  Alejandro De Maria Antolinos authored Dec 14, 2022
  
  07d96aa6
- Update .gitlab-ci.yml file · c304b340
  Alejandro De Maria Antolinos authored Dec 14, 2022
  
  c304b340
- There is a error when building pages: · 50df8aba
  Alejandro De Maria Antolinos authored Dec 14, 2022
```
```
  mv: 'public/coverage/' and 'public/coverage' are the same file
```
```
  50df8aba
12 Dec, 2022 3 commits
- Fix coverage · 54cfb3c3
  Alejandro De Maria Antolinos authored Dec 12, 2022
  
  54cfb3c3
- Merge branch '333-adapt-test-data-for-docker-compose-testing-environment' into 'master' · c3c1b218
  Alejandro De Maria Antolinos authored Dec 12, 2022
```
REsolve "Adapt test data for docker compose testing environment"

Closes #333

See merge request !450
```
  c3c1b218
- Resolve "Adapt test data for docker compose testing environment" · 581b3a01
  Alejandro De Maria Antolinos authored Dec 12, 2022
  
  581b3a01
05 Dec, 2022 2 commits
- Merge branch '344-use_dataacquisition_user' into 'master' · 6feef5d8
  Marjolaine Bodin authored Dec 05, 2022
```
Resolve "Dataacquisition user"

Closes #344

See merge request !462
```
  6feef5d8
- Resolve "Dataacquisition user" · da5b6337
  Marjolaine Bodin authored Dec 05, 2022
  
  da5b6337
29 Nov, 2022 2 commits
- Update app/routes/dataacquisition.routes.js · 440e1849
  Alejandro De Maria Antolinos authored Nov 29, 2022
  
  440e1849
- Quick patch because of problems with the beamlines · 159104a1
  Alejandro De Maria Antolinos authored Nov 29, 2022
  
  159104a1
23 Nov, 2022 2 commits
- Merge branch '339-improve_samples' into 'master' · 92e5fb94
  Marjolaine Bodin authored Nov 23, 2022
```
Resolve "Improve samples" - part1

See merge request !459
```
  92e5fb94
- Resolve "Improve samples" - part1 · 78f8c7e1
  Marjolaine Bodin authored Nov 23, 2022
  
  78f8c7e1