945 commits

Author	SHA1	Message	Date
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
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
Urban Rotnik	786716974b	Add validation for team on TeamRepository	2019-08-09 14:15:50 +02:00
Urban Rotnik	32783576c1	Add controller action 'multiple_update' ... Add controller action, add update permission activity, add JS for handling ajax req	2019-08-09 14:15:50 +02:00
Mojca Lorber	0e5afa6048	Small refactor	2019-08-09 14:13:02 +02:00
Mojca Lorber	7d4941015f	Update global search, so it will be able to search through shared inventories	2019-08-09 14:13:01 +02:00
Mojca Lorber	7e9be932f3	Make scope for repositories accessible by teams and simplify read permission	2019-08-09 14:13:00 +02:00
Mojca Lorber	cac7dab440	Show shared inventories in left navigation and fix read repository permission	2019-08-09 14:13:00 +02:00
Urban Rotnik	1a77702fa7	Add uniq index for Repository and Team in TeamRepositories	2019-08-09 14:13:00 +02:00
Urban Rotnik	077369d960	Update permissions for Repositories	2019-08-09 14:12:59 +02:00
Urban Rotnik	f569411bc7	Add TeamRepository model	2019-08-09 14:12:59 +02:00
aignatov-bio	6e5f078dea	Add activities for marvinJS [SCI-3630] (#1950) ... * Add marvinJs activities to step and results * Add activities for TinyMCE marvinJS assets * Fix markup	2019-08-09 09:47:07 +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	feadd940f7	Fix duplicate for TinyMCE model	2019-08-05 11:33:49 +02:00
Anton Ignatov	24da016465	Reuse duplicate file method	2019-08-05 11:30:36 +02:00
Oleksii Kriuchykhin	a2fe4bee94	Add text extraction from MarvinJS for search [SCI-3643]	2019-08-02 15:17:28 +02:00
Anton Ignatov	7e379d4e0d	Fix download file	2019-07-29 10:24:31 +02:00
Anton Ignatov	f35f4886a3	Fix markup	2019-07-29 10:18:34 +02:00
Anton Ignatov	a4b2825258	Fix tests for active storage	2019-07-26 15:58:51 +02:00
Anton Ignatov	618f0cc334	Fix tests for services	2019-07-26 14:16:44 +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
Anton Ignatov	b762ae6a90	Copy protocol assets through tempfile	2019-07-19 15:23:34 +02:00