178 commits

Author	SHA1	Message	Date
aignatov-bio	21f584a2c4	Fix markup	2020-10-29 14:30:26 +01:00
aignatov-bio	131d487e69	Add file preview to list view	2020-10-29 14:30:26 +01:00
aignatov-bio	d99e279ecc	Add gallery to file preview	2020-10-29 14:30:26 +01:00
aignatov-bio	c56f7912ef	Update file preview	2020-10-29 14:23:32 +01:00
aignatov-bio	1ed65eddfa	Move ordering to front-end	2020-09-25 15:06:09 +02:00
aignatov-bio	780db9d134	Add assets view switcher	2020-09-24 17:10:36 +02:00
Urban Rotnik	4eebfa5461	Controller action for card inline preview	2020-08-28 11:05:52 +02:00
aignatov-bio	21e4dcd96a	Add wopi preview for office files	2020-08-25 13:22:36 +02:00
Oleksii Kriuchykhin	0465dba2cf	Fix file dowload from MS Office online [SCI-4673]	2020-05-27 16:59:28 +02:00
Oleksii Kriuchykhin	25f9c5bc7d	Refactor Repository permissions and implement deduplication for files in snapshots [SCI-4597]	2020-05-06 15:17:54 +02:00
Oleksii Kriuchykhin	b646295698	Fix service_url for local storage [SCI-4057]	2019-11-06 15:21:56 +01:00
Oleksii Kriuchykhin	07b037f05b	Generate previews for newly created office files once asset is saved [SCI-3977]	2019-10-10 15:40:50 +02:00
Oleksii Kriuchykhin	0b4f72e517	Fix previews for newly created office files [SCI-3977]	2019-10-10 14:25:19 +02:00
Oleksii Kriuchykhin	3d9c2282f3	Implement JPEG quality extraction for ActiveStorage [SCI-3959]	2019-10-08 10:42:55 +02:00
Urban Rotnik	8f0c3bd2ce	Add team_id when asset is creating	2019-10-04 14:24:19 +02:00
aignatov-bio	a31c5ea1f5	Fix marvin JS preview	2019-10-03 11:54:26 +02:00
Oleksii Kriuchykhin	dd7f2fe095	Fix large preview for documents [SCI-3938]	2019-10-01 16:14:28 +02:00
Anton Ignatov	93363da4e5	Fix preview for result	2019-09-26 16:49:56 +02:00
Oleksii Kriuchykhin	3509543e7b	Merge branch 'master' into ok_SCI_3881	2019-09-16 11:56:49 +02:00
Oleksii Kriuchykhin	3918c893db	Fix new office file creation [SCI-3778]	2019-08-21 13:26:11 +02:00
Oleksii Kriuchykhin	c352a73d79	ActiveStorage fixies after latest master merge [SCI-3757]	2019-08-09 14:56: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	077369d960	Update permissions for Repositories	2019-08-09 14:12:59 +02:00
Oleksii Kriuchykhin	973efa55e1	Merge branch 'master' into ok_SCI_3678	2019-08-08 11:17:07 +02:00
Oleksii Kriuchykhin	b4f632dba8	Remove dowload endpoint from assets controller [SCI-3680]	2019-08-07 15:21:41 +02:00
Oleksii Kriuchykhin	d942788581	Implement read permissions checks for ActiveStorage controllers [SCI-3680]	2019-08-07 15:21:41 +02:00
Urban Rotnik	1b9db2f61e	Fix for file annotating on Safari	2019-07-24 14:16:29 +02:00
Anton Ignatov	1e8663548e	Add MarvinJS assets to TinyMCE	2019-07-16 13:40:54 +02:00
Anton Ignatov	ba1d6d45ca	Fix merging issues	2019-07-12 15:47:15 +02:00
Anton Ignatov	ffd415d409	Inital refactor for Assets model	2019-07-12 15:02:06 +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
Jure Grabnar	0ee0b1c834	Fix file preview not showing in modal when processing is done ... Close SCI-3587	2019-07-08 12:45:22 +02:00
aignatov-bio	09dacf3be2	Fix infinite update for image annotation (#1889)	2019-07-03 15:35:49 +02:00
Oleksii Kriuchykhin	4ea6b56582	Fix Step and Result file previews [SCI-3539]	2019-07-01 23:30:20 +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
Anton Ignatov	3069ec8dd2	Add check for edit permission	2019-06-20 09:43:23 +02:00
Anton Ignatov	a843a016a0	Fix markup and naming	2019-06-19 15:19:47 +02:00
Anton Ignatov	f480c0eb8d	Adding new activtiies for image editing	2019-06-14 16:15:30 +02:00
Oleksii Kriuchykhin	a855eade4c	Merge branch 'master' into ok_SCI_3461	2019-06-11 17:48:02 +02:00
aignatov-bio	8f2d873130	Fix error when editing office document (#1793)	2019-05-22 10:34:16 +02:00
Oleksii Kriuchykhin	84a2ad4487	Refactor the async thumbnail reloading (spinner) [SCI-3461]	2019-05-21 17:29:33 +02:00
aignatov-bio	59e824ef9e	Fix nil handling in different places [SCI-2840] (#1777) ... * Fix nil handling in different places	2019-05-21 15:53:34 +02:00
Mojca Lorber	b479a6a145	Cover all use cases for updating protocol status bar	2019-05-20 16:09:43 +02:00
Alex Kriuchykhin	e544edeaf7	Merge pull request #1758 from okriuchykhin/ok_SCI_3381 ... Fix handling of processing step attachments [SCI-3381]	2019-05-14 09:26:30 +02:00
Oleksii Kriuchykhin	4b1c4bd140	Fix handling of proccessing step attachments [SCI-3381]	2019-05-13 17:12:06 +02:00
Luka Murn	bd9ffe4bd2	Refactor WOPI filename length validation onto the model	2019-05-13 15:41:39 +02:00
Anton Ignatov	652fba0e23	Merge branch 'master-with-note-section'	2019-05-13 11:08:11 +02:00
Miha Mencin	5ff344c208	Merge pull request #1746 from biosistemika/lm-sci-3426 ... Changes to create new office file button [SCI-3426]	2019-05-13 10:55:58 +02:00
aignatov-bio	da5b24ef57	Fix attachment appearence after update (#1745)	2019-05-13 10:54:16 +02:00
Luka Murn	890df8803e	Add file name validation to create new Office file modal window	2019-05-10 18:19:32 +02:00
Luka Murn	5135922254	Move the WOPI controls partial to /wopi folder, fix typo	2019-05-10 16:51:54 +02:00
Luka Murn	b78caef915	Fix the file preview modal so it supports WOPI_ENABLED == false	2019-05-10 16:41:11 +02:00
Oleksii Kriuchykhin	40550f92c9	Improve HTML data escaping in JSON endpoints [SCI-3403]	2019-05-08 17:38:24 +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
Urban Rotnik	11a7a975af	Merge branch 'features/scinote-improvements' into master-with-note-section	2019-04-23 14:50:03 +02:00
aignatov-bio	8d7cc57da1	Add zoom to image annotation and check jpeg file quality before save [SCI-3300] (#1654) ... * Add zoom to image annotation and check jpeg file quality before save * Move compression to front end * Move quality extractor to paperclip processor	2019-04-15 09:49:44 +02:00
aignatov-bio	9377628f5e	Release team space after update image [SCI-3299] (#1656) ... * Release team space after update image	2019-04-11 09:20:05 +02:00
Jure Grabnar	d60cc2cd1c	Refactor create_wopi_file	2019-04-04 17:05:25 +02:00
Jure Grabnar	20446fb39d	Hound formatting fixes	2019-04-04 17:05:25 +02:00
Jure Grabnar	983f90ddf6	Add file name presence check	2019-04-04 17:05:25 +02:00
Jure Grabnar	b12916b828	Add main functionality	2019-04-04 17:05:25 +02:00
Jure Grabnar	613843d095	Temp commit	2019-04-04 16:58:55 +02:00
Jure Grabnar	9a4cd4fda2	Add file_present true	2019-04-04 16:57:36 +02:00
Jure Grabnar	3b8e6fa47c	Test office online	2019-04-04 16:57:36 +02:00
Oleksii Kriuchykhin	9e91e9e59d	Improve large image saving after editing [SCI-3289]	2019-04-03 16:31:56 +02:00
Oleksii Kriuchykhin	c47d243b1f	Disable WOPI edit button in read only mode [SCI-3281]	2019-04-02 17:45:26 +02:00
Oleksii Kriuchykhin	ffa7c5ecb2	Fix permition checks for file editing and make protocol preview files read only [SCI-3281]	2019-04-02 16:38:53 +02:00
aignatov-bio	9fff93ab0e	Merge pull request #1576 from biosistemika/image-editor-prototype ... Feature/Image annotation	2019-03-22 16:31:00 +01:00
aignatov-bio	6eae12efab	Updating permission check for image editing [SCI - 3153, 3159] (#1568) ... *Add permission check for assets editing * Add check for image format	2019-03-19 13:52:57 +01:00
aignatov-bio	a0a3c4b97f	Fix file format bug (#1569)	2019-03-19 11:06:36 +01:00
Oleksii Kriuchykhin	feb75f62e1	Add workaround for image caching in fabric js [SCI-2855]	2019-03-11 15:10:32 +01:00
Oleksii Kriuchykhin	80e525fd97	Improve image editor behaviour [SCI-2855]	2019-03-11 15:09:49 +01:00
Oleksii Kriuchykhin	89e968c410	Add tui.image-editor [SCI-2815]	2019-03-11 15:08:15 +01:00
Jure Grabnar	eceda4909f	Move edit_file permission for wopi file in a special function ... Used for overwritting it in addons. Closes SCI-2949	2019-03-08 12:22:35 +01:00
Oleksii Kriuchykhin	2769add4d9	Disable edit button for unsupported WOPI formats [SCI-2904]	2018-12-31 18:10:12 +01:00
Oleksii Kriuchykhin	5c41527b92	Enable editing office online files in inventories [SCI-2342]	2018-05-21 15:48:48 +02:00
zmagod	0afe461962	fixes download link	2018-04-26 17:00:51 +02:00
zmagod	c2d19fee52	fixes images preview in repository/library [fixes SCI-2321]	2018-04-24 13:11:55 +02:00
Oleksii Kriuchykhin	cc5d8550b1	Refactor file preview modal [SCI-2217]	2018-03-30 11:50:28 +02:00
zmagod	dd2f7dd417	Merge branch 'master' of https://github.com/biosistemika/scinote-web into samples_to_repositories_table_migration	2018-03-13 13:24:36 +01:00
mlorb	64e26e1c60	add file custom column type to db	2018-03-09 17:04:54 +01:00
Matej Zrimšek	c5b0a6525b	Some additional permission calls fixes, minor refactoring.	2018-03-06 06:56:35 +01:00
Matej Zrimšek	5bda53eebf	Overall refactoring of all canaid permissions and code related to their calls.	2018-02-16 10:54:06 +01:00
Matej Zrimšek	8ef6c8f91f	Refactored remaining experiment level permissions (and everything below it).	2018-02-14 14:39:07 +01:00
Matej Zrimšek	d6e7ef465c	Grouped remaining permissions for experiment, protocol, task, and partially step levels. [SCI-1964]	2018-02-14 14:19:22 +01:00
Oleksii Kriuchykhin	7dd9121072	Actually return 404 when requested asset doesn't exist [SCI-1994]	2018-01-25 14:30:04 +01:00
mlorb	806fcbce36	refactor update protocol in repository permission	2017-12-14 14:18:16 +01:00
mlorb	e0d1ae174e	refactor read protocol in repository permission	2017-12-14 14:18:15 +01:00
mlorb	a3a494c3a2	fix banana: remove dead code which strangely reappeared, probably with some rebasing	2017-12-14 14:18:15 +01:00
zmagod	5cc6cd094e	refactor	2017-03-17 16:47:58 +01:00
zmagod	7b16e5643e	fix assets preprocesor for wopi files	2017-03-13 13:20:49 +01:00
zmagod	0c2523beca	Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration	2017-03-10 16:21:43 +01:00
Oleksii Kriuchykhin	89710d8782	Enable image preview for newly uploaded images [SCI-694]	2017-01-06 16:41:24 +01:00
Oleksii Kriuchykhin	aa2b573278	Enable image preview while editing steps and code style improvements [SCI-694]	2017-01-06 15:58:23 +01:00
zmagod	a434649f42	Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration	2017-01-03 16:35:25 +01:00
zmagod	e554fdf805	code refactor	2016-12-21 16:52:15 +01:00
Oleksii Kriuchykhin	00ea3a027c	Fix generation of preview url for new steps and results [SCI-694]	2016-12-20 16:10:53 +01:00