Commit graph

211 commits

Author SHA1 Message Date
aignatov-bio f9497e2e3e Fix TinyMCE import from ELN 2019-10-07 16:21:11 +02:00
Oleksii Kriuchykhin 3509543e7b Merge branch 'master' into ok_SCI_3881 2019-09-16 11:56:49 +02:00
Oleksii Kriuchykhin c068901b00 Upgrade Rails to 6.0 [SCI-3745] 2019-09-12 17:24:08 +02:00
Oleksii Kriuchykhin 6f7ef25514 Add local sorting for ProtocolsIO [SCI-3827] 2019-09-05 14:49:16 +02:00
aignatov-bio 6fda5401f5
Fix protocol import (#1981) 2019-08-14 09:06:25 +02:00
Oleksii Kriuchykhin 973efa55e1 Merge branch 'master' into ok_SCI_3678 2019-08-08 11:17:07 +02:00
Anton Ignatov e2e876b2a3 Merge branch 'activestorage_migration' into ai-sci-3728-fix-active-storage-tests 2019-08-05 13:51:04 +02:00
Anton Ignatov 84fe10df47 Fix tests for models and tema import/export 2019-07-26 12:40:36 +02:00
Anton Ignatov 3b7f715e0b Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-22 13:09:17 +02:00
aignatov-bio 4fe0227d8c
Add metadata for .eln assets (#1942) 2019-07-19 10:53:33 +02:00
Urban Rotnik 795c355f01
Merge pull request #1915 from urbanrotnik/ur-sci-3531-tests-for-step-components
Add tests for StepComponents [SCI-3531]
2019-07-15 13:25:36 +02:00
Jure Grabnar 015dae1a05 Fix old tests 2019-07-15 08:27:34 +02:00
Jure Grabnar a372d4056d Add last_published protocols.io endpoint 2019-07-14 19:24:53 +02:00
Urban Rotnik 5cf100a787 Show 'published_on' instead of 'created_on' on external_protocols list 2019-07-12 16:56:07 +02:00
Anton Ignatov 7831b0a089 Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-12 15:00:07 +02:00
Anton Ignatov 57a273d5d0 Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-12 11:34:41 +02:00
Oleksii Kriuchykhin 64b7a5646a Implement custom document file previewer [SCI-3677] 2019-07-10 14:37:23 +02:00
Urban Rotnik b9bec32316 Add tests for StepComponents 2019-07-10 12:48:08 +02:00
Urban Rotnik cc3cd43270 Log to console when error occur on ProtocolsImport actions 2019-07-09 15:32:43 +02:00
Urban Rotnik 10639deb97 Strip tags for table's content 2019-07-09 13:41:52 +02:00
Urban Rotnik be77746aef Fix description styling of components 2019-07-09 13:41:51 +02:00
Urban Rotnik 8411e92fa2 Add linebreak for 'There was a table' message 2019-07-09 10:54:48 +02:00
Oleksii Kriuchykhin a1941a21dc Futher refactoring of old Paperclip methods [SCI-3539] 2019-07-09 10:28:15 +02:00
Jure Grabnar 05f2210002
SCI-3650, SCI-3655 Fix empty file name, empty description when… (#1892)
SCI-3650, SCI-3655 Fix empty file name, empty description when parsing tables
2019-07-09 10:24:03 +02:00
Jure Grabnar dc7fee51fa Add Show more protocols functionality to external protocols
Closes SCI-3646
2019-07-04 15:35:18 +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
Jure Grabnar 6944045bfb Check for empty description before passing to Nokogiri
Closes SCI-3655
2019-07-03 16:36:26 +02:00
Jure Grabnar 8866d98512 Fix empty file name on protocols.io
Closes SCI-3650
2019-07-03 16:11:51 +02:00
Jure Grabnar 4715e8ec4b Fix building of zero steps protocls
Close SCI-3648
2019-07-03 09:34:15 +02:00
Miha Mencin 611c417b43 code review changes 2019-07-03 09:21:41 +02:00
Miha Mencin ab038ffdf7 SCI-3649 adding catalog number, fixing up the design a bit 2019-07-02 19:47:05 +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
Jure Grabnar c10428cd2a Fix sorting buttons not applying params 2019-06-28 08:55:27 +02:00
Jure Grabnar 9be4fc2470 Fix tests 2019-06-28 02:19:06 +02:00
Jure Grabnar 0a77cedaf8 Fix sorting of external protocols and start showing results 2019-06-27 22:48:56 +02:00
Urban Rotnik 9cb4454537 New implementation for attachments creation 2019-06-27 17:02:06 +02:00
Jure Grabnar 82fb8ebd2e
Implement protocols.io error handling (#1869)
Implement protocols.io error handling
2019-06-27 16:35:55 +02:00
Jure Grabnar 06b8d1fda7 Update ApiClient tests
Closes SCI-3434
2019-06-27 14:54:19 +02:00
Jure Grabnar 8a7a2eb097 Add StandardError checking for ProtocolNormalizer 2019-06-27 10:12:00 +02:00
Jure Grabnar 86bc69e510 Simplify V3 errors structure 2019-06-27 09:42:21 +02:00
Mojca Lorber 9fd83d54a0 Put network error handeling into api and refactor errors 2019-06-26 14:04:03 +02:00
Urban Rotnik bf6041e13d Update sanitization of html descriptions 2019-06-19 11:05:22 +02:00
Urban Rotnik 7e69375016 Drop header column and row when extract tables 2019-06-19 10:47:38 +02:00
Urban Rotnik 2a579f2240 Add Warnings, Before start and Guidelinese to protocol description 2019-06-19 09:02:42 +02:00
Mojca Lorber ebcaa4b014 Implement protocols.io error handling for api client and normalizer 2019-06-18 14:01:57 +02:00
Urban Rotnik 7fad5fc594 Add search service and normalizer for list 2019-06-17 12:24:15 +02:00
Jure Grabnar 362b0cd45d Hound fixes 2019-06-17 12:24:11 +02:00
Jure Grabnar 640f6c1211 Fix tests after BuildProtocolFromClientService refactor
Closes SCI-3544
2019-06-17 12:24:11 +02:00
Jure Grabnar 1e8627c450 Refactor ImportProtocol service to BuildProtocolService
Closes SCI-3544
2019-06-17 12:24:10 +02:00