Commits · 2.3 · INB / eTRANSAFE / pretox-rest-api

01 Mar, 2022 3 commits
- Merge branch 'develop' into 'master' · 00b368b2
  jcorvi authored Mar 01, 2022
```
Update .gitlab-ci.yml

See merge request !23
```
  00b368b2
- Update .gitlab-ci.yml · 054531a7
  jcorvi authored Mar 01, 2022
  
  054531a7
- Merge branch 'develop' into 'master' · 7828e959
  jcorvi authored Mar 01, 2022
```
Develop

See merge request !22
```
  7828e959
24 Feb, 2022 3 commits
- Merge branch 'upload-files' into 'develop' · 1fb6a261
  jcorvi authored Feb 24, 2022
```
Upload files

See merge request !21
```
  1fb6a261
- validation upload · 39a4ccc8
  Javi Corvi authored Feb 24, 2022
  
  39a4ccc8
- upload files validations · 7da56fb8
  Javi Corvi authored Feb 24, 2022
  
  7da56fb8
22 Feb, 2022 2 commits
- new feature for upload · 9fe09369
  Javi Corvi authored Feb 22, 2022
  
  9fe09369
- Merge branch 'toxhub-int' into 'develop' · 4054c689
  jcorvi authored Feb 22, 2022
```
Toxhub int

See merge request !20
```
  4054c689
19 Jan, 2022 2 commits
- Merge branch 'toxhub-int' of... · 23c450f9
  Javi Corvi authored Jan 19, 2022
```
Merge branch 'toxhub-int' of https://gitlab.bsc.es/inb/etransafe/pretox-rest-api.git into toxhub-int
```
  23c450f9
- authorization token not sended to api · b3b2dc1b
  Javi Corvi authored Jan 19, 2022
  
  b3b2dc1b
17 Jan, 2022 3 commits
- Update application-prod.properties · 674b80f8
  jcorvi authored Jan 17, 2022
  
  674b80f8
- liveness and readiness in keyclok flow · e2c842c9
  Javi Corvi authored Jan 17, 2022
  
  e2c842c9
- Merge branch 'develop' into 'toxhub-int' · 3ced7a4e
  jcorvi authored Jan 17, 2022
```
Develop

See merge request !19
```
  3ced7a4e
10 Jan, 2022 4 commits
- remove log · ab99ea4f
  Javi Corvi authored Jan 10, 2022
  
  ab99ea4f
- security change for readiness · bea94fb6
  Javi Corvi authored Jan 10, 2022
  
  bea94fb6
- readiness by readeness · 18398827
  Javi Corvi authored Jan 10, 2022
  
  18398827
- readeness and liveness outside security login · e2434848
  Javi Corvi authored Jan 10, 2022
  
  e2434848
29 Dec, 2021 1 commit
- new version oauth2 keycloak integration · 0b2d2ffd
  Javi Corvi authored Dec 29, 2021
  
  0b2d2ffd
24 Nov, 2021 3 commits
- Merge branch 'toxhub-int' into 'develop' · 6d114230
  jcorvi authored Nov 24, 2021
```
liveness and readeness

See merge request !18
```
  6d114230
- liveness and readeness · 5f782789
  Javi Corvi authored Nov 24, 2021
  
  5f782789
- Update .gitlab-ci.yml latest_develop · 9a4a314f
  jcorvi authored Nov 24, 2021
  
  9a4a314f
18 Nov, 2021 3 commits
- Merge branch 'develop' into 'master' · 4c26efaa
  jcorvi authored Nov 18, 2021
```
Develop

See merge request !17
```
  4c26efaa
- Merge branch 'allevidence' into 'develop' · 4ed5f658
  jcorvi authored Nov 18, 2021
```
users for demo

See merge request !16
```
  4ed5f658
- users for demo · f54fa4dc
  Javi Corvi authored Nov 18, 2021
  
  f54fa4dc
12 Nov, 2021 3 commits
- Merge branch 'develop' into 'master' · 25cb49f3
  jcorvi authored Nov 12, 2021
```
"Merge branch 'allevidence' into 'develop'"

See merge request !15
```
  25cb49f3
- Merge branch 'allevidence' of https://gitlab.bsc.es/inb/etransafe/pretox-rest-api into allevidence · ec4987b3
  Javi Corvi authored Nov 12, 2021
  
  ec4987b3
- Merge branch 'develop' into allevidence · 631948d5
  Javi Corvi authored Nov 12, 2021
  
  631948d5
10 Nov, 2021 4 commits
- Merge branch 'allevidence_2' into 'allevidence' · 1d03e12e
  jcorvi authored Nov 10, 2021
```
new version ready for presentation

See merge request !13
```
  1d03e12e
- new version ready for presentation · fef9e358
  Javi Corvi authored Nov 10, 2021
  
  fef9e358
- Merge branch 'allevidence_2' into 'allevidence' · fed1eea3
  jcorvi authored Nov 10, 2021
```
new version of tabs and bug fixes

See merge request !12
```
  fed1eea3
- new version of tabs and bug fixes · fe30117a
  Javi Corvi authored Nov 10, 2021
  
  fe30117a
09 Nov, 2021 4 commits
- Merge branch 'revert-f7d869f5' into 'develop' · 0e93210b
  jcorvi authored Nov 09, 2021
```
Revert "Merge branch 'allevidence' into 'develop'"

See merge request !9
```
  0e93210b
- Revert "Merge branch 'allevidence' into 'develop'" · 5df7944f
  jcorvi authored Nov 09, 2021
```
This reverts merge request !8
```
  5df7944f
- Merge branch 'allevidence' into 'develop' · f7d869f5
  jcorvi authored Nov 09, 2021
```
new draft version of api with modifications

See merge request !8
```
  f7d869f5
- new draft version of api with modifications · b829daf6
  Javi Corvi authored Nov 09, 2021
  
  b829daf6
02 Nov, 2021 2 commits

two facets missing bug · a0180df0
Javi Corvi authored Nov 02, 2021

a0180df0

Javi Corvi authored Nov 02, 2021

https://gitlab.bsc.es/inb/etransafe/pretox-rest-api.git into develop

Conflicts:
	src/main/java/es/bsc/inb/ades/rest/api/controllers/DocumentController.java
	src/main/resources/application.properties

301490df

21 Oct, 2021 3 commits
- Merge branch 'develop' into 'master' · e76edc20
  jcorvi authored Oct 21, 2021
```
Develop

See merge request !6
```
  e76edc20
- Merge branch 'draft_version' into 'develop' · 7b756ea2
  jcorvi authored Oct 21, 2021
```
rm

See merge request !5
```
  7b756ea2
- rm · 2dddd69b
  Javi Corvi authored Oct 21, 2021
  
  2dddd69b