Commit graph

5873 commits

Author SHA1 Message Date
Jure Grabnar
0ee0b1c834 Fix file preview not showing in modal when processing is done
Close SCI-3587
2019-07-08 12:45:22 +02:00
Jure Grabnar
20134c9f8a
Features/protocolsio integration (#1893)
Features/protocolsio integration
2019-07-03 17:32:20 +02:00
Jure Grabnar
721bb9ab77
SCI-3649 All reagent data from step are not imported (#1881)
SCI-3649 All reagent data from step are not imported
2019-07-03 16:54:25 +02:00
aignatov-bio
09dacf3be2
Fix infinite update for image annotation (#1889) 2019-07-03 15:35:49 +02:00
aignatov-bio
d147e8260d
Fix issue with moving protocol in repository (#1887) 2019-07-03 15:35:37 +02:00
Miha Mencin
5a437c0a0f coding style fixes 2019-07-03 15:32:55 +02:00
Miha Mencin
964e91e1d2 removi mol weight from general section 2019-07-03 15:16:47 +02:00
Jure Grabnar
e965866d57
SCI-3648 Error at importing one protocol without steps (#1883)
SCI-3648 Error at importing one protocol without steps
2019-07-03 14:43:49 +02:00
Miha Mencin
669592f62c
Merge pull request #1886 from biosistemika/SCI-3640-fix-safari-search-bar
SCI-3640 Search line on Safari external protocols page needs update
2019-07-03 14:18:02 +02:00
Miha Mencin
012b828708 additional filters for blank string when displaying the reagent details 2019-07-03 14:13:55 +02:00
Alex Kriuchykhin
ec72b125cd
Merge pull request #1890 from okriuchykhin/ok_SCI_3651
Fix webpacker build for production [SCI-3651]
2019-07-03 14:12:44 +02:00
Oleksii Kriuchykhin
d2aad22bbb Fix webpacker build for production [SCI-3651] 2019-07-03 14:08:44 +02:00
Miha Mencin
1b31f7f30a SCI-3640 set max width of search bar to 50% 2019-07-03 13:16:07 +02:00
Alex Kriuchykhin
58747f914e
Merge pull request #1885 from okriuchykhin/ok_SCI_3651
Fix Uglifier config [SCI-3651]
2019-07-03 13:15:00 +02:00
Oleksii Kriuchykhin
25c58770da Fix Uglifier config [SCI-3651] 2019-07-03 12:49:43 +02:00
Miha Mencin
882e453b9c
Merge pull request #1880 from biosistemika/SCI-3644-hide-import-button
SCI-3644 Import button is always visible
2019-07-03 11:50:10 +02:00
Miha Mencin
b709c0ec3c fix the normalized protocol fixture 2019-07-03 11:49:01 +02:00
Alex Kriuchykhin
5cd4d10787
Merge pull request #1884 from okriuchykhin/ok_SCI_3651
Upgrade to Rails 5.2.3 [SCI-3651]
2019-07-03 11:35:45 +02:00
Oleksii Kriuchykhin
028e647f4d Upgrade to Rails 5.2.3 [SCI-3651] 2019-07-03 11:15:13 +02:00
Jure Grabnar
f9f1b3340c
PDF thumbnail generation is not done by ImageMagick [SCI-3579] (#1858)
PDF thumbnail generation is not done by ImageMagick [SCI-3579]
2019-07-03 11:11:04 +02:00
Alex Kriuchykhin
48a9db4390
Merge pull request #1882 from jbargu/jg_sci_3590
Update js-yaml by upgrading rails/webpacker [SCI-3590]
2019-07-03 11:07:06 +02:00
Miha Mencin
37cc526ac9 fix CR comments 2019-07-03 10:22:59 +02:00
Jure Grabnar
4715e8ec4b Fix building of zero steps protocls
Close SCI-3648
2019-07-03 09:34:15 +02:00
Miha Mencin
929329281f
Merge pull request #1879 from biosistemika/SCI-3645-desceding-sorting
SCI-3645 Sorting on external protocols is just ascending
2019-07-03 09:23:05 +02:00
Miha Mencin
611c417b43 code review changes 2019-07-03 09:21:41 +02:00
aignatov-bio
d2849c88fd
Remove draft after save step (#1878) 2019-07-03 09:18:52 +02:00
aignatov-bio
65cf5e5787
Fix activities menu selector highlight (#1877) 2019-07-03 09:18:41 +02:00
aignatov-bio
1c81994e01
Add license text to vendor files (#1861) 2019-07-03 09:18:30 +02:00
Jure Grabnar
e5defb95d4 Hound formatting issues 2019-07-02 20:21:05 +02:00
Miha Mencin
ab038ffdf7 SCI-3649 adding catalog number, fixing up the design a bit 2019-07-02 19:47:05 +02:00
Miha Mencin
74b4e0d774 SCI-3644 hide the import button and show it only on hover & when appropriate user 2019-07-02 18:24:07 +02:00
Jure Grabnar
fc961b570c Comment out index.jsx
Closes SCI-3590
2019-07-02 18:07:12 +02:00
Jure Grabnar
df3289c6f3 Fix dependencies for webpack 2019-07-02 18:05:09 +02:00
Miha Mencin
4efb0b5a4a SCI-3645 added descending sorting by name 2019-07-02 17:42:55 +02:00
Jure Grabnar
8bcba61919 Add webpack-cli 2019-07-02 16:35:36 +02:00
Jure Grabnar
49e940f629 Remove node modules from webpacker 2019-07-02 14:37:05 +02:00
Jure Grabnar
9ace3ce8ed Add config changes to support react.js to webpacker 2019-07-02 14:02:43 +02:00
Jure Grabnar
e84ef856bf Add React preset 2019-07-02 13:58:18 +02:00
Jure Grabnar
fdc65d92d3 Set extract_css to true in default 2019-07-02 13:56:35 +02:00
Jure Grabnar
13b5bbbc2c Rename .babelrc and .postcssrc.yml to babel.config.js postcss.config.js 2019-07-02 13:55:22 +02:00
Jure Grabnar
b9761e1a64 Update bable package to v7 2019-07-02 13:52:48 +02:00
Jure Grabnar
d46069a61c Update config/webpacker.yml to 4.0.0 version 2019-07-02 13:49:16 +02:00
Jure Grabnar
4bdefda2af Upgrade webpacker to ~> 4.0.0 2019-07-02 13:30:13 +02:00
aignatov-bio
b1a74a893c
Remove strange symbol (#1874) 2019-07-02 11:21:14 +02:00
aignatov-bio
378e91b426
Fix links on search page (#1867) 2019-07-02 11:21:00 +02:00
aignatov-bio
68ebf13bca
Fix tags modal issue (#1856) 2019-07-02 11:20:49 +02:00
Jure Grabnar
1a38324209 Add ghostscript to Dockerfile.production 2019-07-02 10:10:48 +02:00
Jure Grabnar
4e05d720e9
Update axios to 0.18.1 [SCI-3589] (#1859)
Update axios to 0.18.1 [SCI-3589]
2019-07-02 10:02:26 +02:00
Alex Kriuchykhin
7e4852d5aa
Merge pull request #1871 from okriuchykhin/ok_SCI_3511_v2
Fix TinyMCE editor initialization for step editing [SCI-3511]
2019-07-01 16:08:36 +02:00
aignatov-bio
2793777463
Features/docx report (#1873)
* Initial setup for docx report

* Add render for project, experiment, my_module

* Implement converter for RTE fields

* Add all report elements

* fix markup

* Change headers, remove empty blocks, refactored repository draw

* Add smart annotations support

* Fix justify fields

* Prepare for addons integration

* Fix markup

* Add comments to GemFile

* Fix TinyMCE error

* Change UI for new report download selector

* Fix file error in inventory cell for docx

* Fix i18n object for header
2019-07-01 10:14:16 +02:00