Commit graph

6301 commits

Author SHA1 Message Date
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
Urban Rotnik
248da9475f
Merge pull request #2102 from urbanrotnik/ur-sci-3929-missing-border
Fixed missing border, counter, buttons position [SCI-3929]
2019-09-30 14:34:02 +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
Miha Mencin
126c29ab12
Merge pull request #2101 from biosistemika/SCI-3937-disable-cucumber-tests
SCI-3937 disable cucumber tests
2019-09-30 11:54:10 +02:00
Urban Rotnik
dfafd4767c Fix Protocol buttons group
[SCI-3929]
2019-09-30 11:51:37 +02:00
Miha Mencin
5a0fff18ba SCI-3937 remove cucumber tests from ci tests 2019-09-30 10:34:58 +02:00
Urban Rotnik
47a46ecca1
Merge pull request #2099 from urbanrotnik/ur-sci-change-migrations-order-back
Change migrations order back
2019-09-27 16:31:53 +02:00
Urban Rotnik
60a414c4ec Change migrations order back 2019-09-27 16:20:56 +02:00
Miha Mencin
11881e54a5
Merge pull request #2062 from aignatov-bio/ai-sci-fix-routes-for-addons-installer
Fix routes for addons installer
2019-09-27 10:52:16 +02:00
Alex Kriuchykhin
d8a2ed0918
Merge pull request #2073 from okriuchykhin/ok_SCI_3890
Switch to Rails 6.0 app defaults with zeitwerk loader [SCI-3890]
2019-09-27 10:50:55 +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
Jure Grabnar
9682fdd73b
[SCI-3924] Export all email and notification is not receive (#2095)
[SCI-3924] Export all email and notification is not receive
2019-09-27 10:09:41 +02:00
Jure Grabnar
9a86b2422b
Merge pull request #2092 from jbargu/jg_change_migration_order
Change migration order for active storage
2019-09-27 10:09:20 +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
Jure Grabnar
c748513ca9 Rename Active storage migration to a later date 2019-09-26 13:55: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
aignatov-bio
daf8d88855
Merge pull request #2088 from aignatov-bio/ai-sci-3912-fix-tiny-mce-issue
Fix error handling and rubocop error [SCI-3912]
2019-09-25 13:51:26 +02:00
Anton Ignatov
305e9dc109 Fix error handling and rubocop error 2019-09-25 13:45:34 +02:00
aignatov-bio
429de4f115
Merge pull request #2083 from aignatov-bio/ai-sci-3904-fix-padding-for-marvinjs-promo-modal
Fix padding for marvinjs modal [SCI-3904]
2019-09-24 14:26:18 +02:00
aignatov-bio
856e876b61
Merge pull request #2079 from aignatov-bio/ai-sci-3900-fix-error-on-task-copy
Fix error on task copy [SCI-3900]
2019-09-24 14:16:38 +02:00
aignatov-bio
8a3b6b5cda
Merge pull request #2076 from aignatov-bio/ai-sci3769-fix-repository-row-import-export
Fix repository row import/export [SCI-3769]
2019-09-24 12:44:18 +02:00
Anton Ignatov
e01c438055 Fix padding for marvinjs modal 2019-09-24 11:02:15 +02:00
aignatov-bio
7c52728b08
Merge pull request #2081 from aignatov-bio/ai-sci-3901-recent-protocol-js-error
Fix JS error in recent protocol drop down [SCI-3901]
2019-09-24 10:38:42 +02:00
Anton Ignatov
6d81727bf1 Fix dirty event after update marvinjs image 2019-09-24 10:37:51 +02:00
Anton Ignatov
c389972e2a Fix JS error in recent protocol drop down 2019-09-24 09:47:04 +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
Anton Ignatov
09e3b7c80b Fix repository row import/export 2019-09-23 13:33:02 +02:00
Jure Grabnar
73020043a4
Merge pull request #2074 from biosistemika/jg_sci_3875
[SCI-3875] Content is not saved for office files
2019-09-20 14:07:45 +02:00
Jure Grabnar
8780e5183b Remove CSRF check in WopiController 2019-09-19 15:55:29 +02:00
Jure Grabnar
cc561d8ee5 Change wopi_controller using Paperclip for reading 2019-09-19 15:03:13 +02:00
Oleksii Kriuchykhin
83184c23f3 Switch to Rails 6.0 app defaults with zeitwerk loader [SCI-3890] 2019-09-19 13:21:32 +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
Alex Kriuchykhin
25c91c2724
Merge pull request #2072 from okriuchykhin/ok_SCI_3888
Add override for ActiveStorage downloader to handle missing file checksums [SCI-3888]
2019-09-18 15:46:51 +02:00
aignatov-bio
d783391290
Merge pull request #2071 from aignatov-bio/ai-sci-3889-fix-error-on-archived-experiment-page
Fix error on archived experiment page [SCI-3889]
2019-09-18 15:35:53 +02:00
Oleksii Kriuchykhin
b841d3dd6b Add override for ActiveStorage downloader to handle missing file checksums [SCI-3888] 2019-09-18 15:34:49 +02:00
aignatov-bio
7951ae4218
Merge pull request #2070 from aignatov-bio/ai-sci-3874-error-handling-when-image-unavalialbe-for-base64
Error handling, when image unavaliable for base64 [SCI-3874]
2019-09-18 15:27:49 +02:00
Anton Ignatov
5a1efb84c6 Fix error on archived experiment page 2019-09-18 15:23:45 +02:00
Anton Ignatov
69eb8681bd Error handling, when image unavaliable for base64 2019-09-18 15:11:51 +02:00
aignatov-bio
fba030dc9d
Merge pull request #2067 from aignatov-bio/ai-sci-3880-fix-error-when-save-pdf-to-inventory
Fix error when save report to inventory [SCI-3880]
2019-09-18 14:59:47 +02:00