177 commits

Author	SHA1	Message	Date
ajugo	96cf2f1d38	Update protocol templates update action on task [SCI-7903] (#5009) ... * Update protocol templates update action on task [SCI-7903] * Simplify logic for update from parent [SCI-7903]	2023-02-28 14:17:34 +01:00
artoscinote	e88b84000b	Merge pull request #5021 from artoscinote/ma_SCI_7978 ... Protocol permission modal changes [SCI-7978]	2023-02-27 13:34:32 +01:00
Anton	9abc8489a6	Propagate archived/flag to versions [SCI-8004]	2023-02-27 11:12:40 +01:00
ajugo	95d04d11d2	Fix validation for multiple parent protocols for drafts [SCI-7994] (#5020) ... * Fix validation for multiple parent protocols for drafts [SCI-7994] * Fix validation for drafts [SCI-7994] * Fix validation for drafts [SCI-7994]	2023-02-24 17:56:51 +01:00
Martin Artnik	7357782144	Protocol validation fix [SCI-7978]	2023-02-24 17:28:36 +01:00
Anton	60cda9b6f2	Fix version number for draft [SCI-7989]	2023-02-24 15:32:10 +01:00
Anton	dd27b13537	Fix protocol name validation [SCI-8003]	2023-02-24 10:15:23 +01:00
Martin Artnik	c24b0fa5ab	Refactor access modals [SCI-7978]	2023-02-23 14:57:38 +01:00
Anton	826cb162da	Add save as draft action	2023-02-22 14:59:48 +01:00
Anton	a95ca75362	Add new protocol modal [SCI-7810]	2023-02-21 14:15:53 +01:00
ajugo	166208f186	Update i flyouts of protocols (task screen) [SCI-7861] (#5003)	2023-02-21 13:44:26 +01:00
ajugo	2c079cc918	Update protocol duplication [SCI-7900] (#4992)	2023-02-18 09:09:33 +01:00
ajugo	9a57071d7a	Update restore action for protocol templates [SCI-7634] (#4969) ... * Update restore action for protocol templetes [SCI-7634] * Move protocol table reload to methond [SCI-7634]	2023-02-16 18:03:11 +01:00
Anton	ea9d2d8291	Merge branch 'develop' into features/protocol_versioning	2023-02-14 11:07:58 +01:00
Alex Kriuchykhin	b71f360261	Add visibility and default public user role fields to protocols [SCI-7819] (#4963)	2023-02-13 16:18:26 +01:00
Anton	dc5cfb9fc3	Add publish and delete action [SCI-7905]	2023-02-13 14:45:22 +01:00
Anton	b55f68c0dc	Update archive action for protocol templates [SCI-7898]	2023-02-09 14:10:07 +01:00
Alex Kriuchykhin	7f3999fa4f	Add protocol published versions modal [SCI-7519] (#4725)	2023-01-20 14:29:25 +01:00
Oleksii Kriuchykhin	5fea4722ac	Add versions and access columns to protocols table, update protocol model [SCI-7516]	2022-12-19 15:39:32 +01:00
Giga Chubinidze	769fe7ebd8	fixed id sorting on reports removed model duplicate code	2022-12-05 13:17:15 +04:00
Oleksii Kriuchykhin	0d6c6ccd9e	Introduce searchability by ID in global search field [SCI-7208]	2022-12-02 11:16:18 +01:00
Oleksii Kriuchykhin	9b72474943	Add versioning implementation to protocols data layer [SCI-7513]	2022-11-30 19:52:36 +01:00
Giga Chubinidze	43f8370a08	add IDs to the protocol templates tables [SCI-7179]	2022-11-22 13:55:41 +04:00
Oleksii Kriuchykhin	5ba6fe08d6	Fix protocol permission propagation [SCI-7348]	2022-10-19 17:26:13 +02:00
Oleksii Kriuchykhin	1bd3a7e783	Fix protocol import in templates [SCI-7325]	2022-10-12 14:27:21 +02:00
aignatov-bio	c0339b17be	Merge branch 'develop' into ai-sci-7108-add-duplication-functionality-to-steps	2022-09-15 11:25:25 +02:00
Anton	0c596bb701	Merge branch 'develop' into features/label-templates	2022-09-15 10:40:17 +02:00
Anton	75a15310ac	Merge branch 'features/team-permissions' into features/label-templates	2022-09-13 14:26:15 +02:00
Oleksii Kriuchykhin	eb04bc974d	Update tests with new team user assignments [SCI-6843]	2022-08-31 16:37:00 +02:00
Anton	e22af8830a	Add activties to step duplication [SCI-7109]	2022-08-24 13:45:39 +02:00
Anton	bc112dd6af	Add step duplication [SCI-7109]	2022-08-23 17:54:33 +02:00
Anton	1bac9aeb4c	Add duplication to components [SCI-7108]	2022-08-22 15:03:49 +02:00
Oleksii Kriuchykhin	cb71bb4a99	Fix copying of TinyMCE images when loading protocol from repository [SCI-7043]	2022-08-02 13:43:50 +02:00
Anton	a8ccc18b8b	Fix protocol save to repository [SCI-6965]	2022-07-25 12:53:27 +02:00
Alex Kriuchykhin	7874a3e1c5	Fix updating protocol from repository [SCI-6993] (#4266)	2022-07-20 10:14:48 +02:00
ajugo	1cd5a35b32	Fix refresh task name from linked protocol [SCI-6992] (#4256)	2022-07-15 10:14:49 +02:00
Anton	e320571876	Update protocol name on save with link [SCI-6989]	2022-07-14 12:59:12 +02:00
artoscinote	ee792b89df	Fix loading repositories that contain tables [SCI-6951] (#4200)	2022-07-11 10:58:20 +02:00
Alex Kriuchykhin	26820b9abb	Fix subject references for repository row activities [SCI-6906] (#4203)	2022-07-07 12:00:35 +02:00
Alex Kriuchykhin	9aeb107635	Fix saving protocol to repository [SCI-6935] (#4190)	2022-07-06 11:45:04 +02:00
Anton	bf13708e31	Fix load/save protocol to repository [SCI-6759]	2022-06-27 13:14:45 +02:00
artoscinote	e114f9b880	Update protocols.io importer and import from repository [SCI-6872] (#4138)	2022-06-08 15:55:50 +02:00
artoscinote	23872f519b	Implement step element sorting modal [SCI-6849] (#4124) ... * Implement step element sorting modal [SCI-6849] * Implement step reordering modal [SCI-6850] * Refactor reorderable items a bit [SCI-6850]	2022-05-30 13:45:51 +02:00
Oleksii Kriuchykhin	03ec4cb319	Setup user assignments relations for team, inventory and protocol [SCI-6818]	2022-05-17 14:32:14 +02:00
Anton	ba3c73439a	Add step creation/deletion functionality [SCI-6754]	2022-04-25 12:40:14 +02:00
Oleksii Kriuchykhin	2051ea5360	Update the search to abide the permissions [SCI-6151]	2021-10-22 11:43:20 +02:00
Mojca Lorber	2639810e1a	Fix no step bug	2020-10-22 13:21:05 +02:00
Mojca Lorber	23f01ac6a9	Add 'Open in APP' button to the task	2020-10-19 12:17:03 +02:00
Oleksii Kriuchykhin	7cd12bfb07	Fix protocol repository save/load timestamps [SCI-5067]	2020-10-06 15:30:04 +02:00
Urban Rotnik	7c312a844f	Fix updating updated_at on protocol while load/sync with repository	2020-09-29 15:37:40 +02:00
Oleksii Kriuchykhin	dd347aa834	Improve step reposition after deletion [SCI-4880]	2020-09-08 11:48:06 +02:00
Oleksii Kriuchykhin	dc481cf236	Add API endpoints for checklists, checklist items, tables, API code improvements [SCI-4776]	2020-07-03 16:48:29 +02:00
aignatov-bio	fe718349da	Add recent protocol tab to load protocal from repository	2020-04-09 17:29:39 +02:00
Oleksii Kriuchykhin	b2eda231a0	Fix TinyMCE images in protocol clonning [SCI-4053]	2019-11-05 18:13:44 +01:00
Oleksii Kriuchykhin	8f52b362d6	Fix file handling in protocol import/copying [SCI-3935][SCI-3926][SCI-3934]	2019-10-11 11:46:51 +02:00
Oleksii Kriuchykhin	46bcc0e78e	Fix cloning of TinyMCE images in protocol description [SCI-3935][SCI-3926][SCI-3934]	2019-10-01 13:38:09 +02:00
Oleksii Kriuchykhin	584f2d07c0	Fix file handling in protocol import/copying [SCI-3935][SCI-3926][SCI-3934]	2019-10-01 13:06:01 +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
aignatov-bio	f0b7771e19	Merge pull request #1943 from aignatov-bio/ai-sci-3629-add-metadata-to-protocol-repository-import-export ... Fix protocol copy, add metadata to assets [SCI-3629]	2019-08-05 12:55:16 +02:00
Anton Ignatov	24da016465	Reuse duplicate file method	2019-08-05 11:30:36 +02:00
Anton Ignatov	84fe10df47	Fix tests for models and tema import/export	2019-07-26 12:40:36 +02:00
Anton Ignatov	b762ae6a90	Copy protocol assets through tempfile	2019-07-19 15:23:34 +02:00
Anton Ignatov	b5a35f583a	Fix protocol copy, add metadata to assets	2019-07-18 15:39:08 +02:00
Anton Ignatov	57a273d5d0	Merge branch 'activestorage_migration' into features/marvinjs-integration	2019-07-12 11:34:41 +02:00
Oleksii Kriuchykhin	a1941a21dc	Futher refactoring of old Paperclip methods [SCI-3539]	2019-07-09 10:28:15 +02:00
aignatov-bio	d147e8260d	Fix issue with moving protocol in repository (#1887)	2019-07-03 15:35:37 +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
Oleksii Kriuchykhin	5acb16d43e	Update Asset helper methods [SCI-3539]	2019-06-28 08:17:09 +02:00
aignatov-bio	52a2f5cd0e	Add recent protocols dropdown to task page [SCI-3417] (#1800) ... * Add recent protocols dropdown to task page	2019-06-13 15:47:29 +02:00
Anton Ignatov	995408e7fc	Fix protocol update error, rollback bootstrap gems and fix step name	2019-05-08 17:18:19 +02:00
Alex Kriuchykhin	6bb19ed0be	Merge pull request #1697 from okriuchykhin/ok_SCI_3264 ... Update limits for new rich text enabled fileds [SCI-3264]	2019-04-25 23:54:05 +02:00
Oleksii Kriuchykhin	a3f5974dbd	Update limits for new rich text enabled fileds [SCI-3264]	2019-04-24 13:37:22 +02:00
aignatov-bio	84993ea3ef	Update protocol repository for new description format [SCI-3371] (#1689) ... * Update protocol repository for new description format * move image clone method to concerns	2019-04-24 13:34:56 +02:00
Oleksii Kriuchykhin	7c91b4a255	Merge remote-tracking branch 'scinote/master-with-note-section' into ok_SCI_3266	2019-04-23 17:01:13 +02:00
Oleksii Kriuchykhin	c7a707f9db	Fix task clonning with TinyMCE images [SCI-3266]	2019-04-23 15:16:40 +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	e034a0c055	Fix bug with update protocol from repository and modal disable button [SCI-3284] (#1631) ... * Fix bug with update protocol from repository and modal disable button	2019-04-03 09:18:18 +02:00
aignatov-bio	e6102c72c7	Adding missed activities [SCI-3253] (#1614) ... * Adding missed activties * Adding test for activities	2019-04-02 11:50:37 +02:00
Anton Ignatov	4ec0a3c871	Update TinyMCE image loader for new fields	2019-03-22 10:52:26 +01:00
Anton Ignatov	07c2819163	refactoring tinymce image uploading	2019-03-20 14:46:54 +01:00
Mojca Lorber	4f9814b884	Merge branch 'features/global-activities' of github.com:biosistemika/scinote-web into ml-sci-3021	2019-03-20 11:03:00 +01:00
Mojca Lorber	42ff1c0a68	fix bug in revert protocol method	2019-03-20 09:43:38 +01:00
Urban Rotnik	fe35c805b7	Add model breadcrumbs, update activities_helper	2019-03-19 14:01:06 +01:00
Urban Rotnik	b33e95e18a	New Protocols actions logging	2019-03-12 09:14:53 +01:00
Oleksii Kriuchykhin	61147b480c	Add main global activities bussiness logic [SCI-3014]	2019-02-26 11:01:15 +01:00
Zanz2	8e42dba7de	Found the fix	2018-07-03 08:20:56 +02:00
zmagod	024032faff	refactor update protocol keywords action [fixes SCI-2257]	2018-04-06 15:41:50 +02:00
Oleksii Kriuchykhin	16e1d072b9	Improve files handling in protocol clonning [SCI-2003]	2018-02-01 15:44:08 +01:00
zmagod	f8a3fca2db	Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling	2018-01-23 11:06:33 +01:00
Mojca Lorber	fe5828fa97	add copying of TinyMce assets when cloning the protocol	2017-11-22 16:47:21 +01:00
Luka Murn	8d68769d09	Hound is Love, Hound is Life	2017-07-04 14:47:58 +02:00
Luka Murn	91cddce8a6	Fixes DEPRECATION WARNING-s for Rails 5.1.2 ... This just fixes the warning messages occured during click-through of the application. I didn't systematically search code for all potential problems (I couldn't find the list of all deprecations anyway). Closes SCI-1427.	2017-07-04 14:35:51 +02:00
zmagod	525c9770ac	fixes experiment page [fixes SCI-1395]	2017-06-28 15:21:32 +02:00
zmagod	819f47b450	setup sciNote for Rails 5.1	2017-06-23 15:19:08 +02:00
Oleksii Kriuchykhin	5d55720aad	Fix steps ordering in reports [SCI-1008]	2017-05-11 15:56:33 +02:00
zmagod	2081e0a94b	Merge branch 'master' of https://github.com/biosistemika/scinote-web into release-1.10.1	2017-05-10 15:14:17 +02:00
Oleksii Kriuchykhin	0ee7e11620	Add advanced search options [SCI-1158]	2017-05-05 16:41:23 +02:00
zmagod	8d0c22327b	adds asc order to checklists [fixes SCI-1228]	2017-05-04 15:17:34 +02:00
Luka Murn	9479b65140	Hopefully fixes the encoding issues with audit trails ... Closes SCI-1175.	2017-04-19 08:35:04 +02:00