Commits · e2bd9b43ccced98e4e0e503fe4a5fe1e0d07b31a · gy4443 / chemotion_eln_server

28 Jun, 2017 11 commits
- Merge branch '146-daset-inbox-tree-view' into 'development' · e2bd9b43
  pierre.tremouilhac authored Jun 28, 2017
```
Resolve "dataset mail inbox tree view"

Closes #146

See merge request !342
```
  e2bd9b43
- Merge branch '161-attachament-has-a-folder-path' into 'development' · 739c9240
  pierre.tremouilhac authored Jun 28, 2017
```
add column folder to attachment

Closes #161

See merge request !352
```
  739c9240
- add column folder to attachment · dd53708b
  pierre.tremouilhac authored Jun 28, 2017
  
  dd53708b
- Merge branch '167-fix-sample-detail-container-preview-in-firefox' into 'development' · 206dec19
  pierre.tremouilhac authored Jun 28, 2017
```
set mozilla specific scss for sample-detail-preview checkbox

Closes #167

See merge request !350
```
  206dec19
- collector deactivated · d449dd3d
  jpotthoff authored Jun 28, 2017
  
  d449dd3d
- set mozilla specific scss for checkbox · 3d4b8503
  jasonych99 authored Jun 28, 2017
  
  3d4b8503
- Merge branch '168-add-30sec-timeout-to-report-generation' into 'development' · fb2ea6d4
  pierre.tremouilhac authored Jun 28, 2017
```
Report updateQueue status for every 30sec

Closes #168

See merge request !351
```
  fb2ea6d4
- Report updateQueue status for every 30sec · 41814d70
  jasonych99 authored Jun 28, 2017
  
  41814d70
- Merge branch '165-input-fields-disabled-for-read-only-element' into 'development' · b27aea60
  pierre.tremouilhac authored Jun 28, 2017
```
Resolve "input fields disabled for read only element"

Closes #165

See merge request !349
```
  b27aea60
- Merge branch '150-selected-element-counter-to-update' into 'development' · 0b3436cb
  pierre.tremouilhac authored Jun 28, 2017
```
Fix selected counter

Closes #150

See merge request !348
```
  0b3436cb
- Merge branch '158-dataset-name-should-not-be-blank' into 'development' · e48b5d93
  pierre.tremouilhac authored Jun 28, 2017
```
Dataset renaming on first attachment

Closes #158

See merge request !347
```
  e48b5d93
27 Jun, 2017 1 commit
- schedule entry for mail collector · 07f978a9
  jpotthoff authored Jun 27, 2017
  
  07f978a9
23 Jun, 2017 11 commits
- a user can add analysis for its own collection. · d45ac8ce
  jasonych99 authored Jun 22, 2017
  
  d45ac8ce
- a guest can not delete attachment. · 3b19749c
  jasonych99 authored Jun 22, 2017
  
  3b19749c
- disabled · 033ee216
  jasonych99 authored Jun 21, 2017
  
  033ee216
- Fix selected counter · c9202b6b
  An Nguyen authored Jun 23, 2017
  
  c9202b6b
- Dataset renaming on first attachment · def06f2d
  An Nguyen authored Jun 23, 2017
```
- Dataset name is only be renamed on first attachment
- Name still remain if all attachments are deleted
```
  def06f2d
- Merge branch 'config-upg' into 'development' · 1a474f3d
  pierre.tremouilhac authored Jun 23, 2017
```
fx

See merge request !346
```
  1a474f3d
- fx · b38d8262
  pierre.tremouilhac authored Jun 23, 2017
  
  b38d8262
- Merge branch 'config-upg' into 'development' · 5dc59992
  pierre.tremouilhac authored Jun 23, 2017
```
upd config deploy/backup

See merge request !345
```
  5dc59992
- upd config deploy/backup · 07a3e92b
  pierre.tremouilhac authored Jun 23, 2017
```
dont rsync images/qr
added rsync/symlink tmp/uploads
disabled mail schedule
bckup db port from db config
```
  07a3e92b
- Merge branch '162-upload-attachment-for-sample-analysis-thru-reaction' into 'development' · fc68d561
  pierre.tremouilhac authored Jun 23, 2017
```
Fix product attachment uploading through reaction

Closes #162

See merge request !344
```
  fc68d561
- Fix product attachment uploading through reaction · efcfbf34
  An Nguyen authored Jun 23, 2017
```
- Fix warning of collection tag
- Fix attachment uploading in reaction products analyses
```
  efcfbf34
22 Jun, 2017 3 commits
- finished · d80439a7
  jpotthoff authored Jun 22, 2017
  
  d80439a7
- Merge branch '163-molecule-strucuture-search-sum_formula' into 'development' · 0fd2621d
  pierre.tremouilhac authored Jun 22, 2017
```
Bug fixed for structure search / molecule sort

Closes #163

See merge request !343
```
  0fd2621d
- Bug fixed for structure search / molecule sort · d8ed15d2
  An Nguyen authored Jun 22, 2017
  
  d8ed15d2
21 Jun, 2017 1 commit
- mailcollector adapted to new storage concept · 0dc0fad4
  jpotthoff authored Jun 21, 2017
  
  0dc0fad4
20 Jun, 2017 2 commits
- Merge branch '159-analyses-accordeon-list-to-show-preview-content' into 'development' · bdbd6cb7
  pierre.tremouilhac authored Jun 20, 2017
```
analyses preview shows content not description

Closes #159

See merge request !341
```
  bdbd6cb7
- analyses preview shows content not description · b8315d23
  jasonych99 authored Jun 19, 2017
  
  b8315d23
19 Jun, 2017 4 commits
- Merge branch '157-fix-regenerate_thumbnail' into 'development' · dd6443d2
  pierre.tremouilhac authored Jun 19, 2017
```
fix regenerate_thumbnail

Closes #157

See merge request !340
```
  dd6443d2
- update · 2e629283
  jpotthoff authored Jun 19, 2017
  
  2e629283
- merge attachment_api, container_serializer · b03f9e44
  jpotthoff authored Jun 19, 2017
  
  b03f9e44
- cache logic close detail view · 3be16af4
  jpotthoff authored Jun 19, 2017
  
  3be16af4
15 Jun, 2017 1 commit
- fix regenerate_thumbnail · 9098df16
  pierre.tremouilhac authored Jun 15, 2017
  
  9098df16
14 Jun, 2017 3 commits
- Merge branch '157-fix-regenerate_thumbnail' into 'development' · 48482bae
  pierre.tremouilhac authored Jun 14, 2017
```
minor storage fixes

Closes #157

See merge request !339
```
  48482bae
- minor storage fixes · fe2210ca
  pierre.tremouilhac authored Jun 14, 2017
```
minor container impr
```
  fe2210ca
- Merge branch '157-fix-regenerate_thumbnail' into 'development' · 17cc76fa
  pierre.tremouilhac authored Jun 14, 2017
```
fix regenerate thumbnail

Closes #157

See merge request !338
```
  17cc76fa
13 Jun, 2017 3 commits
- bug fixes · a5a7641f
  jpotthoff authored Jun 13, 2017
  
  a5a7641f
- fix regenerate thumbnail · 1d8455d2
  pierre.tremouilhac authored Jun 13, 2017
  
  1d8455d2
- Merge branch '156-storage-upg-fix' into 'development' · fedd3b88
  pierre.tremouilhac authored Jun 13, 2017
```
storage upg fix

Closes #156

See merge request !337
```
  fedd3b88