46 commits

Author	SHA1	Message	Date
Alex Kriuchykhin	342e9dbb19	Switch to asset text extraction with ActiveStorage analyzer [SCI-9954] (#6956)	2024-02-05 16:24:06 +01:00
Alex Kriuchykhin	43329dc318	Fix imports of protocols with tables from Protocols.io [SCI-9723] (#6839)	2023-12-19 10:39:16 +01:00
ajugo	0328a32e09	Update import/export for protocol templates [SCI-7986] (#5032)	2023-02-27 13:22:01 +01:00
artoscinote	187197488b	Pdf viewer and protocol fixes [SCI-7074] (#4327)	2022-08-09 10:13:43 +02:00
artoscinote	6b79f32e52	Fix asset V2 export/import [SCI-6936] (#4185) ... * Fix asset V2 export/import [SCI-6936] * Fix import of legacy eln step description images [SCI-6937]	2022-07-01 11:35:04 +02:00
artoscinote	5c051ef8c1	Implement V2 protocols exporter [SCI-6876] (#4142) ... * Implement V2 protocols exporter [SCI-6876] * Implement new importer [SCI-6877]	2022-06-10 10:18:55 +02:00
Oleksii Kriuchykhin	75da67b937	Update Rails to 6.1.1, ruby to 2.7.2 [SCI-5459]	2021-01-28 14:43:45 +01:00
Oleksii Kriuchykhin	60017661c1	Fix import of the old format TinyMCE images [SCI-4767]	2020-07-27 16:39:39 +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	f9497e2e3e	Fix TinyMCE import from ELN	2019-10-07 16:21:11 +02:00
aignatov-bio	6fda5401f5	Fix protocol import (#1981)	2019-08-14 09:06:25 +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
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	68937dd192	Fix RTE import for protocol repository (#1833)	2019-06-14 16:20:27 +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
aignatov-bio	6b45dcd475	Update eln export for new tinyMCE image format (#1680)	2019-04-19 14:44:40 +02:00
zmagod	3fae267547	fix import protocol preview [fixes SCI-1867]	2018-01-05 15:30:11 +01:00
zmagod	e69e9f6794	remove unneeded comment and add tiny_mce_asset regex in a constant	2017-11-24 17:04:01 +01:00
zmagod	d200e355ed	follow @Ducz0r 's suggestions	2017-11-24 11:45:07 +01:00
zmagod	afbeafb137	adds RTE images import, disables turbolinks on edit step actions	2017-11-22 16:28:14 +01:00
Zanz2	f5b2ad0d34	Refactor github code review	2017-10-07 16:07:04 +02:00
Zanz2	48f03d6dfb	hound blank line fix	2017-10-05 18:41:58 +02:00
Zanz2	fc1cd73e1d	fixed hound blank line	2017-10-05 18:38:44 +02:00
Zanz2	79e065a811	Fixed a mistake in the fix that made it not render the preview	2017-09-25 14:39:43 +02:00
Zanz2	72c707ae88	protocol importing into database works, still need to decide how to add other fields from protocols.io to step description and protocol description, but that can be added easily, and need to make it refresh after submit	2017-09-20 15:31:10 +02:00
Zanz2	7b85d74a23	added jquery code to reset file selector selected file after it is canceled in the preview modal	2017-09-20 09:32:31 +02:00
Zanz2	ea8f3e822d	Removed all the html bug workarounds since it is now fixed (strip tags and remove " now gone	2017-09-20 08:38:34 +02:00
Zanz2	7aba782639	optimised code so i dont need javascript locals anymore and working to fix infamous html tags bug where second modal doesnt show	2017-09-19 15:02:16 +02:00
Oleksii Kriuchykhin	2edebb282a	Add team_id field to assets and tables [SCI-1046]	2017-03-23 10:36:55 +01:00
zmagod	1220466035	fixing hound	2017-01-25 15:00:14 +01:00
zmagod	a6285f0431	renamed utilities	2017-01-25 10:24:50 +01:00
Luka Murn	53699193a2	Merge branch 'smart-annotations' ... Conflicts: app/assets/javascripts/comments.js.erb app/assets/javascripts/protocols/index.js app/assets/javascripts/protocols/steps.js.erb app/assets/javascripts/samples/sample_datatable.js.erb app/controllers/my_module_comments_controller.rb app/controllers/project_comments_controller.rb app/controllers/result_comments_controller.rb app/controllers/step_comments_controller.rb app/datatables/sample_datatable.rb app/views/my_module_comments/_comment.html.erb app/views/project_comments/_comment.html.erb app/views/projects/show/_experiment.html.erb app/views/reports/elements/_experiment_element.html.erb app/views/reports/elements/_result_comments_element.html.erb app/views/reports/elements/_result_text_element.html.erb app/views/reports/elements/_step_checklist_element.html.erb app/views/reports/elements/_step_comments_element.html.erb app/views/reports/elements/_step_element.html.erb app/views/result_comments/_comment.html.erb app/views/results/_result_text.html.erb app/views/step_comments/_comment.html.erb app/views/steps/_step.html.erb db/schema.rb	2017-01-24 14:33:23 +01:00
Oleksii Kriuchykhin	2434c73a0c	Remove unneeded HTML scrabber in protocol importer [SCI-921]	2017-01-24 09:52:38 +01:00
zmagod	65fa631b1c	adding tinyMce first run	2017-01-18 22:40:08 +01:00
Mojca Lorber	f656a1093d	fix hound	2017-01-18 14:40:24 +01:00
Mojca Lorber	dde9854bf1	update protocol import/export and clone	2017-01-18 14:22:19 +01:00
Luka Murn	08c6210f7c	Also employ "no format" Nokogiri strategy when sanitizing ... Closes SCI-691.	2016-11-17 16:43:14 +01:00
Luka Murn	fc32aa8606	Add custom scrubber for QuillJs	2016-11-17 16:43:14 +01:00
Luka Murn	29f0557d3c	Prevent CORS when importing protocols	2016-11-15 17:06:39 +01:00
Oleksii Kriuchykhin	28ab599373	Change double quotes to single [fixes SCI-314]	2016-09-22 16:36:37 +02:00
Oleksii Kriuchykhin	9b7360eebf	Fixes issue with import of empty protocol [fixes SCI-314]	2016-09-20 13:41:29 +02:00
zmagod	852fe499fb	clean up linked protocol	2016-08-12 16:31:40 +02:00
Luka Murn	076b67620f	Migration GitLab -> GitHub	2016-07-21 13:11:15 +02:00