Commits · e59b260b8ee021b684d26b230c80a417046a519e · hh1966 / chemotion_eln_server

21 Mar, 2019 1 commit
- Fix wellplate import · e59b260b
  hh1966 authored Mar 21, 2019
  
  e59b260b
20 Mar, 2019 2 commits
- Add activejob-status and refactor front-end code and api accordingly · 83a2aee3
  hh1966 authored Mar 20, 2019
  
  83a2aee3
- Add error handling to export/import front-end code · c3e85d0c
  hh1966 authored Mar 20, 2019
  
  c3e85d0c
19 Mar, 2019 1 commit
- Add json schema and rename data.json to export.json · 0d21734f
  hh1966 authored Mar 19, 2019
  
  0d21734f
15 Mar, 2019 3 commits
- Move Export/Import API to CollectionAPI and Export/Import Fetcher to CollectionsFetcher · 4eb57b21
  hh1966 authored Mar 15, 2019
  
  4eb57b21
- Add polling for import · 056fe057
  hh1966 authored Mar 15, 2019
  
  056fe057
- Add front-end notification for export · 9d46d5f3
  hh1966 authored Mar 15, 2019
  
  9d46d5f3
14 Mar, 2019 6 commits
- Add support for split samples and add short_label to import · 508f3c29
  hh1966 authored Mar 14, 2019
  
  508f3c29
- Import images · 741144e5
  hh1966 authored Mar 14, 2019
  
  741144e5
- Export images and reorganize Export::ExportCollections · aa74a8cd
  hh1966 authored Mar 14, 2019
  
  aa74a8cd
- Fix import_collections · 890dad5d
  hh1966 authored Mar 14, 2019
  
  890dad5d
- Handle user_id, created_by, and created_for in Export · 245a347a
  hh1966 authored Mar 14, 2019
  
  245a347a
- Create import_path if it does not exist · 442853e1
  hh1966 authored Mar 14, 2019
  
  442853e1
13 Mar, 2019 3 commits
- Add support for nested collections to Export/Import · 5e3d4be6
  hh1966 authored Mar 13, 2019
  
  5e3d4be6
- Simplify Export/Import APIs and Jobs · cbc33c56
  hh1966 authored Mar 13, 2019
  
  cbc33c56
- Check if deleted_at is nil in export · f3206947
  hh1966 authored Mar 13, 2019
  
  f3206947
12 Mar, 2019 4 commits
- Import research plans · 67b0cdd7
  hh1966 authored Mar 12, 2019
  
  67b0cdd7
- Import wellplates, wells, and screens · c7c9033c
  hh1966 authored Mar 12, 2019
  
  c7c9033c
- Import reactions_samples · 46009d58
  hh1966 authored Mar 12, 2019
  
  46009d58
- Remove table_name from Export/Import logic · 676530e3
  hh1966 authored Mar 12, 2019
  
  676530e3
11 Mar, 2019 4 commits
- Import reactions · 5bfacf9b
  hh1966 authored Mar 11, 2019
  
  5bfacf9b
- Import literals and literature · eca94cf3
  hh1966 authored Mar 11, 2019
  
  eca94cf3
- Import container and attachments · cdd5dd38
  hh1966 authored Mar 11, 2019
  
  cdd5dd38
- Refactor Export and Import again · caec810c
  hh1966 authored Mar 11, 2019
  
  caec810c
07 Mar, 2019 1 commit
- Add Import API and front-end code for Import · 19fdf394
  hh1966 authored Mar 07, 2019
  
  19fdf394
06 Mar, 2019 1 commit
- Add front end code for export and implement polling · 3c91bb3e
  hh1966 authored Mar 06, 2019
  
  3c91bb3e
04 Mar, 2019 6 commits
- Refactor ExportAPI and add zip creation · 08a02d34
  hh1966 authored Mar 04, 2019
  
  08a02d34
- Add all containers and attachments to ExportCollectionJson · fede9dc2
  hh1966 authored Mar 04, 2019
  
  fede9dc2
- Add (some) containers and attachments to ExportCollectionJson · aca59961
  hh1966 authored Mar 01, 2019
  
  aca59961
- Extend ExportCollectionJson · c4aaa39b
  hh1966 authored Mar 01, 2019
  
  c4aaa39b
- Add ExportCollectionJson class · 97304dd3
  hh1966 authored Feb 25, 2019
```
* Use generic fetch_many and fetch_one methods to traverse the data model
* Map database ids to uuid to make the export json interoperable
```
  97304dd3
- Add export api and a job to create export files · afef0409
  hh1966 authored Feb 22, 2019
  
  afef0409
27 Feb, 2019 6 commits
- Merge branch '673-display-sample-inchikey' into 'development' · 4131ebcd
  pierre.tremouilhac authored Feb 27, 2019
```
Resolve "display sample inchikey"

Closes #673

See merge request ComPlat/chemotion_ELN!912
```
  4131ebcd
- display sample inchikey · 4688b12b
  pei-chi.huang authored Feb 26, 2019
  
  4688b12b
- Merge branch '682-spectra-viewer-nmrshiftdb' into 'development' · e58114cd
  pierre.tremouilhac authored Feb 27, 2019
```
Resolve "spectra-viewer nmrshiftdb"

Closes #682

See merge request ComPlat/chemotion_ELN!910
```
  e58114cd
- update package-lock · cb35cc7e
  jasonych99 authored Feb 27, 2019
  
  cb35cc7e
- Merge branch '684-change-user-info-on-admin-page' into 'development' · a006aefe
  pierre.tremouilhac authored Feb 27, 2019
```
Resolve "change user info on admin page"

Closes #684

See merge request ComPlat/chemotion_ELN!913
```
  a006aefe
- admin edit user · 7292ee44
  pei-chi.huang authored Feb 26, 2019
  
  7292ee44
26 Feb, 2019 2 commits
- FE: integrate prediction nmr · 8de60e01
  jasonych99 authored Feb 26, 2019
  
  8de60e01
- BE: integrate prediction nmr · 799ed658
  jasonych99 authored Feb 26, 2019
  
  799ed658