Commits · master · ICAT / Datahub

10 Jul, 2020 8 commits
- Run npm install redux-devtools-extension · a363aa46
  Alejandro De Maria Antolinos authored Jul 10, 2020
  
  a363aa46
- Moved redux-devtools-extension from dev to dependencies · f2203f78
  Alejandro De Maria Antolinos authored Jul 10, 2020
  
  f2203f78
- Fixed lint issues · 5fc942cf
  Alejandro De Maria Antolinos authored Jul 10, 2020
  
  5fc942cf
- Merge branch 'RC' into 'master' · ea2f02bd
  Alejandro De Maria Antolinos authored Jul 10, 2020
```
Rc

Closes #296, #297, #290, #283, and #284

See merge request !312
```
  ea2f02bd
- Fixed bug with tinyParams · 48c6969a
  Alejandro De Maria Antolinos authored Jul 10, 2020
  
  48c6969a
- Update config.js · 0fbf19b4
  Alejandro De Maria Antolinos authored Jul 10, 2020
  
  0fbf19b4
- Release candidate · 6cb53145
  Alejandro De Maria Antolinos authored Jul 10, 2020
  
  6cb53145
- Fixed conflicts · d9842de9
  Alejandro De Maria Antolinos authored Jul 10, 2020
  
  d9842de9
09 Jul, 2020 21 commits
- Merge branch 'issue296_2' into 'SampleTracking' · 9c47c2fb
  Alejandro De Maria Antolinos authored Jul 09, 2020
```
Issue296 2

See merge request !310
```
  9c47c2fb
- desactivate many logbook tests which are not passing because of hook problem.... · 434f26b0
  Maxime Chaillet authored Jul 09, 2020
```
desactivate many logbook tests which are not passing because of hook problem. It fixes #296
```
  434f26b0
- Fix conflicts after merging master into SampleTracking Branch. Fix a test... · f4322650
  Maxime Chaillet authored Jul 09, 2020
```
Fix conflicts after merging master into SampleTracking Branch. Fix a test regression. All tests are not passing.
```
  f4322650
- ParcelPage now sets breadcrumbs · de802987
  Loic Huder authored Jul 09, 2020
  
  de802987
- Re-added clicking features of ParcelTable lost in the merges · b33406cd
  Loic Huder authored Jul 09, 2020
  
  b33406cd
- Fix format and typo · 573103d6
  Loic Huder authored Jul 09, 2020
  
  573103d6
- Merge branch 'issue_292' into 'SampleTracking' · 03f727a3
  Loic Huder authored Jul 09, 2020
```
Work done for #292

See merge request !305
```
  03f727a3
- Fixed conflicts · 67f95158
  Alejandro De Maria Antolinos authored Jul 09, 2020
  
  67f95158
- Merge branch 'parcel-enhancements' into 'SampleTracking' · e31e001a
  Alejandro De Maria Antolinos authored Jul 09, 2020
```
Add various enhancements to ParcelPage

See merge request !308
```
  e31e001a
- Add various enhancements to ParcelPage · cfcef4c7
  Loic Huder authored Jul 09, 2020
  
  cfcef4c7
- It fixes #297 · 9bbc2018
  Alejandro De Maria Antolinos authored Jul 09, 2020
  
  9bbc2018
- Merge branch 'SampleTracking' of https://gitlab.esrf.fr/icat/E-DataPortal into issue_292 · fcb76ebb
  Alejandro De Maria Antolinos authored Jul 09, 2020
  
  fcb76ebb
- Merge branch 'issue_292' of https://gitlab.esrf.fr/demariaa/E-DataPortal into issue_292 · 4eaca3c2
  Alejandro De Maria Antolinos authored Jul 09, 2020
  
  4eaca3c2
- suggestions MR · 3920892e
  Alejandro De Maria Antolinos authored Jul 09, 2020
  
  3920892e
- Apply 1 suggestion(s) to 1 file(s) · e5302a08
  Alejandro De Maria Antolinos authored Jul 09, 2020
  
  e5302a08
- Merge branch 'safefy-input' into 'SampleTracking' · 0e8e18f9
  Alejandro De Maria Antolinos authored Jul 09, 2020
```
Implemented InputModal for safety approval

See merge request !306
```
  0e8e18f9
- Implemented InputModal for safety approval · 2f400fc1
  Loic Huder authored Jul 09, 2020
  
  2f400fc1
- Fixed conflict · 513b00bc
  Alejandro De Maria Antolinos authored Jul 09, 2020
  
  513b00bc
- Merge branch 'dangerous-goods' into 'SampleTracking' · 346305dd
  Alejandro De Maria Antolinos authored Jul 09, 2020
```
Implemented DangerousGoodsModal. Also added safety input modal through the same mechanism.

See merge request !304
```
  346305dd
- Work done for #292 · 69b5a1f4
  Alejandro De Maria Antolinos authored Jul 09, 2020
  
  69b5a1f4
- Implemented DangerousGoodsModal. Also added safety input modal through the same mechanism. · 64ffb89f
  Loic Huder authored Jul 09, 2020
  
  64ffb89f
08 Jul, 2020 11 commits
- Merge branch 'parcel-labels' into 'SampleTracking' · 8e0fe132
  Alejandro De Maria Antolinos authored Jul 08, 2020
```
Added link for downloading parcel labels in the ParcelPage

See merge request !303
```
  8e0fe132
- Added label button to parcel table · 285e7a12
  Loic Huder authored Jul 08, 2020
  
  285e7a12
- Added link for downloading parcel labels in the ParcelPage · 25087a55
  Loic Huder authored Jul 08, 2020
  
  25087a55
- Fixed parcel tab not displayed when shipment was not configured · a4547daa
  Loic Huder authored Jul 08, 2020
  
  a4547daa
- Merge branch 'consistent-parcel-table' into 'SampleTracking' · f09632f5
  Alejandro De Maria Antolinos authored Jul 08, 2020
```
All parcel tables now use the same component ParcelTable

See merge request !302
```
  f09632f5
- All parcel tables now use the same component ParcelTable · cb7354c6
  Loic Huder authored Jul 08, 2020
  
  cb7354c6
- Merge branch 'issue_290' into 'SampleTracking' · e631249b
  Loic Huder authored Jul 08, 2020
```
It should fix #290

See merge request !301
```
  e631249b
- It should fix #290 · 72f50e71
  Alejandro De Maria Antolinos authored Jul 08, 2020
  
  72f50e71
- Merge branch 'item-table' into 'SampleTracking' · a6b78907
  Alejandro De Maria Antolinos authored Jul 08, 2020
```
Added sample column and default sorting to ItemTable

See merge request !300
```
  a6b78907
- Added sample column and default sorting to ItemTable · d0e6d5ac
  Loic Huder authored Jul 08, 2020
  
  d0e6d5ac
- Merge branch 'item-table' into 'SampleTracking' · 607ef86f
  Alejandro De Maria Antolinos authored Jul 08, 2020
```
Replaced ItemPages by an ItemTable

See merge request !299
```
  607ef86f