Commits · bceeacefa279725d2dd33210b75b91352751adcf · gy4443 / chemotion_eln_server

30 May, 2016 8 commits
- Merge pull request #52 from ComPlat/sample-list-sorting-265 · bceeacef
  PiTrem authored May 30, 2016
```
sample list sorting
close #265
```
  bceeacef
- Merge pull request #50 from ComPlat/ui-screen-size-optimizations · 354f0ef7
  PiTrem authored May 30, 2016
```
Screens optimizations close #269
```
  354f0ef7
- sample list sorting resolve #265 · 9a4aee9d
  jasonych99 authored May 25, 2016
  
  9a4aee9d
- Merge pull request #51 from ComPlat/minor_fixes · c0083bd4
  PiTrem authored May 30, 2016
```
Minor fixes
```
  c0083bd4
- Merge pull request #49 from ComPlat/shortcuts · c137607c
  PiTrem authored May 30, 2016
```
Shortcuts
close #233
```
  c137607c
- refactor shortcut to name_abbreviation · 8834c9dd
  christopher.ossner2 authored May 30, 2016
  
  8834c9dd
- Screens optimizations resolve #269 · 18efe285
  Serhii Kotov authored May 30, 2016
  
  18efe285
- added column for shortcuts to users table · 2ce220bb
  Christoph Ossner authored May 24, 2016
```
added fild for shortcut on sign-up page

added shortcut to devise fields, added validations for shortcut

changed regExp for shortcut validation
```
  2ce220bb
27 May, 2016 2 commits
- fix wrong module use · 439a104f
  PiTrem authored May 27, 2016
```
upd eslintrc, package.json
```
  439a104f
- rm initializer for scifinding · f3247702
  PiTrem authored May 27, 2016
```
(default var assignment is done in the engine itself)
```
  f3247702
24 May, 2016 4 commits
- Merge pull request #47 from ComPlat/scheme-pic-#261 · bafa40fc
  Serhii Kotov authored May 24, 2016
```
fix scheme picture resolve #261
```
  bafa40fc
- Merge pull request #48 from ComPlat/fix_clean_scifi · 7102b830
  Serhii Kotov authored May 24, 2016
```
Fix clean scifi
```
  7102b830
- fix n clean resolve scifinding #135 #241 #242 #247 #256 · cb6038c0
  PiTrem authored May 24, 2016
```
upd eslintrc
```
  cb6038c0
- fix scheme picture resolve #261 · 615c44ac
  jasonych99 authored May 24, 2016
  
  615c44ac
23 May, 2016 2 commits
- Merge pull request #46 from ComPlat/show-external-label · d7cf02a6
  PiTrem authored May 23, 2016
```
displayed sample label close #246
```
  d7cf02a6
- switch displayed sample label resolve #246 · 7520f691
  jasonych99 authored May 23, 2016
  
  7520f691
20 May, 2016 8 commits
- Merge branch 'master' of github.com:ComPlat/chemotion_ELN · b1f7e51e
  PiTrem authored May 20, 2016
  
  b1f7e51e
- Merge pull request #45 from ComPlat/chemstach_changeset · c4151468
  Serhii Kotov authored May 20, 2016
```
Refactor plugin import/export
```
  c4151468
- Refactor plugin import/export · f8de5751
  PiTrem authored May 20, 2016
```
* subject refactoring
* update browserify-rails
```
  f8de5751
- Merge pull request #43 from ComPlat/user-profile · 28998365
  PiTrem authored May 20, 2016
```
create user-profile: all good thx
 #234
```
  28998365
- add rspec for Profile MVC resolve #234 · 98efa231
  jasonych99 authored May 20, 2016
  
  98efa231
- create Profile MVC · b1db21fb
  jasonych99 authored May 20, 2016
  
  b1db21fb
- create Profile db · 5be6cea6
  jasonych99 authored May 20, 2016
  
  5be6cea6
- Merge pull request #42 from ComPlat/ketcher-as-engine · d089cde3
  PiTrem authored May 20, 2016
```
Move Ketcher-related code to Ketcherails engine
close #257
```
  d089cde3
19 May, 2016 1 commit
- Move Ketcher-related code to Ketcherails engine resolve #257 · 49274518
  Serhii Kotov authored May 18, 2016
  
  49274518
18 May, 2016 3 commits
- Merge pull request #41 from ComPlat/fix-generate-report#239 · ac50c229
  Serhii Kotov authored May 18, 2016
```
fix generate report action resolve #239
```
  ac50c229
- add solvent · e63a62b8
  PiTrem authored May 18, 2016
  
  e63a62b8
- fix generate report action resolve #239 · 56d45e67
  jasonych99 authored May 18, 2016
  
  56d45e67
17 May, 2016 5 commits
- Merge pull request #40 from ComPlat/fix-search-by-short-label-236 · ab7d0076
  PiTrem authored May 17, 2016
```
Fix sample short label search close #236
```
  ab7d0076
- Fix sample short label search resolve #236 · 3487ce66
  Serhii Kotov authored May 17, 2016
  
  3487ce66
- Update .gitignore · bf8af646
  PiTrem authored May 17, 2016
```
mc setting
```
  bf8af646
- Merge pull request #39 from ComPlat/fix-add-residue-to-existing-sample · 034f2764
  PiTrem authored May 17, 2016
```
Restore missing form submit method close #235
```
  034f2764
- Restore missing form submit method resolve #235 · b930bb9c
  Serhii Kotov authored May 17, 2016
  
  b930bb9c
13 May, 2016 2 commits
- Merge pull request #38 from ComPlat/optimize-ketcher-226 · 67ca0f9e
  PiTrem authored May 13, 2016
```
Use CSS sprites for icons in Ketcher, user precompiled JS for Ketcher…close #231
```
  67ca0f9e
- Use CSS sprites for icons in Ketcher, user precompiled JS for Ketcher resolve #226 · 89abee01
  Serhii Kotov authored May 12, 2016
  
  89abee01
11 May, 2016 1 commit
- Merge pull request #37 from ComPlat/fix-molecule-dnd-residue · 6306206a
  PiTrem authored May 11, 2016
```
Fix residues molecule DND, go back to reaction after sample update
close #229 #230
```
  6306206a
10 May, 2016 1 commit
- Fix residues molecule DND, go back to reaction after sample update · f9cc5f06
  Serhii Kotov authored May 10, 2016
  
  f9cc5f06
03 May, 2016 3 commits
- Force Capistrano to use specific node version on deploy · 23063c96
  Serhii Kotov authored May 03, 2016
  
  23063c96
- Merge pull request #36 from ComPlat/react-15.0.1-task-220 · e2887a67
  PiTrem authored May 03, 2016
```
React 15.0.1 task 220
clos #220
```
  e2887a67
- Update node to 4.4.3 · 9f38c663
  Serhii Kotov authored May 03, 2016
  
  9f38c663