Oleksii Kriuchykhin
|
b646295698
|
Fix service_url for local storage [SCI-4057]
|
2019-11-06 15:21:56 +01:00 |
|
aignatov-bio
|
e4a39bbbe4
|
Add check for files
|
2019-11-06 14:41:51 +01:00 |
|
aignatov-bio
|
0c5ce90895
|
Fix eln export for file without extension
|
2019-11-06 09:53:44 +01:00 |
|
Alex Kriuchykhin
|
522d236e10
|
Merge pull request #2198 from okriuchykhin/ok_SCI_4053
Fix TinyMCE images in protocol cloning [SCI-4053]
|
2019-11-05 18:15:22 +01:00 |
|
Oleksii Kriuchykhin
|
b2eda231a0
|
Fix TinyMCE images in protocol clonning [SCI-4053]
|
2019-11-05 18:13:44 +01:00 |
|
Alex Kriuchykhin
|
95686a9275
|
Merge pull request #2197 from okriuchykhin/ok_SCI_4053
Fix TinyMCE image URLs in the editor [SCI-4053]
|
2019-11-05 13:46:48 +01:00 |
|
Oleksii Kriuchykhin
|
67fdda1eeb
|
Fix TinyMCE image URLs in the editor [SCI-4053]
|
2019-11-05 13:38:47 +01:00 |
|
aignatov-bio
|
ae0db3a7bc
|
Update avatars and small CSS fixes
|
2019-11-05 10:43:02 +01:00 |
|
aignatov-bio
|
b56a997aef
|
Fix team import for user with avatars
|
2019-11-04 14:53:59 +01:00 |
|
Mojca Lorber
|
16eddc0ad0
|
Save on click away, inline editing
|
2019-11-03 14:59:30 +01:00 |
|
Alex Kriuchykhin
|
ec66ab8654
|
Merge pull request #2190 from mlorb/ml-sci-4023
Small improvements in the avatar settings [SCI-4023]
|
2019-10-30 16:02:24 +01:00 |
|
Oleksii Kriuchykhin
|
1e748f2d7e
|
Fix reports in team importer [SCI-4028]
|
2019-10-30 15:47:11 +01:00 |
|
Mojca Lorber
|
a3ded83292
|
Small css change
|
2019-10-30 15:42:11 +01:00 |
|
Mojca Lorber
|
7b86a3932a
|
Additional avatar small fixes
|
2019-10-30 15:23:14 +01:00 |
|
Alex Kriuchykhin
|
2e4f444f63
|
Merge pull request #2191 from okriuchykhin/ok_SCI_4047
Fix LinkedIn sign-up [SCI-4047]
|
2019-10-29 16:29:13 +01:00 |
|
Oleksii Kriuchykhin
|
ab691efdb2
|
Fix LinkedIn sign-up [SCI-4047]
|
2019-10-29 16:20:19 +01:00 |
|
aignatov-bio
|
717b70f75b
|
Merge pull request #2171 from aignatov-bio/ai-sci-3995-fix-avatar-comments-and-activties
Fix avatars in comments and activities [SCI-3995]
|
2019-10-29 14:11:39 +01:00 |
|
Mojca Lorber
|
a0873cb16d
|
Small improvements in the avatar settings
|
2019-10-29 13:21:22 +01:00 |
|
Alex Kriuchykhin
|
ba3a5e5460
|
Merge pull request #2159 from mlorb/ml-sci-3816-v2
Fix reloading of datatables header again [SCI-3816]
|
2019-10-29 10:33:04 +01:00 |
|
Urban Rotnik
|
169a381629
|
Merge pull request #2170 from urbanrotnik/ur-sci-4008-rte-image-download
Fix for downloading image [SCI-4008]
|
2019-10-22 15:12:11 +02:00 |
|
Urban Rotnik
|
a7d351dc38
|
Add file size check
|
2019-10-22 14:13:22 +02:00 |
|
Alex Kriuchykhin
|
e333e7c44a
|
Merge pull request #2173 from biosistemika/release_1_17_4
Merge release 1.17.4 to master
|
2019-10-22 13:21:02 +02:00 |
|
Alex Kriuchykhin
|
5524598d53
|
Merge pull request #2172 from biosistemika/release_1_17_3
Merge release 1.17.3 to master
|
2019-10-22 12:45:02 +02:00 |
|
aignatov-bio
|
9950a23188
|
Replace base64 avatars with url
|
2019-10-22 12:27:13 +02:00 |
|
Urban Rotnik
|
0119533e75
|
Fix for file generation
|
2019-10-22 11:02:59 +02:00 |
|
aignatov-bio
|
4d3e318174
|
Add check for existing elements
|
2019-10-22 10:46:16 +02:00 |
|
aignatov-bio
|
aaf76c0526
|
Fix avatars in comments and activities
|
2019-10-22 09:54:36 +02:00 |
|
Urban Rotnik
|
ce9f1b1309
|
Add mceToken check
|
2019-10-22 08:28:35 +02:00 |
|
Oleksii Kriuchykhin
|
6c57f56bf4
|
Fix issue with empty cells for xlsx inventory imports [SCI-4003]
|
2019-10-21 12:06:45 +02:00 |
|
Oleksii Kriuchykhin
|
4cba412e31
|
Fix protocols table select all checkbox [SCI-3999]
|
2019-10-17 17:05:01 +02:00 |
|
Alex Kriuchykhin
|
34f9e6265c
|
Merge pull request #2162 from okriuchykhin/ok_SCI_3990
Fix images in reports, impove speed of report generation [SCI-3990][SCI-3993]
|
2019-10-17 17:03:11 +02:00 |
|
Miha Mencin
|
0af8629f98
|
SCI-3994 fix for excel import
|
2019-10-17 14:37:11 +02:00 |
|
Oleksii Kriuchykhin
|
53402c9ce1
|
Fix images in reports, impove speed of report generation [SCI-3990][SCI-3993]
|
2019-10-17 13:30:14 +02:00 |
|
Mojca Lorber
|
b78211e3ca
|
Fix reloading of datatables header again
|
2019-10-16 13:02:41 +02:00 |
|
Oleksii Kriuchykhin
|
f3a6c18a84
|
Improve permission checking for reports [SCI-3991]
|
2019-10-14 14:50:05 +02:00 |
|
aignatov-bio
|
198697ff23
|
Fix avatar localization
|
2019-10-11 12:22:09 +02:00 |
|
aignatov-bio
|
54627faeb3
|
Fix tests
|
2019-10-11 11:46:51 +02:00 |
|
aignatov-bio
|
521a367960
|
Add predefined avatars
|
2019-10-11 11:46:51 +02:00 |
|
aignatov-bio
|
1f43f35073
|
First modal
|
2019-10-11 11:46:51 +02:00 |
|
Oleksii Kriuchykhin
|
8f52b362d6
|
Fix file handling in protocol import/copying [SCI-3935][SCI-3926][SCI-3934]
|
2019-10-11 11:46:51 +02:00 |
|
Alex Kriuchykhin
|
f6da6814b8
|
Merge pull request #2154 from okriuchykhin/ok_SCI_3977
Generate previews for newly created office files once asset is saved [SCI-3977]
|
2019-10-10 15:43:02 +02: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 |
|
Alex Kriuchykhin
|
48171f7e02
|
Merge pull request #2153 from okriuchykhin/ok_SCI_3977
Fix previews for newly created office files [SCI-3977]
|
2019-10-10 15:11:24 +02:00 |
|
Oleksii Kriuchykhin
|
0b4f72e517
|
Fix previews for newly created office files [SCI-3977]
|
2019-10-10 14:25:19 +02:00 |
|
aignatov-bio
|
9d59d56818
|
Generate all preview for assets at same time
|
2019-10-10 14:17:02 +02:00 |
|
Miha Mencin
|
e2b5989c14
|
Revert "Handle missing experiment previews [SCI-3949]"
|
2019-10-09 16:42:15 +02:00 |
|
Alex Kriuchykhin
|
71aa8e646e
|
Merge pull request #2147 from okriuchykhin/ok_SCI_3949
Handle missing experiment previews [SCI-3949]
|
2019-10-09 16:27:16 +02:00 |
|
Oleksii Kriuchykhin
|
00921a5f6a
|
Hadle missing experiment previews [SCI-3949]
|
2019-10-09 16:24:21 +02:00 |
|
Miha Mencin
|
8e98c82bbf
|
SCI-3979 removing accessors
|
2019-10-09 15:49:49 +02:00 |
|
Miha Mencin
|
6d71036d07
|
Remove paperclip attribute accessors
|
2019-10-09 10:20:00 +02:00 |
|
Miha Mencin
|
78fd5df0f6
|
Revert "Fix report in academia"
|
2019-10-09 10:16:39 +02:00 |
|
Miha Mencin
|
37e6604f8b
|
Merge pull request #2136 from biosistemika/SCI-3975-team-export
Sci 3975 team export
|
2019-10-08 21:47:08 +02:00 |
|
Miha Mencin
|
fa871bf56e
|
Merge branch 'SCI-3975-team-export' of github.com:biosistemika/scinote-web into SCI-3975-team-export
|
2019-10-08 21:42:13 +02:00 |
|
Miha Mencin
|
f12c29bd2a
|
fixing import
|
2019-10-08 21:40:44 +02:00 |
|
aignatov-bio
|
5eed152403
|
Revert "Force save office file"
|
2019-10-08 21:34:16 +02:00 |
|
aignatov-bio
|
0d88466894
|
Merge pull request #2139 from aignatov-bio/ai-sci-fix-office-save
Force save office file
|
2019-10-08 21:11:33 +02:00 |
|
aignatov-bio
|
236ce30254
|
Force save office file
|
2019-10-08 21:10:18 +02:00 |
|
aignatov-bio
|
4a5db36c07
|
Merge pull request #2138 from aignatov-bio/ai-sci-fix-report-in-academia
Fix report in academia
|
2019-10-08 20:19:48 +02:00 |
|
aignatov-bio
|
5d80c51996
|
Fix report in academia
|
2019-10-08 20:18:51 +02:00 |
|
aignatov-bio
|
65ab3c421a
|
Merge pull request #2137 from aignatov-bio/ai-sci-fix-async-request-for-multiple-result
Fix async assets results
|
2019-10-08 19:52:04 +02:00 |
|
aignatov-bio
|
a930f7affd
|
Fix async assets results
|
2019-10-08 19:51:03 +02:00 |
|
Miha Mencin
|
c673c3960f
|
removin uneeded stuff left there by supidity
|
2019-10-08 17:23:46 +02:00 |
|
Miha Mencin
|
4f290cacfc
|
remove the unneeded require
|
2019-10-08 16:22:48 +02:00 |
|
Miha Mencin
|
de89a97e0a
|
Merge branch 'master' of github.com:biosistemika/scinote-web into SCI-3975-team-export
|
2019-10-08 16:20:40 +02:00 |
|
Miha Mencin
|
5f16926280
|
SCI-3976 different approach to file download
|
2019-10-08 16:20:16 +02:00 |
|
Alex Kriuchykhin
|
f82d02b5d0
|
Merge pull request #2134 from okriuchykhin/ok_SCI_3960
Fix team deletion script [SCI-3960]
|
2019-10-08 13:35:07 +02:00 |
|
Alex Kriuchykhin
|
6306691cfe
|
Merge pull request #2133 from okriuchykhin/ok_SCI_3959
Implement JPEG quality extraction for ActiveStorage [SCI-3959]
|
2019-10-08 13:34:57 +02:00 |
|
Oleksii Kriuchykhin
|
6908a5c3a3
|
Fix team deletion script [SCI-3960]
|
2019-10-08 12:04:47 +02:00 |
|
Oleksii Kriuchykhin
|
3d9c2282f3
|
Implement JPEG quality extraction for ActiveStorage [SCI-3959]
|
2019-10-08 10:42:55 +02:00 |
|
aignatov-bio
|
f9497e2e3e
|
Fix TinyMCE import from ELN
|
2019-10-07 16:21:11 +02:00 |
|
Alex Kriuchykhin
|
39a2669eef
|
Merge pull request #2129 from okriuchykhin/ok_SCI_3950
Improve missing files handling when clonning TinyMceAsset [SCI-3950]
|
2019-10-07 09:18:45 +02:00 |
|
Oleksii Kriuchykhin
|
a2d70afeca
|
Improve missing files handling when clonning TinyMceAsset [SCI-3950]
|
2019-10-04 15:59:22 +02:00 |
|
mlorb
|
ba8ee86c9f
|
Merge pull request #2128 from mlorb/ml-sci-3966
Fix position of shared inventory icon [SCI-3966]
|
2019-10-04 15:21:48 +02:00 |
|
aignatov-bio
|
002686ba23
|
Merge pull request #2127 from aignatov-bio/ai-sci-3965-fix-complete-button-position
Fix complete button position [SCI-3965]
|
2019-10-04 15:19:27 +02:00 |
|
Mojca Lorber
|
564321d327
|
Fix position of shared inventory icon
|
2019-10-04 15:18:17 +02:00 |
|
aignatov-bio
|
b460cd4384
|
Fix complete button position
|
2019-10-04 15:17:28 +02:00 |
|
Urban Rotnik
|
037bba9a16
|
Merge pull request #2126 from urbanrotnik/ur-sci-3738-new-ste-default-field-selection
Fix focus for RTE [SCI-3738]
|
2019-10-04 15:02:55 +02:00 |
|
Urban Rotnik
|
bd1c5e4454
|
Fix focus for RTE
|
2019-10-04 14:55:14 +02:00 |
|
mlorb
|
9e1339fb18
|
Merge pull request #2124 from aignatov-bio/ai-sci-3961-fix-image-in-archive-experiments
Fix image in archived experiments [SCI-3961]
|
2019-10-04 14:52:55 +02:00 |
|
aignatov-bio
|
23581059e7
|
Remove image
|
2019-10-04 14:50:27 +02:00 |
|
Urban Rotnik
|
c296760be8
|
Merge pull request #2125 from urbanrotnik/ur-sci-3962-step-is-not-saved-after-removing-file
Add team_id when asset is creating [SCI-3962]
|
2019-10-04 14:46:18 +02:00 |
|
Alex Kriuchykhin
|
076d61d4d0
|
Merge pull request #2116 from okriuchykhin/ok_SCI_3908
Remove Paperclip from the codebase [SCI-3908]
|
2019-10-04 14:45:42 +02:00 |
|
Urban Rotnik
|
8f0c3bd2ce
|
Add team_id when asset is creating
|
2019-10-04 14:24:19 +02:00 |
|
aignatov-bio
|
a7b13a4a70
|
Fix image in archived experiments
|
2019-10-04 13:29:42 +02:00 |
|
Oleksii Kriuchykhin
|
9d2ac4179e
|
Fix failing tests [SCI-3908]
|
2019-10-04 13:02:18 +02:00 |
|
aignatov-bio
|
8176ce3a9d
|
Merge pull request #2123 from aignatov-bio/ai-sci-fix-merge-for-repository-datatable
Fix merge for repository datatable [SCI-3957]
|
2019-10-04 12:59:22 +02:00 |
|
aignatov-bio
|
fcc1829660
|
Fix merge for repository datatable
|
2019-10-04 10:51:13 +02:00 |
|
aignatov-bio
|
a39a95d2a7
|
Merge pull request #2122 from aignatov-bio/ai-sci-disable-autosave-feature
Disable autosave notification feature
|
2019-10-04 09:17:16 +02:00 |
|
Urban Rotnik
|
c69e47de40
|
Merge pull request #2121 from okriuchykhin/ok_SCI_3950
Skip missing files when cloning TinyMceAsset [SCI-3950]
|
2019-10-04 09:17:02 +02:00 |
|
aignatov-bio
|
9e7eff9615
|
Merge pull request #2120 from aignatov-bio/ai-sci-3946-remove-image-icon-from-preview
Remove image icon from preview [SCI-3946]
|
2019-10-04 09:16:47 +02:00 |
|
aignatov-bio
|
c2c8343c57
|
Merge pull request #2111 from aignatov-bio/ai-sci-3943-fix-marvinjs-in-search
Fix MarvinJS representation in global search [SCI-3943]
|
2019-10-04 09:16:34 +02:00 |
|
aignatov-bio
|
af69e12d1e
|
Disable autosave notification feature
|
2019-10-04 09:13:42 +02:00 |
|
Urban Rotnik
|
09e6545f30
|
Merge pull request #2115 from urbanrotnik/ur-sci-3947-local-storage
Fix for disk storage [SCI-3947]
|
2019-10-03 16:28:09 +02:00 |
|
aignatov-bio
|
0cbc699c62
|
Remove image icon from preview
|
2019-10-03 15:44:03 +02:00 |
|
Oleksii Kriuchykhin
|
bab228e1df
|
Skip missing files when clonning TinyMceAsset [SCI-3950]
|
2019-10-03 15:43:39 +02:00 |
|
Urban Rotnik
|
81d66ceedd
|
Add CustomDisk Service for ActiveStorage
|
2019-10-03 13:16:15 +02:00 |
|
aignatov-bio
|
afecc3fd0e
|
Merge pull request #2119 from aignatov-bio/ai-sci-fix-marvin-js-preview
Fix marvin JS preview
|
2019-10-03 11:59:19 +02:00 |
|
aignatov-bio
|
a31c5ea1f5
|
Fix marvin JS preview
|
2019-10-03 11:54:26 +02:00 |
|
aignatov-bio
|
e35617208d
|
Merge pull request #2118 from aignatov-bio/ai-sci-3841-enable-additional-tools
Enable additional tools [SCI-3841]
|
2019-10-03 11:24:31 +02:00 |
|
aignatov-bio
|
65b1e0c041
|
Fix reload page
|
2019-10-03 11:19:12 +02:00 |
|
aignatov-bio
|
9000438025
|
Enable additional tools
|
2019-10-03 11:07:19 +02:00 |
|
Urban Rotnik
|
9c88327a16
|
Rename ActiveStorage base controller
|
2019-10-03 11:00:59 +02:00 |
|
aignatov-bio
|
301b37cccd
|
Fix duplicate code in file preview
|
2019-10-03 10:55:54 +02:00 |
|
Oleksii Kriuchykhin
|
260fcd6e89
|
Remove Paperclip from codebase [SCI-3908]
|
2019-10-02 19:45:14 +02:00 |
|
Urban Rotnik
|
e2a779ccfe
|
Activestorage fix for disk storage
[SCI-3947]
|
2019-10-02 14:01:38 +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 |
|
aignatov-bio
|
675d5eb088
|
Fix MarvinJS representation in global search
|
2019-10-01 14:20:20 +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 |
|
Anton Ignatov
|
305e9dc109
|
Fix error handling and rubocop error
|
2019-09-25 13:45:34 +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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
Mojca Lorber
|
4263edf0cc
|
Fix inventory item selection when previewing file
|
2019-09-18 15:08:40 +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 |
|
aignatov-bio
|
c652bb0d44
|
Merge pull request #2066 from aignatov-bio/ai-sci-3878-fix-missing-expand-all-steps-button
Fix missing expand all button [SCI-3878]
|
2019-09-18 14:59:29 +02:00 |
|
aignatov-bio
|
ce91759ee2
|
Merge pull request #2065 from aignatov-bio/ai-sci-3879-fix-step-table-error
Fix step table error [SCI-3879]
|
2019-09-18 14:59:16 +02:00 |
|
Mojca Lorber
|
4d4a275c0d
|
Fix reloading of datatables header
|
2019-09-18 14:28:29 +02:00 |
|
Anton Ignatov
|
b9f6b3a082
|
Fix error when save report to inventory
|
2019-09-18 12:50:54 +02:00 |
|
Anton Ignatov
|
0adb016293
|
Fix missing expand all button
|
2019-09-18 12:33:48 +02:00 |
|
Anton Ignatov
|
146c725e89
|
Fix step table error
|
2019-09-18 11:47:33 +02:00 |
|
aignatov-bio
|
f205e4aa80
|
Merge pull request #2064 from aignatov-bio/ai-sci-3873-fix-file-preview-in-inventory
Fix file preview in inventory [SCI-3873]
|
2019-09-18 11:36:43 +02:00 |
|
aignatov-bio
|
d028856fe0
|
Fix hidden buttons in inventory (#2063)
|
2019-09-18 11:36:30 +02:00 |
|
Anton Ignatov
|
68994a77c8
|
Fix file preview in inventory
|
2019-09-18 11:21:33 +02:00 |
|
aignatov-bio
|
11f6517d0a
|
Fix duplicate marvinjs save (#2057)
|
2019-09-18 11:18:44 +02:00 |
|
aignatov-bio
|
52499fa285
|
Fix pathe to icon for chemical structure (#2056)
|
2019-09-18 11:18:31 +02:00 |
|
Jure Grabnar
|
40aa1a37a2
|
Change colors of active buttons TinyMCE
Close SCI-3784
|
2019-09-17 15:45:27 +02:00 |
|
Oleksii Kriuchykhin
|
e12cd0ae9d
|
Fix autoloading issues [SCI-3881]
|
2019-09-17 10:50:01 +02:00 |
|
Mojca Lorber
|
47ccf38662
|
Redesign of sorting button for projects/experiments cards
|
2019-09-16 14:43:12 +02:00 |
|
Oleksii Kriuchykhin
|
3509543e7b
|
Merge branch 'master' into ok_SCI_3881
|
2019-09-16 11:56:49 +02:00 |
|
Oleksii Kriuchykhin
|
bc38c6b29e
|
Fix failing test [SCI-3745]
|
2019-09-16 10:26:13 +02:00 |
|
Oleksii Kriuchykhin
|
c068901b00
|
Upgrade Rails to 6.0 [SCI-3745]
|
2019-09-12 17:24:08 +02:00 |
|
Alex Kriuchykhin
|
0d6f011e61
|
Merge pull request #2006 from okriuchykhin/ok_SCI_3765
Add path method to custom ActiveStorage S3 service [SCI-3765]
|
2019-09-12 15:34:03 +02:00 |
|
aignatov-bio
|
c4e8e8ed07
|
Revert "Fix formulas in project export (#2047)" (#2049)
This reverts commit 36ae7d05f9 .
|
2019-09-12 10:45:43 +02:00 |
|
aignatov-bio
|
a3b2c7d5fe
|
Fix report image issues [SCI-3772] (#1983)
* Fix report image issues
* Small fixes
|
2019-09-12 09:02:45 +02:00 |
|
aignatov-bio
|
36ae7d05f9
|
Fix formulas in project export (#2047)
|
2019-09-12 08:43:59 +02:00 |
|
aignatov-bio
|
07b9091e23
|
Fix html escape in unshared warning (#2048)
|
2019-09-11 16:33:31 +02:00 |
|
aignatov-bio
|
40b5b2406b
|
Fix big inventory names (#2046)
|
2019-09-11 15:44:38 +02:00 |
|
aignatov-bio
|
27104a495c
|
Fix styling for unshared warning message (#2044)
|
2019-09-11 11:50:02 +02:00 |
|
mlorb
|
cf8c98dfa3
|
Merge pull request #2042 from biosistemika/hotfix-september
Hotfix september
|
2019-09-10 13:53:28 +02:00 |
|
mlorb
|
e596afa595
|
Merge pull request #2041 from mlorb/ml-sci-3847
Fix missing icon on shared inventories in global search [SCI-3847]
|
2019-09-10 13:51:58 +02:00 |
|
aignatov-bio
|
1f12a63a25
|
Fix counter on task inventory and failing test (#2043)
|
2019-09-10 13:51:37 +02:00 |
|
Mojca Lorber
|
e8f24b18e2
|
Fix missing icon on shared inventories in global search
|
2019-09-10 11:20:18 +02:00 |
|
Miha Mencin
|
33d495956e
|
Merge pull request #2040 from biosistemika/SCI3818-unshared-inventory-screen
adding missing file
|
2019-09-09 16:47:47 +02:00 |
|
Miha Mencin
|
01628e1efc
|
adding missing file
|
2019-09-09 16:46:51 +02:00 |
|
aignatov-bio
|
01d6a17f2b
|
Fix permission check for inventory (#2039)
|
2019-09-09 15:11:18 +02:00 |
|
Alex Kriuchykhin
|
b8a5b1b542
|
Merge pull request #2036 from okriuchykhin/ok_SCI_3815
Improve behavior of inventory items export modal [SCI-3815]
|
2019-09-09 11:08:02 +02:00 |
|
Alex Kriuchykhin
|
1714212630
|
Merge pull request #2035 from okriuchykhin/ok_SCI_3827
Add local sorting for ProtocolsIO [SCI-3827]
|
2019-09-09 10:55:22 +02:00 |
|
aignatov-bio
|
16ae00782a
|
Fix new step button on empty task [SCI-3826] (#2026)
* Fix new step button on empty task
* Fix markup
|
2019-09-09 10:43:38 +02:00 |
|
aignatov-bio
|
fdce4e6c7c
|
Remove link to archived project page (#2037)
|
2019-09-09 10:43:08 +02:00 |
|
Oleksii Kriuchykhin
|
265047caf3
|
Improve behaviour of inventory items export modal [SCI-3815]
|
2019-09-09 10:38:47 +02:00 |
|
Miha Mencin
|
12d6804263
|
Merge pull request #2034 from biosistemika/SCI3818-unshared-inventory-screen
SCI-3818-unshared-inventory-screen
|
2019-09-09 09:30:34 +02:00 |
|
Miha Mencin
|
d522b3807a
|
codestyle improvements
|
2019-09-06 14:59:30 +02:00 |
|
Miha Mencin
|
7fc5035d2d
|
PR fixes, codestyle fixes
|
2019-09-06 13:47:06 +02:00 |
|
Oleksii Kriuchykhin
|
6f7ef25514
|
Add local sorting for ProtocolsIO [SCI-3827]
|
2019-09-05 14:49:16 +02:00 |
|
Miha Mencin
|
2486bd0077
|
SCI3818-unshared-inventory-screen
|
2019-09-05 14:03:08 +02:00 |
|
aignatov-bio
|
15dc25cee9
|
Fix handson table initialization [SCI-3749] (#2021)
* Fix handson table initialization
* Fix markup
|
2019-09-05 08:35:28 +02:00 |
|
aignatov-bio
|
bc86d5bc40
|
Fix import items to inventory (#2019)
|
2019-09-05 08:35:11 +02:00 |
|
aignatov-bio
|
b8e68e02a1
|
Fix error, when cancel tag editing (#2025)
|
2019-09-05 08:34:33 +02:00 |
|
Alex Kriuchykhin
|
59a85d8181
|
Merge pull request #2004 from okriuchykhin/ok_SCI_3778
Fix new office file creation [SCI-3778]
|
2019-09-04 15:40:34 +02:00 |
|
Mojca Lorber
|
a312c0c4b8
|
fix bug on api endpoint when creating result
|
2019-09-04 13:41:06 +02:00 |
|
aignatov-bio
|
481be7b92e
|
Fix padding to share modal (#2024)
|
2019-09-03 12:06:16 +02:00 |
|
mlorb
|
ba5bebedb2
|
change inlane editing css, add shared inventory subtitle and add tooltips to shared inventories icons (#2022)
|
2019-09-02 10:30:29 +02:00 |
|
Oleksii Kriuchykhin
|
267c53c2d2
|
Refactor inventory sharing logic [SCI-3803]
|
2019-08-29 17:21:49 +02:00 |
|
aignatov-bio
|
d209b3abcd
|
Update share modal window [SCI-3812] (#2018)
* Update share modal window
* Fix markup
|
2019-08-29 13:45:27 +02:00 |
|
aignatov-bio
|
d3ccdbd83e
|
Create copy permission (#2017)
|
2019-08-29 13:39:22 +02:00 |
|
aignatov-bio
|
4d20cd7d55
|
Fix copy inventory permission (#2016)
|
2019-08-26 14:48:38 +02:00 |
|
Miha Mencin
|
0058198bb5
|
Merge branch 'master' into SCI-3806-shared-status-dropdown
|
2019-08-26 11:55:25 +02:00 |
|
mlorb
|
ffe06d5070
|
Merge pull request #2010 from mlorb/ml-sci-3805
Add a team name to inventory item card [SCI-3805]
|
2019-08-26 11:29:12 +02:00 |
|
aignatov-bio
|
66326d90e5
|
Fix shared icon show/hidden (#2014)
|
2019-08-26 11:24:22 +02:00 |
|
Miha Mencin
|
a7bb7a1dd8
|
additional checking for icon: check also if user is guest
|
2019-08-26 11:20:18 +02:00 |
|
aignatov-bio
|
b3e3c443f0
|
Fix big gap in title of navbar (#2015)
|
2019-08-26 11:20:03 +02:00 |
|
Miha Mencin
|
b850efbceb
|
Code review remarks, added tooltip for unshared inventory
|
2019-08-26 10:45:40 +02:00 |
|
aignatov-bio
|
5bf3a5d418
|
Fix sharing check in service [SCI-3798] (#2011)
* Update shared inventory permissions
* Fix tests and simplify condition for placeholder
* Fix sharing check in service
* Fix rebase conflicts
|
2019-08-26 09:36:41 +02:00 |
|
Miha Mencin
|
9e9e698778
|
SCI-3806 Add an icon indicating shared status to dropdown
|
2019-08-26 09:14:37 +02:00 |
|
aignatov-bio
|
96e132c62e
|
Hide share button for users with one team (#2005)
|
2019-08-23 11:29:03 +02:00 |
|
aignatov-bio
|
5515bac773
|
Add assigned items from shared inventories to report (#2002)
|
2019-08-23 11:28:09 +02:00 |
|
Mojca Lorber
|
50c78f182c
|
Add a team name to inventory item card
|
2019-08-23 11:13:58 +02:00 |
|
aignatov-bio
|
0810699770
|
Update shared inventory permissions [SCI-3802] (#2009)
* Update shared inventory permissions
* Fix tests and simplify condition for placeholder
|
2019-08-23 10:57:02 +02:00 |
|
Luka Murn
|
5d3a0d7eea
|
Merge pull request #2003 from Ducz0r/lm-remove-legacy-projects-views
Remove legacy projects archive HTML views
|
2019-08-21 17:08:27 +02:00 |
|
Luka Murn
|
701bdbd294
|
Remove archive controller action
|
2019-08-21 16:01:12 +02:00 |
|
aignatov-bio
|
d70b7e2272
|
Make share status icon dynamic (#2007)
|
2019-08-21 15:32:57 +02:00 |
|
aignatov-bio
|
5e3f1d59f5
|
Fix inventory rows import (#1997)
|
2019-08-21 15:32:45 +02:00 |
|
Oleksii Kriuchykhin
|
2298ba4e4e
|
Add path method to custom ActiveStorage S3 service [SCI-3765]
|
2019-08-21 14:33:28 +02:00 |
|
Oleksii Kriuchykhin
|
3918c893db
|
Fix new office file creation [SCI-3778]
|
2019-08-21 13:26:11 +02:00 |
|
Luka Murn
|
084cdcdd6b
|
Remove old archive endpoint, controller logic
|
2019-08-21 13:17:19 +02:00 |
|
Luka Murn
|
2db39c049e
|
Remove projects archive page
|
2019-08-21 13:10:54 +02:00 |
|
aignatov-bio
|
f94b8165dc
|
Fix marvinjs edit button and icon (#1985)
|
2019-08-21 11:15:57 +02:00 |
|
aignatov-bio
|
e682a3e5d9
|
Fix steps description and table saving (#1984)
|
2019-08-21 11:05:49 +02:00 |
|
aignatov-bio
|
4730e7bfee
|
Change notification counter position (#2000)
|
2019-08-21 10:39:56 +02:00 |
|
aignatov-bio
|
0b85dcbead
|
Fix long inventory names (#1999)
|
2019-08-21 10:39:48 +02:00 |
|
aignatov-bio
|
e2ad383c69
|
Fix UX for task inventory dropdown and big task title [SCI-3791] (#1998)
* Fix ux for task inventory dropdown and big task title
* Fix markup
|
2019-08-21 10:39:37 +02:00 |
|
Anton Ignatov
|
ed8ef7aa8f
|
Fix permission check;
|
2019-08-20 16:07:22 +02:00 |
|
Anton Ignatov
|
a2c50cbe38
|
Add new permission check for share button
|
2019-08-20 15:08:53 +02:00 |
|
Mojca Lorber
|
530d09df64
|
add i-shared inventory icon
|
2019-08-19 15:43:55 +02:00 |
|
Luka Murn
|
ebda2c832a
|
Merge pull request #1995 from biosistemika/release-1.16.8
Merge release-1.16.8 into master
|
2019-08-19 15:08:33 +02:00 |
|
aignatov-bio
|
58d9be480f
|
Remove rename button from dropdown (#1994)
|
2019-08-19 14:29:38 +02:00 |
|
aignatov-bio
|
a505ef2462
|
Fix error in inventories for new teams [SCI-3788] (#1992)
* Fix error in inventories for new teams
* Replace with current team
|
2019-08-19 14:01:48 +02:00 |
|
aignatov-bio
|
b6661682ad
|
Fix shared inventory in task dropdown (#1993)
|
2019-08-19 13:56:02 +02:00 |
|
aignatov-bio
|
2cf7f52f15
|
Add inline editing for inventories [SCI-3763] (#1991)
* Add inline editing for inventories
* Remove old locals
* Markup fix
|
2019-08-19 13:30:56 +02:00 |
|
aignatov-bio
|
d4aedbb35f
|
Small ux changes for inventories (#1989)
|
2019-08-19 09:24:10 +02:00 |
|
aignatov-bio
|
d741e52427
|
Fix global search for inventories (#1988)
|
2019-08-19 09:23:59 +02:00 |
|
Miha Mencin
|
5adb745743
|
Merge pull request #1987 from aignatov-bio/ai-sci-3785-fix-assign-unassing-buttons
Fix assign/unassign buttons [SCI-3785]
|
2019-08-19 08:51:14 +02:00 |
|
Anton Ignatov
|
ec57e0aa91
|
Fix assign/unassign buttons
|
2019-08-16 10:05:01 +02:00 |
|
Anton Ignatov
|
d1e1da8580
|
Fix permission check for invite users
|
2019-08-14 14:47:02 +02:00 |
|
Urban Rotnik
|
89f289660b
|
Add share_with_all feature to service, add new activities
|
2019-08-14 11:03:15 +02:00 |
|
aignatov-bio
|
6fda5401f5
|
Fix protocol import (#1981)
|
2019-08-14 09:06:25 +02:00 |
|
aignatov-bio
|
710af85743
|
Fix template generating (#1980)
|
2019-08-14 09:06:12 +02:00 |
|
Alex Kriuchykhin
|
960e69eaa8
|
Fix wopi file download URL [SCI-3757] (#1975)
|
2019-08-14 09:06:00 +02:00 |
|
Urban Rotnik
|
0ce331227c
|
Update permission and model to share repository over all teams
|
2019-08-13 14:07:24 +02:00 |
|
aignatov-bio
|
737f9e572c
|
Replace marvinJS logo and fix some merge issues [SCI-3731] (#1976)
* Replace marvinJS logo and fix some merge issues
* Fix tests
|
2019-08-13 11:04:19 +02:00 |
|
aignatov-bio
|
aad726ac40
|
Update CSS for share modal (#1978)
|
2019-08-12 15:02:16 +02:00 |
|
Urban Rotnik
|
dc4751e49a
|
Update scope 'accessible_by_teams' and fix load_vars method in controllers
|
2019-08-12 10:55:30 +02:00 |
|
Oleksii Kriuchykhin
|
32054c5516
|
Handle situation for assets without blob in list sorting [SCI-3757]
|
2019-08-09 15:17:19 +02:00 |
|
Oleksii Kriuchykhin
|
c352a73d79
|
ActiveStorage fixies after latest master merge [SCI-3757]
|
2019-08-09 14:56:00 +02:00 |
|
Urban Rotnik
|
61af9e21ad
|
Fix datatable filter position
|
2019-08-09 14:22:24 +02:00 |
|
Urban Rotnik
|
d04b0ccff1
|
Move '+ new inventory' link above list in sidebar
|
2019-08-09 14:15:51 +02:00 |
|
Urban Rotnik
|
7719b825e3
|
Update wording for sharing activities, rename button, add view-only paragraph
|
2019-08-09 14:15:51 +02:00 |
|
Urban Rotnik
|
786716974b
|
Add validation for team on TeamRepository
|
2019-08-09 14:15:50 +02:00 |
|
Urban Rotnik
|
23d7d117e9
|
Remove Repository's team from sharring list
|
2019-08-09 14:15:50 +02:00 |
|
Urban Rotnik
|
32783576c1
|
Add controller action 'multiple_update'
Add controller action, add update permission activity, add JS for handling ajax req
|
2019-08-09 14:15:50 +02:00 |
|
Urban Rotnik
|
6cbece9f86
|
Add service for multiple share
|
2019-08-09 14:15:49 +02:00 |
|
Urban Rotnik
|
2648521924
|
Invite modal with form
|
2019-08-09 14:15:49 +02:00 |
|
Urban Rotnik
|
466b05a5bc
|
Update repository index page
|
2019-08-09 14:15:48 +02:00 |
|
Mojca Lorber
|
3c1f28ec06
|
fix smart annotation permission check
|
2019-08-09 14:13:03 +02:00 |
|
Mojca Lorber
|
71b881cbdf
|
fix failing tests
|
2019-08-09 14:13:03 +02:00 |
|
Mojca Lorber
|
4c7c7ccdf1
|
Add ability to browse through shared inventories to smart annotations
|
2019-08-09 14:13:03 +02:00 |
|
Mojca Lorber
|
0e5afa6048
|
Small refactor
|
2019-08-09 14:13:02 +02:00 |
|
Mojca Lorber
|
26bd81621f
|
Add new icons also to the inventories list in navigation
|
2019-08-09 14:13:02 +02:00 |
|
Mojca Lorber
|
7d4941015f
|
Update global search, so it will be able to search through shared inventories
|
2019-08-09 14:13:01 +02:00 |
|
Urban Rotnik
|
171cdb319b
|
Add ShareInventory activities
|
2019-08-09 14:13:01 +02:00 |
|
Mojca Lorber
|
b005f90e95
|
Add tests for permission can_read_repository
|
2019-08-09 14:13:01 +02:00 |
|
Mojca Lorber
|
7e9be932f3
|
Make scope for repositories accessible by teams and simplify read permission
|
2019-08-09 14:13:00 +02:00 |
|
Mojca Lorber
|
15432ac851
|
Make changes to inventory list in navigation based on new mockup
|
2019-08-09 14:13: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
|
1a77702fa7
|
Add uniq index for Repository and Team in TeamRepositories
|
2019-08-09 14:13:00 +02:00 |
|
Urban Rotnik
|
5456c1e38a
|
Add basic controller for TeamRepositories
|
2019-08-09 14:12:59 +02:00 |
|
Urban Rotnik
|
077369d960
|
Update permissions for Repositories
|
2019-08-09 14:12:59 +02:00 |
|
Urban Rotnik
|
f569411bc7
|
Add TeamRepository model
|
2019-08-09 14:12:59 +02:00 |
|
aignatov-bio
|
6e5f078dea
|
Add activities for marvinJS [SCI-3630] (#1950)
* Add marvinJs activities to step and results
* Add activities for TinyMCE marvinJS assets
* Fix markup
|
2019-08-09 09:47:07 +02:00 |
|
aignatov-bio
|
b57e79a557
|
Fix tables (#1963)
|
2019-08-09 09:41:32 +02:00 |
|
Oleksii Kriuchykhin
|
a5d47e75c5
|
Remove duplicated protocols.js.erb file [SCI-3678]
|
2019-08-08 14:33:07 +02:00 |
|
Oleksii Kriuchykhin
|
d52df56fc4
|
Fix production build and update packages [SCI-3678]
|
2019-08-08 14:03:15 +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 |
|
Alex Kriuchykhin
|
328f8dd8a0
|
Merge pull request #1966 from okriuchykhin/ok_SCI_3681
Enforce file size limits for direct uploads on S3 [SCI-3681]
|
2019-08-07 10:49:05 +02:00 |
|
aignatov-bio
|
aa5061a1af
|
Add custom context menu to TinyMCE images [SCI-3582] (#1944)
* Add custom context menu to TinyMCE images
* Fix permission check for unsaved objects
* Fix markup
|
2019-08-07 10:28:42 +02:00 |
|
Oleksii Kriuchykhin
|
973fc775c0
|
Enforce file size limits for direct uploads on S3 [SCI-3681]
|
2019-08-06 17:09:00 +02:00 |
|
Oleksii Kriuchykhin
|
f3849e2ece
|
Fix TinyMCE plugings config [SCI-3679]
|
2019-08-06 15:46:55 +02:00 |
|
Oleksii Kriuchykhin
|
eaf9d59819
|
Merge branch 'activestorage_migration' into ok_SCI_3679
|
2019-08-06 15:27:31 +02:00 |
|
Urban Rotnik
|
50045b9796
|
Merge pull request #1956 from urbanrotnik/ur-sci-3733-add-button-new
Add additional NewStep button [SCI-3733]
|
2019-08-06 15:26:51 +02:00 |
|
Oleksii Kriuchykhin
|
423528933e
|
Switch to global JS constants [SCI-3679]
|
2019-08-06 15:06:19 +02:00 |
|
Anton Ignatov
|
e2e876b2a3
|
Merge branch 'activestorage_migration' into ai-sci-3728-fix-active-storage-tests
|
2019-08-05 13:51:04 +02:00 |
|
Jure Grabnar
|
a9d67ba151
|
[SCI-3588] Security precautions for omniauth CVE-2015-9284 (#1961)
[SCI-3588] Security precautions for omniauth CVE-2015-9284
|
2019-08-05 13:14:21 +02:00 |
|
Jure Grabnar
|
d9ce3e5e8e
|
[SCI-3674] Remove width on comments (#1954)
[SCI-3674] Remove width on comments
|
2019-08-05 13:14:03 +02:00 |
|
aignatov-bio
|
f0b7771e19
|
Merge pull request #1943 from aignatov-bio/ai-sci-3629-add-metadata-to-protocol-repository-import-export
Fix protocol copy, add metadata to assets [SCI-3629]
|
2019-08-05 12:55:16 +02:00 |
|
Anton Ignatov
|
feadd940f7
|
Fix duplicate for TinyMCE model
|
2019-08-05 11:33:49 +02:00 |
|
Anton Ignatov
|
24da016465
|
Reuse duplicate file method
|
2019-08-05 11:30:36 +02:00 |
|
Oleksii Kriuchykhin
|
a2fe4bee94
|
Add text extraction from MarvinJS for search [SCI-3643]
|
2019-08-02 15:17:28 +02:00 |
|
Jure Grabnar
|
d9f6c249f9
|
Fix CVE-2015-9284 omniauth security precautions
Close SCI-3588
|
2019-07-31 16:59:38 +02:00 |
|
Jure Grabnar
|
6546bd1532
|
Add omniauth-rails_csrf_protection gem
Close SCI-3588
|
2019-07-31 16:05:06 +02:00 |
|
Jure Grabnar
|
b12403b769
|
Add comment name fix as Urban suggested
|
2019-07-31 09:23:22 +02:00 |
|
Jure Grabnar
|
971f52b4b0
|
RTE image in search does not have preview (#1952)
RTE image in search does not have preview
|
2019-07-30 07:44:54 +02:00 |
|
Jure Grabnar
|
dbebde3370
|
Merge pull request #1953 from jbargu/jg_sci_3673
Revalidate internal dimension when dragging
|
2019-07-30 07:44:36 +02:00 |
|
Anton Ignatov
|
7e379d4e0d
|
Fix download file
|
2019-07-29 10:24:31 +02:00 |
|
Anton Ignatov
|
f35f4886a3
|
Fix markup
|
2019-07-29 10:18:34 +02:00 |
|
Anton Ignatov
|
a4b2825258
|
Fix tests for active storage
|
2019-07-26 15:58:51 +02:00 |
|
Anton Ignatov
|
618f0cc334
|
Fix tests for services
|
2019-07-26 14:16:44 +02:00 |
|
Urban Rotnik
|
7626d43ee4
|
Merge pull request #1947 from urbanrotnik/ur-sci-3707-archived-results-not-in-row
Fix for archived results in row [SCI-3707]
|
2019-07-26 13:03:34 +02:00 |
|
Oleksii Kriuchykhin
|
ccf76b8531
|
Move repository_datatable to JS file [SCI-3679]
|
2019-07-26 13:00:25 +02:00 |
|
Anton Ignatov
|
84fe10df47
|
Fix tests for models and tema import/export
|
2019-07-26 12:40:36 +02:00 |
|
Urban Rotnik
|
4699ba718a
|
Fix showing errors
|
2019-07-26 11:32:51 +02:00 |
|
Urban Rotnik
|
88fbd6c0af
|
Fix for archived results in row
|
2019-07-26 11:16:53 +02:00 |
|
Urban Rotnik
|
aa36d93bea
|
Add additional NewStep button
|
2019-07-26 11:01:36 +02:00 |
|
Oleksii Kriuchykhin
|
5e65b07bdc
|
Implement DirectUpload for Steps, Results and Inventories [SCI-3679]
|
2019-07-25 18:00:24 +02:00 |
|
Jure Grabnar
|
39fbd18316
|
Remove width on commments
Closes SCI-3674
|
2019-07-25 16:46:27 +02:00 |
|
Jure Grabnar
|
a579328614
|
Revalidate internal dimension when dragging
Close SCI-3673
|
2019-07-25 16:37:15 +02:00 |
|
Jure Grabnar
|
d3a5651998
|
Add remaining missing description in global search
Close SCI-3723
|
2019-07-25 14:27:53 +02:00 |
|
Jure Grabnar
|
11b3b7b4e9
|
Fix search description for step
|
2019-07-25 14:15:45 +02:00 |
|
Jure Grabnar
|
f44404a1f8
|
Merge pull request #1946 from jbargu/jg_sci_3704
Fix Handsontable error when generation report
|
2019-07-25 11:28:46 +02:00 |
|
Jure Grabnar
|
06657dbdf6
|
Add spinner when editing image annotation (#1948)
Add spinner when editing image annotation
|
2019-07-25 11:28:13 +02:00 |
|
Urban Rotnik
|
1b9db2f61e
|
Fix for file annotating on Safari
|
2019-07-24 14:16:29 +02:00 |
|
Jure Grabnar
|
cdad167be2
|
Add spinner when editing image annotation
Close SCI-3710
|
2019-07-23 15:02:33 +02:00 |
|
Jure Grabnar
|
5847a8b05c
|
Convert HOT table after it was initialized
Closes SCI-3704
|
2019-07-23 14:17:22 +02:00 |
|
Anton Ignatov
|
3b7f715e0b
|
Merge branch 'activestorage_migration' into features/marvinjs-integration
|
2019-07-22 13:09:17 +02:00 |
|
Anton Ignatov
|
b762ae6a90
|
Copy protocol assets through tempfile
|
2019-07-19 15:23:34 +02:00 |
|
Anton Ignatov
|
0702dacc5b
|
Security fixes
|
2019-07-19 14:10:38 +02:00 |
|
aignatov-bio
|
4fe0227d8c
|
Add metadata for .eln assets (#1942)
|
2019-07-19 10:53:33 +02:00 |
|
aignatov-bio
|
2fae7d8208
|
Fix issue in report (#1941)
|
2019-07-19 10:37:44 +02:00 |
|
Anton Ignatov
|
ad7130d3b2
|
Simplify TinyMCE assets for MarvinJS
|
2019-07-19 09:27:03 +02:00 |
|
Anton Ignatov
|
b5a35f583a
|
Fix protocol copy, add metadata to assets
|
2019-07-18 15:39:08 +02:00 |
|
Anton Ignatov
|
bdc2dbbac1
|
Simplify image creation
|
2019-07-18 14:29:24 +02:00 |
|
Anton Ignatov
|
d79fec3345
|
Move TinyMCE logic to correspond controller
|
2019-07-16 15:51:44 +02:00 |
|
Anton Ignatov
|
03a45d7dd8
|
Fix markup
|
2019-07-16 13:42:39 +02:00 |
|
Anton Ignatov
|
1e8663548e
|
Add MarvinJS assets to TinyMCE
|
2019-07-16 13:40:54 +02:00 |
|
Anton Ignatov
|
3339c1fbbf
|
Add MarvinJS to Result and TinyMce MarvinJS refactor
|
2019-07-15 17:17:14 +02:00 |
|
Miha Mencin
|
47d3315d82
|
SCI-3702 revert the fix and use local variables
|
2019-07-15 16:20:39 +02:00 |
|
Miha Mencin
|
1c84e46a21
|
Revert "SCI-3702 replace _to_text with _to_html"
This reverts commit 93b7c472ac .
|
2019-07-15 16:18:26 +02:00 |
|
Miha Mencin
|
93b7c472ac
|
SCI-3702 replace _to_text with _to_html
|
2019-07-15 16:16:41 +02:00 |
|
aignatov-bio
|
a8623002e6
|
Small UI changes [SCI-3699] (#1935)
* Small ui changes
* Markup fix
* Add class for addons
|
2019-07-15 13:28:20 +02:00 |
|
aignatov-bio
|
3c32fe0895
|
Fix formulas in table report (#1934)
|
2019-07-15 13:27:27 +02:00 |
|
Urban Rotnik
|
795c355f01
|
Merge pull request #1915 from urbanrotnik/ur-sci-3531-tests-for-step-components
Add tests for StepComponents [SCI-3531]
|
2019-07-15 13:25:36 +02:00 |
|
Miha Mencin
|
8d3b94d7bc
|
Merge pull request #1931 from okriuchykhin/ok_SCI_3700
Improve permissions checks for reports [SCI-3700]
|
2019-07-15 12:34:59 +02:00 |
|
Jure Grabnar
|
eb615ea8dd
|
[SCI-3670] Show protocols at external protocols tab (#1933)
[SCI-3670] Show protocols at external protocols tab
|
2019-07-15 11:24:01 +02:00 |
|
aignatov-bio
|
894e201e1b
|
Fix big file issue in step attachments [SCI-3682] (#1919)
* Fix big file issue in step atachments
* Fix markup
|
2019-07-15 11:00:01 +02:00 |
|
Jure Grabnar
|
d210b0b152
|
Trigger loading of latest publications when page is loaded
Closes SCI-3670
|
2019-07-15 08:52:17 +02:00 |
|
Jure Grabnar
|
015dae1a05
|
Fix old tests
|
2019-07-15 08:27:34 +02:00 |
|
Jure Grabnar
|
a372d4056d
|
Add last_published protocols.io endpoint
|
2019-07-14 19:24:53 +02:00 |
|
Alex Kriuchykhin
|
313d2d27b9
|
Update repository_rows_controller.rb
|
2019-07-12 17:03:09 +02:00 |
|
Urban Rotnik
|
5cf100a787
|
Show 'published_on' instead of 'created_on' on external_protocols list
|
2019-07-12 16:56:07 +02:00 |
|
Oleksii Kriuchykhin
|
1c235aafe5
|
Improve permissions checks for reports [SCI-3700]
|
2019-07-12 16:44:15 +02:00 |
|
mlorb
|
5bc8eb7392
|
Merge pull request #1921 from mlorb/ml-sci-3641
Fix page redirect and add success flash msg after protocols.io import [SCI-3641]
|
2019-07-12 15:52:40 +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
|
7831b0a089
|
Merge branch 'activestorage_migration' into features/marvinjs-integration
|
2019-07-12 15:00:07 +02:00 |
|
Oleksii Kriuchykhin
|
6166a0dbb0
|
Fix file result update method [SCI-3695]
|
2019-07-12 14:42:04 +02:00 |
|
Mojca Lorber
|
d07e04e511
|
Fix dooble flash_alerts load
|
2019-07-12 14:33:41 +02:00 |
|
aignatov-bio
|
4bae87e3f7
|
Styling changes in DOCX report [SCI-3633] (#1899)
* Styling changes in DOCX report
* Update result comments in docx report
* Fix markup
|
2019-07-12 13:48:14 +02:00 |
|
aignatov-bio
|
5ca822a7d8
|
Add archive lables and fix bright colors in RTE fields (#1923)
|
2019-07-12 11:38:48 +02:00 |
|
Anton Ignatov
|
57a273d5d0
|
Merge branch 'activestorage_migration' into features/marvinjs-integration
|
2019-07-12 11:34:41 +02:00 |
|
aignatov-bio
|
c6152ccddb
|
Fix big table issue in ProtocolIo preview (#1927)
|
2019-07-12 11:17:51 +02:00 |
|
aignatov-bio
|
d8d04b89cd
|
Fix autosave issue in mozzila (#1925)
|
2019-07-12 11:15:45 +02:00 |
|
aignatov-bio
|
26ef970a1e
|
Add academy button (#1924)
|
2019-07-12 11:15:34 +02:00 |
|
aignatov-bio
|
70589126c3
|
Fix autosave for steps (#1926)
|
2019-07-12 10:16:49 +02:00 |
|
Urban Rotnik
|
d5fbe5ecd7
|
Fix for safari on external protocols tab
|
2019-07-11 11:53:49 +02:00 |
|
Mojca Lorber
|
f8afc92606
|
Fix page redirect and add success flash msg after protocols.io import action
|
2019-07-11 09:50:39 +02:00 |
|
aignatov-bio
|
ac7970209c
|
Add helper for inline JS code (#1916)
|
2019-07-11 09:31:30 +02:00 |
|
Jure Grabnar
|
5eb197127f
|
Fix relative links in protocolsio iframe
Closes SCI-3660
|
2019-07-10 19:20:40 +02:00 |
|
Oleksii Kriuchykhin
|
64b7a5646a
|
Implement custom document file previewer [SCI-3677]
|
2019-07-10 14:37:23 +02:00 |
|
aignatov-bio
|
7ac410e573
|
Fix visual bugs across ProtocolIo [SCI-3671] (#1914)
* Fix visual bugs across ProtocolIo
|
2019-07-10 13:00:32 +02:00 |
|
Urban Rotnik
|
b9bec32316
|
Add tests for StepComponents
|
2019-07-10 12:48:08 +02:00 |
|
Urban Rotnik
|
0ee2afae29
|
Merge pull request #1913 from urbanrotnik/ur-sci-3657-log-errors
Log to console when error occur on ProtocolsImport actions [SCI-3657]
|
2019-07-10 09:01:01 +02:00 |
|
Urban Rotnik
|
cc3cd43270
|
Log to console when error occur on ProtocolsImport actions
|
2019-07-09 15:32:43 +02:00 |
|
mlorb
|
23270393b0
|
Merge branch 'master' into ml-sci-3634
|
2019-07-09 14:38:00 +02:00 |
|
Mojca Lorber
|
7bb82e2fc2
|
Fix eternal protocols tab visuals
|
2019-07-09 14:35:40 +02:00 |
|
aignatov-bio
|
1a75a31647
|
Remove webinar button [SCI-3664] (#1906)
* Remove webinar button
* Remove constants and i18n
|
2019-07-09 14:01:09 +02:00 |
|
aignatov-bio
|
fc78d8f401
|
Fix tooltip position (#1909)
|
2019-07-09 14:00:53 +02:00 |
|
Urban Rotnik
|
10639deb97
|
Strip tags for table's content
|
2019-07-09 13:41:52 +02:00 |
|
Urban Rotnik
|
be77746aef
|
Fix description styling of components
|
2019-07-09 13:41:51 +02:00 |
|
Urban Rotnik
|
8411e92fa2
|
Add linebreak for 'There was a table' message
|
2019-07-09 10:54:48 +02:00 |
|
Oleksii Kriuchykhin
|
a1941a21dc
|
Futher refactoring of old Paperclip methods [SCI-3539]
|
2019-07-09 10:28:15 +02:00 |
|
Jure Grabnar
|
05f2210002
|
SCI-3650, SCI-3655 Fix empty file name, empty description when… (#1892)
SCI-3650, SCI-3655 Fix empty file name, empty description when parsing tables
|
2019-07-09 10:24:03 +02:00 |
|
aignatov-bio
|
c8b0d87054
|
Fix global links in reports (#1894)
|
2019-07-09 09:35:43 +02:00 |
|
aignatov-bio
|
4fe3119bd2
|
Fix step description RTE images in report preview (#1888)
|
2019-07-08 15:23:44 +02:00 |
|
mlorb
|
7272d838b6
|
Merge pull request #1875 from mlorb/ml-sci-3618
Remove unassign_user_from_project notification…[SCI-3618]
|
2019-07-08 15:23:06 +02:00 |
|
aignatov-bio
|
01a01157d3
|
Replace Handson table in reports with simple table [SCI-3636] (#1895)
* Replace handsone table in reports with simple table
* Add result tables
|
2019-07-08 13:19:12 +02:00 |
|
Jure Grabnar
|
bdd1ca2a65
|
Merge pull request #1908 from jbargu/jg_sci_3587
[SCI-3587] Endless spinner at file preview
|
2019-07-08 13:06:39 +02:00 |
|
Jure Grabnar
|
ae7da78bff
|
Merge pull request #1897 from jbargu/jg_sci_3646
[SCI-3646] Add paging functionality to external protocols
|
2019-07-08 13:06:19 +02:00 |
|
aignatov-bio
|
81aef81634
|
Fix scrol jump when select activtiies in global activities (#1907)
|
2019-07-08 12:55:35 +02:00 |
|
aignatov-bio
|
6d423ed986
|
Make Navbar icons bigger [SCI-3663] (#1900)
* Make Navbar icons bigger
|
2019-07-08 12:53:43 +02:00 |
|
aignatov-bio
|
2baca019eb
|
Remove tooltip from step edit button (#1905)
|
2019-07-08 12:52:03 +02:00 |
|
aignatov-bio
|
99b1075c28
|
Fix protcol naming when load multiple protocols (#1904)
|
2019-07-08 12:51:47 +02:00 |
|
aignatov-bio
|
0d1ec0d4ed
|
Fix I18n and constants in DOCX report (#1901)
|
2019-07-08 12:51:26 +02:00 |
|
Miha Mencin
|
ab9b7a7429
|
Merge pull request #1902 from biosistemika/release-1.16.6
Merge 'release-1.16.6' into 'master'
|
2019-07-08 12:49:40 +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 |
|
Alex Kriuchykhin
|
82708f0124
|
Merge pull request #1891 from okriuchykhin/ok_SCI_3654
Fix project page view saving [SCI-3654]
|
2019-07-08 11:46:54 +02:00 |
|
Oleksii Kriuchykhin
|
9d926dc956
|
Refactor TinyMce assets, user avatars, zip files [SCI-3539]
|
2019-07-05 16:56:05 +02:00 |
|
Mojca Lorber
|
989c10872c
|
Fixes visual bugs on protocols.io and home page
|
2019-07-04 18:22:51 +02:00 |
|
aignatov-bio
|
88dc2dcdd0
|
Hot fix for TinyMCE asset permission check (#1896)
* Hot fix for TimyMCE asset permission check
|
2019-07-04 15:59:11 +02:00 |
|
Jure Grabnar
|
0eb09407bc
|
Always scroll to top when searching for new string
|
2019-07-04 15:38:15 +02:00 |
|
Jure Grabnar
|
dc7fee51fa
|
Add Show more protocols functionality to external protocols
Closes SCI-3646
|
2019-07-04 15:35:18 +02:00 |
|
Jure Grabnar
|
4c3df5a67d
|
Change tabs to spaces
|
2019-07-04 09:43:05 +02:00 |
|
Oleksii Kriuchykhin
|
c0c8e0e1a3
|
Refactor Experiment workflow images [SCI-3539]
|
2019-07-04 09:33:12 +02:00 |
|
Jure Grabnar
|
20134c9f8a
|
Features/protocolsio integration (#1893)
Features/protocolsio integration
|
2019-07-03 17:32:20 +02:00 |
|
Jure Grabnar
|
721bb9ab77
|
SCI-3649 All reagent data from step are not imported (#1881)
SCI-3649 All reagent data from step are not imported
|
2019-07-03 16:54:25 +02:00 |
|
Jure Grabnar
|
6944045bfb
|
Check for empty description before passing to Nokogiri
Closes SCI-3655
|
2019-07-03 16:36:26 +02:00 |
|
Jure Grabnar
|
8866d98512
|
Fix empty file name on protocols.io
Closes SCI-3650
|
2019-07-03 16:11:51 +02:00 |
|
aignatov-bio
|
09dacf3be2
|
Fix infinite update for image annotation (#1889)
|
2019-07-03 15:35:49 +02:00 |
|
aignatov-bio
|
d147e8260d
|
Fix issue with moving protocol in repository (#1887)
|
2019-07-03 15:35:37 +02:00 |
|
Oleksii Kriuchykhin
|
e16cb513e1
|
Fix project page view saving [SCI-3654]
|
2019-07-03 15:34:16 +02:00 |
|
Miha Mencin
|
5a437c0a0f
|
coding style fixes
|
2019-07-03 15:32:55 +02:00 |
|
Miha Mencin
|
964e91e1d2
|
removi mol weight from general section
|
2019-07-03 15:16:47 +02:00 |
|
Jure Grabnar
|
e965866d57
|
SCI-3648 Error at importing one protocol without steps (#1883)
SCI-3648 Error at importing one protocol without steps
|
2019-07-03 14:43:49 +02:00 |
|
Miha Mencin
|
669592f62c
|
Merge pull request #1886 from biosistemika/SCI-3640-fix-safari-search-bar
SCI-3640 Search line on Safari external protocols page needs update
|
2019-07-03 14:18:02 +02:00 |
|
Miha Mencin
|
012b828708
|
additional filters for blank string when displaying the reagent details
|
2019-07-03 14:13:55 +02:00 |
|
Miha Mencin
|
1b31f7f30a
|
SCI-3640 set max width of search bar to 50%
|
2019-07-03 13:16:07 +02:00 |
|
Miha Mencin
|
882e453b9c
|
Merge pull request #1880 from biosistemika/SCI-3644-hide-import-button
SCI-3644 Import button is always visible
|
2019-07-03 11:50:10 +02:00 |
|
Oleksii Kriuchykhin
|
028e647f4d
|
Upgrade to Rails 5.2.3 [SCI-3651]
|
2019-07-03 11:15:13 +02:00 |
|
Alex Kriuchykhin
|
48a9db4390
|
Merge pull request #1882 from jbargu/jg_sci_3590
Update js-yaml by upgrading rails/webpacker [SCI-3590]
|
2019-07-03 11:07:06 +02:00 |
|
Miha Mencin
|
37cc526ac9
|
fix CR comments
|
2019-07-03 10:22:59 +02:00 |
|
Jure Grabnar
|
4715e8ec4b
|
Fix building of zero steps protocls
Close SCI-3648
|
2019-07-03 09:34:15 +02:00 |
|
Miha Mencin
|
611c417b43
|
code review changes
|
2019-07-03 09:21:41 +02:00 |
|
aignatov-bio
|
d2849c88fd
|
Remove draft after save step (#1878)
|
2019-07-03 09:18:52 +02:00 |
|
aignatov-bio
|
65cf5e5787
|
Fix activities menu selector highlight (#1877)
|
2019-07-03 09:18:41 +02:00 |
|
Miha Mencin
|
ab038ffdf7
|
SCI-3649 adding catalog number, fixing up the design a bit
|
2019-07-02 19:47:05 +02:00 |
|
Miha Mencin
|
74b4e0d774
|
SCI-3644 hide the import button and show it only on hover & when appropriate user
|
2019-07-02 18:24:07 +02:00 |
|
Jure Grabnar
|
fc961b570c
|
Comment out index.jsx
Closes SCI-3590
|
2019-07-02 18:07:12 +02:00 |
|
Miha Mencin
|
4efb0b5a4a
|
SCI-3645 added descending sorting by name
|
2019-07-02 17:42:55 +02:00 |
|
aignatov-bio
|
b1a74a893c
|
Remove strange symbol (#1874)
|
2019-07-02 11:21:14 +02:00 |
|
aignatov-bio
|
378e91b426
|
Fix links on search page (#1867)
|
2019-07-02 11:21:00 +02:00 |
|
aignatov-bio
|
68ebf13bca
|
Fix tags modal issue (#1856)
|
2019-07-02 11:20:49 +02:00 |
|
Oleksii Kriuchykhin
|
4ea6b56582
|
Fix Step and Result file previews [SCI-3539]
|
2019-07-01 23:30:20 +02:00 |
|
Alex Kriuchykhin
|
7e4852d5aa
|
Merge pull request #1871 from okriuchykhin/ok_SCI_3511_v2
Fix TinyMCE editor initialization for step editing [SCI-3511]
|
2019-07-01 16:08:36 +02:00 |
|
Mojca Lorber
|
41935a9471
|
Remove unassign_user_from_project notification and change code to use helper method for assignment notification generation
|
2019-07-01 13:44:27 +02:00 |
|
Anton Ignatov
|
1f40fa69fc
|
Merge branch 'features/marvinjs-integration' of https://github.com/biosistemika/scinote-web into features/marvinjs-integration
|
2019-07-01 11:51:27 +02:00 |
|
aignatov-bio
|
a08d93376c
|
Add promo modal when MarvinJS disabled (#1872)
|
2019-07-01 11:51:13 +02:00 |
|
Anton Ignatov
|
c9ae9f056e
|
Merge branch 'okriuchykhin-ok_SCI_3539' into features/marvinjs-integration
|
2019-07-01 10:44:29 +02:00 |
|
aignatov-bio
|
2793777463
|
Features/docx report (#1873)
* Initial setup for docx report
* Add render for project, experiment, my_module
* Implement converter for RTE fields
* Add all report elements
* fix markup
* Change headers, remove empty blocks, refactored repository draw
* Add smart annotations support
* Fix justify fields
* Prepare for addons integration
* Fix markup
* Add comments to GemFile
* Fix TinyMCE error
* Change UI for new report download selector
* Fix file error in inventory cell for docx
* Fix i18n object for header
|
2019-07-01 10:14:16 +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
|
2f39b7f22b
|
Fix TinyMCE editor initialization for step editing [SCI-3511]
|
2019-06-28 12:06:04 +02:00 |
|
Jure Grabnar
|
ebbb36cc6d
|
Remove border from the import button
|
2019-06-28 11:32:47 +02:00 |
|
Jure Grabnar
|
8146a6a42c
|
Assign name = position if protocolsIO step has no name
|
2019-06-28 11:29:03 +02:00 |
|
Anton Ignatov
|
6be227b2d3
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into features/marvinjs-integration
|
2019-06-28 10:47:38 +02:00 |
|
Jure Grabnar
|
5430fb311d
|
Hound fixes
|
2019-06-28 10:41:20 +02:00 |
|
Jure Grabnar
|
c10428cd2a
|
Fix sorting buttons not applying params
|
2019-06-28 08:55:27 +02:00 |
|
Jure Grabnar
|
1a9fca87d2
|
Fix non-existent protocol-card in preview banner
|
2019-06-28 08:49:12 +02:00 |
|
Oleksii Kriuchykhin
|
5acb16d43e
|
Update Asset helper methods [SCI-3539]
|
2019-06-28 08:17:09 +02:00 |
|
Jure Grabnar
|
149f45f4fc
|
Hound fixes
|
2019-06-28 02:31:25 +02:00 |
|
Jure Grabnar
|
bc4b07cc0f
|
Refactor hardcoded protocol_source in SearchService
|
2019-06-28 02:26:31 +02:00 |
|
Jure Grabnar
|
9be4fc2470
|
Fix tests
|
2019-06-28 02:19:06 +02:00 |
|
Jure Grabnar
|
7fb696cf48
|
Fix unclickable import modal
|
2019-06-28 02:00:05 +02:00 |
|
Jure Grabnar
|
03b81400a9
|
Add timeout to search
|
2019-06-28 01:50:52 +02:00 |
|
Jure Grabnar
|
1ccabf62b3
|
Add preview banner in external protocols
|
2019-06-28 01:38:33 +02:00 |
|
Jure Grabnar
|
81695665c7
|
Add hover effect on the card
|
2019-06-28 00:47:08 +02:00 |
|
Jure Grabnar
|
d3afcbed50
|
Style card view on external protocols
Closes SCI-3535
|
2019-06-28 00:43:05 +02:00 |
|
Jure Grabnar
|
7fb650a125
|
Change click -> onchange event for sort_by buttons
|
2019-06-27 22:56:38 +02:00 |
|
Jure Grabnar
|
0a77cedaf8
|
Fix sorting of external protocols and start showing results
|
2019-06-27 22:48:56 +02:00 |
|
Jure Grabnar
|
8338892fc6
|
Update external protocols form to include sort_by
|
2019-06-27 21:26:28 +02:00 |
|
Urban Rotnik
|
9cb4454537
|
New implementation for attachments creation
|
2019-06-27 17:02:06 +02:00 |
|
Urban Rotnik
|
1fd0ca6795
|
Add steps preview
|
2019-06-27 16:46:02 +02:00 |
|
Urban Rotnik
|
2761079479
|
Add modal for import
|
2019-06-27 16:46:02 +02:00 |
|
Jure Grabnar
|
82fb8ebd2e
|
Implement protocols.io error handling (#1869)
Implement protocols.io error handling
|
2019-06-27 16:35:55 +02:00 |
|
Jure Grabnar
|
06b8d1fda7
|
Update ApiClient tests
Closes SCI-3434
|
2019-06-27 14:54:19 +02:00 |
|
Jure Grabnar
|
8a7a2eb097
|
Add StandardError checking for ProtocolNormalizer
|
2019-06-27 10:12:00 +02:00 |
|
Jure Grabnar
|
d31f978e55
|
DRY up protocols importer services errors
|
2019-06-27 10:11:36 +02:00 |
|
Jure Grabnar
|
86bc69e510
|
Simplify V3 errors structure
|
2019-06-27 09:42:21 +02:00 |
|
Jure Grabnar
|
7d71608166
|
Add spinner to external preview
|
2019-06-26 19:43:35 +02:00 |
|
Mojca Lorber
|
9fd83d54a0
|
Put network error handeling into api and refactor errors
|
2019-06-26 14:04:03 +02:00 |
|
Oleksii Kriuchykhin
|
ba2daede0b
|
Add migration scripts [SCI-3539]
|
2019-06-24 15:17:42 +02:00 |
|
aignatov-bio
|
83bc9eb22f
|
Merge pull request #1839 from aignatov-bio/ai-sci-3369-activity-for-edited-image-annotation
Adding new activities for image editing [SCI-3369]
|
2019-06-24 10:31:39 +02:00 |
|
aignatov-bio
|
57e0478b81
|
Merge pull request #1855 from aignatov-bio/ai-sci-3583-fix-table-header-in-report
Fix handsontable [SCI-3583]
|
2019-06-24 09:39:35 +02:00 |
|
aignatov-bio
|
81c76fb112
|
Merge pull request #1854 from aignatov-bio/ai-sci-3586-comment-counter-not-updated
Fix comments counter for zero comments [SCI-3586]
|
2019-06-24 09:39:22 +02:00 |
|
aignatov-bio
|
8ec6802b19
|
Merge pull request #1853 from aignatov-bio/ai-sci-3581-too-long-protocol-name-in-task
Trunc long protocol name on task page [SCI-3581]
|
2019-06-24 09:39:07 +02:00 |
|
Anton Ignatov
|
ab73987245
|
improve connector perfomance
|
2019-06-23 00:48:50 +02:00 |
|
Anton Ignatov
|
31c6802a06
|
Add support for marvinjs on service
|
2019-06-23 00:09:49 +02:00 |
|
Anton Ignatov
|
8240c8baad
|
Initial refactoring for remote api support
|
2019-06-22 01:51:59 +02:00 |
|
Anton Ignatov
|
7e5c39d3e4
|
Merge branch 'master' into features/marvinjs-integration
|
2019-06-21 14:51:45 +02:00 |
|
Anton Ignatov
|
76e09a2a3d
|
Clear TinyMce autosave after manual save
|
2019-06-21 14:21:03 +02:00 |
|
Anton Ignatov
|
dfece85ea1
|
Fix handsone table
|
2019-06-21 11:16:44 +02:00 |
|
Anton Ignatov
|
57ef9573f2
|
Fix comments counter for zero comments
|
2019-06-21 10:43:41 +02:00 |
|
Anton Ignatov
|
bc98cac9cc
|
Trunc long protocol name on task page
|
2019-06-20 15:28:15 +02:00 |
|
Alex Kriuchykhin
|
db7c6435b3
|
Merge pull request #1851 from okriuchykhin/ok_SCI_3436
Implement saving of attachments ordering on steps [SCI-3436]
|
2019-06-20 11:31:15 +02:00 |
|
Anton Ignatov
|
df344f4d03
|
Merge branch 'master' into ai-sci-3369-activity-for-edited-image-annotation
|
2019-06-20 09:43:53 +02:00 |
|
Anton Ignatov
|
3069ec8dd2
|
Add check for edit permission
|
2019-06-20 09:43:23 +02:00 |
|
Jure Grabnar
|
b2b752fcf8
|
Fix hound complaints
|
2019-06-19 23:37:04 +02:00 |
|
Jure Grabnar
|
fcd42a4178
|
Fix border radius around active sort button
|
2019-06-19 22:59:30 +02:00 |
|
Jure Grabnar
|
b3c3b68dc2
|
Add external preview to External Protocols tab
Closes SCI-3563
|
2019-06-19 22:54:20 +02:00 |
|
Anton Ignatov
|
a843a016a0
|
Fix markup and naming
|
2019-06-19 15:19:47 +02:00 |
|
Oleksii Kriuchykhin
|
f2b617ac12
|
Fix code formatting [SCI-3436]
|
2019-06-19 14:23:12 +02:00 |
|
Oleksii Kriuchykhin
|
ae1a63037b
|
Raise an exception if required methods for ViewableModel are not implemented [SCI-3436]
|
2019-06-19 14:17:17 +02:00 |
|
Anton Ignatov
|
dae5a661c9
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web
|
2019-06-19 14:11:51 +02:00 |
|
aignatov-bio
|
83b9efd7dd
|
Fix right floating images in RTE editor (#1842)
|
2019-06-19 14:06:33 +02:00 |
|
aignatov-bio
|
609c408c77
|
Fix error on new step saving command (#1845)
|
2019-06-19 14:06:25 +02:00 |
|
aignatov-bio
|
5734d0cdd7
|
Fix TinyMCE field selector for steps (#1844)
|
2019-06-19 14:06:16 +02:00 |
|
aignatov-bio
|
4ddcbe5d75
|
Fix user permission for recent protocols (#1843)
|
2019-06-19 14:06:02 +02:00 |
|
aignatov-bio
|
9653f16196
|
Convert image to base64 in PDF reports [SCI-3557] (#1835)
* Convert image to base64 in PDF reports
* Fix typo error
|
2019-06-19 13:57:04 +02:00 |
|
aignatov-bio
|
81d10c8ce4
|
Remove recent protocol button on new step (#1841)
|
2019-06-19 12:49:22 +02:00 |
|
Urban Rotnik
|
bf6041e13d
|
Update sanitization of html descriptions
|
2019-06-19 11:05:22 +02:00 |
|
Urban Rotnik
|
7e69375016
|
Drop header column and row when extract tables
|
2019-06-19 10:47:38 +02:00 |
|
Urban Rotnik
|
2a579f2240
|
Add Warnings, Before start and Guidelinese to protocol description
|
2019-06-19 09:02:42 +02:00 |
|
Mojca Lorber
|
ebcaa4b014
|
Implement protocols.io error handling for api client and normalizer
|
2019-06-18 14:01:57 +02:00 |
|
Urban Rotnik
|
c691ad80b5
|
Add fields to query params for ApiClient
|
2019-06-17 12:24:16 +02:00 |
|
Urban Rotnik
|
88d96c0938
|
Use service in controller
|
2019-06-17 12:24:15 +02:00 |
|
Urban Rotnik
|
7fad5fc594
|
Add search service and normalizer for list
|
2019-06-17 12:24:15 +02:00 |
|
Jure Grabnar
|
4f6397b5b9
|
Add form to external_sources#new action
Closes SCI-3532
|
2019-06-17 12:24:15 +02:00 |
|
Jure Grabnar
|
c8b8bcffdb
|
Add external_protocols#show action
|
2019-06-17 12:24:14 +02:00 |
|
Jure Grabnar
|
f7c6f78925
|
Add external_protocols#index action
|
2019-06-17 12:24:14 +02:00 |
|
Jure Grabnar
|
2a61075156
|
Add ExternalProtocols#create action and tests
|
2019-06-17 12:24:14 +02:00 |
|
Jure Grabnar
|
9baa66c998
|
Refactor OnlineSources -> ExternalProtocols
|
2019-06-17 12:24:13 +02:00 |
|
Jure Grabnar
|
eb0d677a36
|
Refactor pio_protocol -> built_protocol
|
2019-06-17 12:24:13 +02:00 |
|
Jure Grabnar
|
94e7fe1e6c
|
OnlineSourcesController skeleton and #new action tested
|
2019-06-17 12:24:13 +02:00 |
|
Jure Grabnar
|
7adef9cc9e
|
Change sort buttons positions
Closes SCI-3534
|
2019-06-17 12:24:13 +02:00 |
|
Jure Grabnar
|
218cf84775
|
Hound fixes
|
2019-06-17 12:24:12 +02:00 |
|
Jure Grabnar
|
d103f8ffec
|
Finish external protocols screen
Closes SCI-3534
|
2019-06-17 12:24:12 +02:00 |
|
Jure Grabnar
|
0b60da9b4c
|
Add ExternalProtocols skeleton tab
|
2019-06-17 12:24:12 +02:00 |
|
Urban Rotnik
|
0d43ecdfab
|
Import protocol service after object is built
|
2019-06-17 12:24:11 +02:00 |
|
Jure Grabnar
|
eb275c4d12
|
Add tests for BuildProtocolService and fix bugs
|
2019-06-17 12:24:11 +02:00 |
|
Jure Grabnar
|
362b0cd45d
|
Hound fixes
|
2019-06-17 12:24:11 +02:00 |
|
Jure Grabnar
|
640f6c1211
|
Fix tests after BuildProtocolFromClientService refactor
Closes SCI-3544
|
2019-06-17 12:24:11 +02:00 |
|
Jure Grabnar
|
1e8627c450
|
Refactor ImportProtocol service to BuildProtocolService
Closes SCI-3544
|
2019-06-17 12:24:10 +02:00 |
|
Urban Rotnik
|
a15596a126
|
Add ImportProtocolService
|
2019-06-17 12:24:10 +02:00 |
|
Urban Rotnik
|
2bb4f558b7
|
View rendering simplified, small improvements
|
2019-06-17 12:24:09 +02:00 |
|
Urban Rotnik
|
807104035c
|
Add StepBuilder, TableBuilder, AssetBuilder for PIO, normalized updated
|
2019-06-17 12:24:09 +02:00 |
|
Urban Rotnik
|
6a4deb0201
|
Add ProtocolIntermediateObject
|
2019-06-17 12:24:09 +02:00 |
|
Urban Rotnik
|
aadf2eecb4
|
Basic data normalizer for ProtocolIO
|
2019-06-17 12:24:08 +02:00 |
|
Urban Rotnik
|
ec49388283
|
Add protocol base normalizer class
|
2019-06-17 12:24:08 +02:00 |
|