Jure Grabnar
|
6e33baa995
|
Add skeleton restore-draft notification for module description
|
2019-09-30 11:32:38 +02:00 |
|
Miha Mencin
|
5a0fff18ba
|
SCI-3937 remove cucumber tests from ci tests
|
2019-09-30 10:34:58 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Luka Murn
|
39b3868680
|
Merge pull request #2093 from Ducz0r/lm-active-mailer-config-minor-changes
ActiveMailer minor config changes
|
2019-09-27 10:17:05 +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 |
|
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 |
|
Luka Murn
|
a552356bfe
|
Minor comment text update
|
2019-09-25 13:16:16 +02:00 |
|
Luka Murn
|
093c6e37bc
|
Minor restructure/comment changes to ActionMailer config
|
2019-09-25 11:58:52 +02:00 |
|
Jure Grabnar
|
5cb900370a
|
Change/fix asset locking mechanism
Close SCI-3870
|
2019-09-25 11:07:53 +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 |
|
Jure Grabnar
|
37abc992f7
|
Merge pull request #2084 from jbargu/jg_sci_3821
Add tables functionality in tinymce
|
2019-09-24 12:45:19 +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 |
|
Jure Grabnar
|
ae83ef749f
|
Add tables functionality in tinymce
Close SCI-3821
|
2019-09-24 12:44:00 +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 |
|
Mojca Lorber
|
a85c80d994
|
Fix bug with inventory navigation height
|
2019-09-23 16:12:41 +02:00 |
|
Mojca Lorber
|
9f30e05594
|
Expand clickable area of links in secondary navigation
|
2019-09-23 14:34:48 +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 |
|