Commit graph

80 commits

Author SHA1 Message Date
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