968 commits

Author	SHA1	Message	Date
Oleksii Kriuchykhin	53402c9ce1	Fix images in reports, impove speed of report generation [SCI-3990][SCI-3993]	2019-10-17 13:30:14 +02:00
Miha Mencin	8e98c82bbf	SCI-3979 removing accessors	2019-10-09 15:49:49 +02:00
Miha Mencin	6d71036d07	Remove paperclip attribute accessors	2019-10-09 10:20:00 +02:00
Miha Mencin	78fd5df0f6	Revert "Fix report in academia"	2019-10-09 10:16:39 +02:00
Miha Mencin	37e6604f8b	Merge pull request #2136 from biosistemika/SCI-3975-team-export ... Sci 3975 team export	2019-10-08 21:47:08 +02:00
Miha Mencin	f12c29bd2a	fixing import	2019-10-08 21:40:44 +02:00
aignatov-bio	5eed152403	Revert "Force save office file"	2019-10-08 21:34:16 +02:00
aignatov-bio	0d88466894	Merge pull request #2139 from aignatov-bio/ai-sci-fix-office-save ... Force save office file	2019-10-08 21:11:33 +02:00
aignatov-bio	236ce30254	Force save office file	2019-10-08 21:10:18 +02:00
aignatov-bio	4a5db36c07	Merge pull request #2138 from aignatov-bio/ai-sci-fix-report-in-academia ... Fix report in academia	2019-10-08 20:19:48 +02:00
aignatov-bio	5d80c51996	Fix report in academia	2019-10-08 20:18:51 +02:00
Oleksii Kriuchykhin	3d9c2282f3	Implement JPEG quality extraction for ActiveStorage [SCI-3959]	2019-10-08 10:42:55 +02:00
Alex Kriuchykhin	39a2669eef	Merge pull request #2129 from okriuchykhin/ok_SCI_3950 ... Improve missing files handling when clonning TinyMceAsset [SCI-3950]	2019-10-07 09:18:45 +02:00
Oleksii Kriuchykhin	a2d70afeca	Improve missing files handling when clonning TinyMceAsset [SCI-3950]	2019-10-04 15:59:22 +02:00
Alex Kriuchykhin	076d61d4d0	Merge pull request #2116 from okriuchykhin/ok_SCI_3908 ... Remove Paperclip from the codebase [SCI-3908]	2019-10-04 14:45:42 +02:00
Oleksii Kriuchykhin	bab228e1df	Skip missing files when clonning TinyMceAsset [SCI-3950]	2019-10-03 15:43:39 +02:00
Oleksii Kriuchykhin	260fcd6e89	Remove Paperclip from codebase [SCI-3908]	2019-10-02 19:45:14 +02:00
Oleksii Kriuchykhin	efe5d8a6ea	Remove the deprecated foreign keys from TinyMceAsset [SCI-3839]	2019-10-01 15:49:37 +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
Anton Ignatov	33497d11a3	Merge branch 'activestorage_migration'	2019-10-01 10:36:05 +02:00
Jure Grabnar	0a3389f310	Fix operator for removing the lock on asset	2019-09-30 08:46:16 +02:00
Alex Kriuchykhin	53caaf647b	Merge pull request #2080 from okriuchykhin/ok_SCI_3891 ... Move file preview generation to delayed job [SCI-3891]	2019-09-27 10:50:21 +02:00
Miha Mencin	0e75ea2e3e	Merge pull request #2096 from aignatov-bio/ai-sci-3932-fix-tiny-mce-render-in-report ... Fix tinymce assets render in report [SCI-3932]	2019-09-27 10:48:10 +02:00
Anton Ignatov	40a8c6a1cc	Markup fix	2019-09-26 16:29:26 +02:00
Anton Ignatov	1f02fb4bc7	Fix tinymce assets render in report	2019-09-26 16:27:22 +02:00
Jure Grabnar	668f902570	Fix export all with active storage ... Close SCI-3924	2019-09-26 16:01:30 +02:00
Anton Ignatov	305e9dc109	Fix error handling and rubocop error	2019-09-25 13:45:34 +02:00
Jure Grabnar	5cb900370a	Change/fix asset locking mechanism ... Close SCI-3870	2019-09-25 11:07:53 +02:00
Oleksii Kriuchykhin	aabeeec95a	Move file preview generation to delayed job [SCI-3891]	2019-09-23 21:07:03 +02:00
Anton Ignatov	646107a35b	Fix error on task copy	2019-09-23 16:33:57 +02:00
Alex Kriuchykhin	29ffe05442	Merge pull request #1964 from okriuchykhin/ok_SCI_3643 ... Add text extraction from MarvinJS for search [SCI-3643]	2019-09-18 16:22:11 +02:00
Anton Ignatov	69eb8681bd	Error handling, when image unavaliable for base64	2019-09-18 15:11:51 +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
aignatov-bio	a3b2c7d5fe	Fix report image issues [SCI-3772] (#1983) ... * Fix report image issues * Small fixes	2019-09-12 09:02:45 +02:00
Alex Kriuchykhin	59a85d8181	Merge pull request #2004 from okriuchykhin/ok_SCI_3778 ... Fix new office file creation [SCI-3778]	2019-09-04 15:40:34 +02:00
Oleksii Kriuchykhin	267c53c2d2	Refactor inventory sharing logic [SCI-3803]	2019-08-29 17:21:49 +02:00
Miha Mencin	9e9e698778	SCI-3806 Add an icon indicating shared status to dropdown	2019-08-26 09:14:37 +02:00
aignatov-bio	0810699770	Update shared inventory permissions [SCI-3802] (#2009) ... * Update shared inventory permissions * Fix tests and simplify condition for placeholder	2019-08-23 10:57:02 +02:00
Oleksii Kriuchykhin	3918c893db	Fix new office file creation [SCI-3778]	2019-08-21 13:26:11 +02:00
aignatov-bio	f94b8165dc	Fix marvinjs edit button and icon (#1985)	2019-08-21 11:15:57 +02:00
Mojca Lorber	530d09df64	add i-shared inventory icon	2019-08-19 15:43:55 +02:00
aignatov-bio	d741e52427	Fix global search for inventories (#1988)	2019-08-19 09:23:59 +02:00
Urban Rotnik	89f289660b	Add share_with_all feature to service, add new activities	2019-08-14 11:03:15 +02:00
Urban Rotnik	0ce331227c	Update permission and model to share repository over all teams	2019-08-13 14:07:24 +02:00
aignatov-bio	737f9e572c	Replace marvinJS logo and fix some merge issues [SCI-3731] (#1976) ... * Replace marvinJS logo and fix some merge issues * Fix tests	2019-08-13 11:04:19 +02:00
Urban Rotnik	dc4751e49a	Update scope 'accessible_by_teams' and fix load_vars method in controllers	2019-08-12 10:55:30 +02:00
Oleksii Kriuchykhin	32054c5516	Handle situation for assets without blob in list sorting [SCI-3757]	2019-08-09 15:17:19 +02:00
Oleksii Kriuchykhin	c352a73d79	ActiveStorage fixies after latest master merge [SCI-3757]	2019-08-09 14:56:00 +02:00