259 commits

Author	SHA1	Message	Date
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
Luka Murn	12dd9c9b5c	Update the first time data generator to ignore sample names.	2019-07-26 10:13:14 +02:00
Luka Murn	83bb89fdf5	Cherry-picked commit from ZZ (and LM)'s various changes	2019-07-26 10:13:14 +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
Urban Rotnik	2bb4f558b7	View rendering simplified, small improvements	2019-06-17 12:24:09 +02:00
Urban Rotnik	807104035c	Add StepBuilder, TableBuilder, AssetBuilder for PIO, normalized updated	2019-06-17 12:24:09 +02:00
Urban Rotnik	6a4deb0201	Add ProtocolIntermediateObject	2019-06-17 12:24:09 +02:00
Urban Rotnik	aadf2eecb4	Basic data normalizer for ProtocolIO	2019-06-17 12:24:08 +02:00
Urban Rotnik	ec49388283	Add protocol base normalizer class	2019-06-17 12:24:08 +02:00
Jure Grabnar	c1cee07a63	Extract API client constants to constants.rb	2019-06-17 12:24:08 +02:00
Jure Grabnar	a15b1f6dfa	Add logging for ApiClient and fix hound formatting	2019-06-17 12:24:08 +02:00
Jure Grabnar	5685709f48	Implement API client for protocols.io ... Closes SCI-3357	2019-06-17 12:24:07 +02:00
aignatov-bio	68937dd192	Fix RTE import for protocol repository (#1833)	2019-06-14 16:20:27 +02:00
Oleksii Kriuchykhin	8920d38a02	Make repositories more extendable [SCI-3528]	2019-06-06 17:28:59 +02:00
Oleksii Kriuchykhin	6917ea56e8	Fix import of ELN protocols [SCI-3506]	2019-05-29 15:41:54 +02:00
aignatov-bio	3633274c8f	Fix import for eln (#1741)	2019-05-13 10:22:30 +02:00
Anton Ignatov	7c55fcf0cf	Merge branch 'master' into master-with-note-section	2019-04-30 12:07:59 +02:00
Jure Grabnar	b37349624a	Merge pull request #1714 from biosistemika/jg_sci_3380 ... Add editnew action for editing new office files [SCI-3380]	2019-04-30 09:57:07 +02:00
Jure Grabnar	ed003aca13	Add editnew action for editing new office files ... Closes SCI-3380	2019-04-30 08:19:52 +02:00
Anton Ignatov	7d60eb5572	Fix migration issues	2019-04-23 11:11:22 +02:00
Anton Ignatov	aa2dab2014	Merge branch 'features/note-section' into master-with-note-section	2019-04-23 10:31:37 +02:00
aignatov-bio	6b45dcd475	Update eln export for new tinyMCE image format (#1680)	2019-04-19 14:44:40 +02:00
Mojca Lorber	b00cf07684	Add activity for importing inventory items	2019-04-18 15:18:10 +02:00
Oleksii Kriuchykhin	f9832013b0	Improve experiment preview image generation [SCI-3177]	2019-04-17 12:06:46 +02:00
Oleksii Kriuchykhin	e7151e6e6b	Disable inventory import activity logging [SCI-3290]	2019-04-03 22:42:33 +02:00
Alex Kriuchykhin	d8ce4d4a91	Merge pull request #1640 from okriuchykhin/ok_SCI_3281_v2 ... Fix activity creation for editing wopi file in protocol repository [SCI-3281]	2019-04-03 21:14:36 +02:00
Oleksii Kriuchykhin	14978f7c1f	Fix activity creation for editing wopi file in protocol repository [SCI-3281]	2019-04-03 19:51:54 +02:00
Jure Grabnar	f00f4d39af	Refactor step activities using position_plus_one ... Closes SCI-3273	2019-04-03 13:10:45 +02:00
Jure Grabnar	a2623b5124	Fix non-existant current_team in WOPI create_activity ... Closes SCI-3279	2019-04-02 14:20:01 +02:00
mlorb	b24a07f1c8	Merge pull request #1616 from mlorb/ml-sci-3237 ... Change activities for task protocols [SCI-3237]	2019-04-01 14:32:16 +02:00
Jure Grabnar	6533368763	Add activity for importing inv items	2019-03-29 15:41:34 +01:00
Mojca Lorber	3c69225d6b	Change activities for task protocols	2019-03-29 15:09:20 +01:00
Miha Mencin	4c3c0ef908	removing activity creation from demo project	2019-03-25 15:45:10 +01:00
Miha Mencin	4a87216a3d	Merge branch 'master' into features/global-activities	2019-03-25 14:35:24 +01:00
Mojca Lorber	e34ddeaefd	Remove activities from demo project	2019-03-20 13:25:59 +01:00
Mojca Lorber	cd7a87348f	Protocol activities refactoring, without tests	2019-03-19 16:12:07 +01:00
Miha Mencin	6deaff6382	fixing hound errors	2019-03-04 18:36:32 +01:00
Miha Mencin	fa7bba9de7	scheduling creation of demo project at the sign in time ... remove wrong schema, fix comment, add migration	2019-03-04 18:26:15 +01:00
Miha Mencin	4f9daa9590	SCI-3112 Change the the comments in demo project generator	2019-02-28 11:39:44 +01:00
Miha Mencin	088a860683	Merge pull request #1539 from biosistemika/features/templates ... Features/templates	2019-02-28 10:23:13 +01:00
Miha Mencin	d03ef2cd2a	Merge branch 'master' into features/templates	2019-02-28 09:41:20 +01:00
Jure Grabnar	93490a1f47	Add missing created_at and fix typo ... Closes SCI-3100, SCI-3098	2019-02-28 07:29:25 +01:00
Jure Grabnar	0fbbe8b5de	Add result comments to demo project ... Closes [SCI-3100].	2019-02-27 20:32:28 +01:00
Jure Grabnar	0699204d3b	Add changes for parallel exec discussed with Miha	2019-02-27 15:22:19 +01:00
Jure Grabnar	30bc536d07	Fix smart annotations in demo project ... Closes SCI-3097, SCI-3102.	2019-02-26 14:36:48 +01:00
Jure Grabnar	2464a45f83	Fix ordering for another step in demo project ... Closes SCI-3098.	2019-02-26 08:34:50 +01:00
Jure Grabnar	c409c39e60	Fix demo project's checklist item ordering ... Closes SCI-3099.	2019-02-26 08:26:02 +01:00
Jure Grabnar	b6dd783114	Improve generation of a demo project ... Closes SCI-3096	2019-02-26 08:06:07 +01:00
Urban Rotnik	c8ab9f8ff8	Fix tests	2019-02-26 08:04:05 +01:00
Jure Grabnar	d7e91676c3	Rename initial experiment back to the old one	2019-02-24 08:13:57 +01:00
Jure Grabnar	f98d6fbd4d	Remove archived task in Demo project ... Closes SCI-3082.	2019-02-22 11:58:32 +01:00
Jure Grabnar	ffe0493013	Rename Demo project and create rake task to create it on existing users ... Closes SCI-3080.	2019-02-21 23:31:55 +01:00
Mojca Lorber	16f99afbc0	Minor fixes	2019-02-13 12:20:14 +01:00
Mojca Lorber	227aeb284c	change mydemo projects data	2019-02-05 11:15:16 +01:00
Mojca Lorber	fa1dff6352	refactor Demo project generation	2019-01-24 13:40:53 +01:00
Oleksii Kriuchykhin	c86063f79e	Fix failing tests [SCI-2688]	2018-08-24 15:48:49 +02:00