Commit graph

6090 commits

Author SHA1 Message Date
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
Oleksii Kriuchykhin
4ea6b56582 Fix Step and Result file previews [SCI-3539] 2019-07-01 23:30:20 +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
Mojca Lorber
41935a9471 Remove unassign_user_from_project notification and change code to use helper method for assignment notification generation 2019-07-01 13:44:27 +02:00
Anton Ignatov
1f40fa69fc Merge branch 'features/marvinjs-integration' of https://github.com/biosistemika/scinote-web into features/marvinjs-integration 2019-07-01 11:51:27 +02:00
aignatov-bio
a08d93376c
Add promo modal when MarvinJS disabled (#1872) 2019-07-01 11:51:13 +02:00
Anton Ignatov
c9ae9f056e Merge branch 'okriuchykhin-ok_SCI_3539' into features/marvinjs-integration 2019-07-01 10:44:29 +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
Anton Ignatov
390002f40f Merge branch 'ok_SCI_3539' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_3539 2019-07-01 10:12:26 +02:00
Jure Grabnar
692a5aff15
Prepare styled listing of protocols [SCI-3535] (#1870)
Prepare styled listing of protocols [SCI-3535]
2019-06-28 12:59:50 +02:00
Oleksii Kriuchykhin
2f39b7f22b Fix TinyMCE editor initialization for step editing [SCI-3511] 2019-06-28 12:06:04 +02:00
Jure Grabnar
ebbb36cc6d Remove border from the import button 2019-06-28 11:32:47 +02:00
Jure Grabnar
8146a6a42c Assign name = position if protocolsIO step has no name 2019-06-28 11:29:03 +02:00
Anton Ignatov
6be227b2d3 Merge branch 'master' of https://github.com/biosistemika/scinote-web into features/marvinjs-integration 2019-06-28 10:47:38 +02:00
aignatov-bio
666d406019
Merge pull request #1860 from aignatov-bio/ai-sci-refactor-marvinjs-api
Refactor API connector for marvinJS
2019-06-28 10:45:56 +02:00
Jure Grabnar
5430fb311d Hound fixes 2019-06-28 10:41:20 +02:00
Jure Grabnar
c10428cd2a Fix sorting buttons not applying params 2019-06-28 08:55:27 +02:00
Jure Grabnar
1a9fca87d2 Fix non-existent protocol-card in preview banner 2019-06-28 08:49:12 +02:00
Oleksii Kriuchykhin
5acb16d43e Update Asset helper methods [SCI-3539] 2019-06-28 08:17:09 +02:00
Jure Grabnar
149f45f4fc Hound fixes 2019-06-28 02:31:25 +02:00
Jure Grabnar
bc4b07cc0f Refactor hardcoded protocol_source in SearchService 2019-06-28 02:26:31 +02:00
Jure Grabnar
9be4fc2470 Fix tests 2019-06-28 02:19:06 +02:00
Jure Grabnar
7fb696cf48 Fix unclickable import modal 2019-06-28 02:00:05 +02:00
Jure Grabnar
03b81400a9 Add timeout to search 2019-06-28 01:50:52 +02:00
Jure Grabnar
1ccabf62b3 Add preview banner in external protocols 2019-06-28 01:38:33 +02:00
Jure Grabnar
81695665c7 Add hover effect on the card 2019-06-28 00:47:08 +02:00