Commit graph

4933 commits

Author SHA1 Message Date
aignatov-bio
9000438025 Enable additional tools 2019-10-03 11:07:19 +02:00
Alex Kriuchykhin
ed6e5e244e
Merge pull request #2112 from okriuchykhin/ok_SCI_3938
Improve file processing indicator [SCI-3938]
2019-10-02 11:01:49 +02:00
Alex Kriuchykhin
2c3c690713
Merge pull request #2113 from okriuchykhin/ok_SCI_3839
Remove the deprecated foreign keys from TinyMceAsset [SCI-3839]
2019-10-02 10:39:35 +02:00
Urban Rotnik
4b626ab2dd
Merge pull request #2103 from urbanrotnik/ur-sci-3936-permission-issue
Add permission check for button show [SCI-3936]
2019-10-02 09:51:53 +02:00
Oleksii Kriuchykhin
dd7f2fe095 Fix large preview for documents [SCI-3938] 2019-10-01 16:14:28 +02:00
Oleksii Kriuchykhin
efe5d8a6ea Remove the deprecated foreign keys from TinyMceAsset [SCI-3839] 2019-10-01 15:49:37 +02:00
Oleksii Kriuchykhin
6a6a43f5ff Improve file processing indicator [SCI-3938] 2019-10-01 15:20:46 +02:00
aignatov-bio
835410a3d8
Merge pull request #2107 from aignatov-bio/ai-sci-3941-fix-docx-report-for-active-storage
Fix docx report for active storage [SCI-3941]
2019-10-01 14:54:29 +02:00
Alex Kriuchykhin
b5769ee66c
Merge pull request #2100 from okriuchykhin/ok_SCI_3935
Fix file handling in protocol import/copying [SCI-3935][SCI-3926][SCI-3934]
2019-10-01 13:45:26 +02:00
aignatov-bio
b8e917455a
Merge pull request #2104 from aignatov-bio/ai-sci-3907-update-marvin-js-asset-in-result-on-cancel
Update MarvinJS asset on result text cancel [SCI-3907]
2019-10-01 13:39:01 +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
Anton Ignatov
b382eb607b Fix docx report for active storage 2019-10-01 10:26:24 +02:00
aignatov-bio
91cc054096
Merge pull request #2105 from aignatov-bio/ai-sci-fix-tests-for-import-repository-row
Fix tests for repository row importer
2019-09-30 16:47:17 +02:00
Anton Ignatov
99005cf22e Fix tests for repository row importer 2019-09-30 16:27:45 +02:00
Anton Ignatov
859c5931a4 Update MArvinJS asset on result text cancel 2019-09-30 16:09:43 +02:00
Jure Grabnar
9f704559ef Fix hound formatting issues 2019-09-30 14:42:15 +02:00
Jure Grabnar
096228abbb Shorten padding format in scss 2019-09-30 14:32:09 +02:00
Urban Rotnik
5812ebe4d5 Add permission check for button show
SCI-3936
2019-09-30 14:30:03 +02:00
Jure Grabnar
070c307721 Implement style changes suggested by Anton 2019-09-30 14:27:00 +02:00
Urban Rotnik
9397705033 Fix positions of CoSign and Unlock buttons 2019-09-30 13:39:23 +02:00
Urban Rotnik
b13c429d26 SystemNotifications count position fixed 2019-09-30 13:12:35 +02:00
Urban Rotnik
dfafd4767c Fix Protocol buttons group
[SCI-3929]
2019-09-30 11:51:37 +02:00
Jure Grabnar
8441c5b6ed Add anchor to result text editing 2019-09-30 11:34:39 +02:00
Jure Grabnar
477e41a96d Refactor I18n strings for tiny_mce 2019-09-30 11:34:39 +02:00
Jure Grabnar
289853e2e8 Do not remove draft on step cancel (temporary)
Close SCI-3751
2019-09-30 11:34:39 +02:00
Jure Grabnar
b3cafcec7c Add restore draft notification to all models
Close SCI-3751
2019-09-30 11:34:39 +02:00
Jure Grabnar
0a36372321 Fix placeholder positioning 2019-09-30 11:34:39 +02:00
Jure Grabnar
b286e4adfd Fix styles for notification bar 2019-09-30 11:34:39 +02:00
Jure Grabnar
4f2182e2f5 Remove restoredraft icon 2019-09-30 11:34:39 +02:00
Jure Grabnar
6e33baa995 Add skeleton restore-draft notification for module description 2019-09-30 11:32:38 +02:00
Jure Grabnar
e24541ae51
Merge pull request #2087 from jbargu/jg_sci_3870
[SCI-3870] Change/fix asset locking mechanism
2019-09-30 08:48:39 +02:00
Jure Grabnar
0a3389f310 Fix operator for removing the lock on asset 2019-09-30 08:46:16 +02:00
mlorb
594124dad6
Merge pull request #2053 from mlorb/ml-sci-3637
Redesign of sorting button for projects/experiments cards [SCI-3637]
2019-09-27 12:44:44 +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
db36f379bb
Merge pull request #2097 from aignatov-bio/ai-sci-3930-fix-preview-for-result
Fix preview for result [SCI-3930]
2019-09-27 10:48:59 +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
Miha Mencin
56b196f9b4
Merge pull request #2091 from aignatov-bio/ai-sci-3907-fix-cancel-button-for-tiny-mce
Fix cancel button for marvinJS images [SCI-3907]
2019-09-27 10:46:38 +02:00
mlorb
2fd9345616
Merge pull request #2068 from mlorb/ml-sci-3816
Fix reloading of datatables header [SCI-3816]
2019-09-27 10:29:32 +02:00
Jure Grabnar
0c24210f6a
[SCI-3784] Small RTF improvements (#2061)
[SCI-3784] Small RTF improvements
2019-09-27 10:27:57 +02:00
mlorb
e3b0e149b6
Merge pull request #2077 from mlorb/ml-sci-3764
Expand clickable area of links in secondary navigation [SCI-3764]
2019-09-27 10:15:12 +02:00
mlorb
495d57b607
Merge pull request #2078 from mlorb/ml-sci-3906
Fix bug with inventory navigation height [SCI-3906]
2019-09-27 10:14:25 +02:00
mlorb
246634dbc4
Merge pull request #2069 from mlorb/ml-sci-3796
Fix inventory item selection when previewing file [SCI-3796]
2019-09-27 10:13:35 +02:00
Anton Ignatov
93363da4e5 Fix preview for result 2019-09-26 16:49:56 +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
d048b7fb56 Fix cancel button for marvinJS images 2019-09-26 11:25:34 +02:00
aignatov-bio
ba50b19986
Merge pull request #2082 from aignatov-bio/ai-sci-3907-fix-dirty-event-after-update-marvinjs-image
Fix dirty event after update marvinjs image [SCI-3907]
2019-09-25 13:51:36 +02:00