Urban Rotnik
|
0dc1daa7c6
|
Add gem Down, File size validation before and during download
|
2019-11-18 14:28:19 +01:00 |
|
aignatov-bio
|
32d99f676c
|
Fix markup
|
2019-11-18 13:59:55 +01:00 |
|
aignatov-bio
|
264493a322
|
Finish removing Select2 library
|
2019-11-18 13:59:55 +01:00 |
|
aignatov-bio
|
e7ad7ae969
|
New tags drop down
|
2019-11-18 13:59:55 +01:00 |
|
aignatov-bio
|
5964a1b1f4
|
Fix shadows
|
2019-11-18 13:59:54 +01:00 |
|
Anton Ignatov
|
0ed3d84407
|
Fix styling
|
2019-11-18 13:59:54 +01:00 |
|
Anton Ignatov
|
b1c32d9a30
|
Improve dropdown and side panel
|
2019-11-18 13:59:54 +01:00 |
|
Anton Ignatov
|
163a17d6d9
|
Fix tablet view
|
2019-11-18 13:59:54 +01:00 |
|
Anton Ignatov
|
5b8e1fedf1
|
Fix markup
|
2019-11-18 13:59:54 +01:00 |
|
Anton Ignatov
|
7117b767f4
|
Fix commnets to PR
|
2019-11-18 13:59:54 +01:00 |
|
Anton Ignatov
|
17e457c686
|
Finished global activities refactoring
|
2019-11-18 13:59:54 +01:00 |
|
Anton Ignatov
|
fc70ce24f8
|
Refactor side filters for global activities
|
2019-11-18 13:59:54 +01:00 |
|
Anton Ignatov
|
4e517ca6c4
|
Fix eslint for main file
|
2019-11-18 13:59:54 +01:00 |
|
Anton Ignatov
|
7b855f54ac
|
Finish main part of selectors
|
2019-11-18 13:59:54 +01:00 |
|
Anton Ignatov
|
f832cfbbd4
|
Added tags
|
2019-11-18 13:59:54 +01:00 |
|
Anton Ignatov
|
04bd5269ec
|
Created new dropdown selector
|
2019-11-18 13:59:54 +01:00 |
|
aignatov-bio
|
b1f9e7f1ca
|
Fix global activities jsonb field [SCI-3830] (#2030)
* Fix global activities jsonb field
* Fix tests
|
2019-11-18 13:59:54 +01:00 |
|
Urban Rotnik
|
dcfca76602
|
Update method 'update_canvas' to work with new DB constraint
|
2019-11-18 11:11:41 +01:00 |
|
Urban Rotnik
|
b8bf7bbd9b
|
Rename validation
|
2019-11-18 11:11:40 +01:00 |
|
Urban Rotnik
|
43e3763ec8
|
Update x, y, experiment unqiue validation
[SCI-3887]
|
2019-11-18 11:11:40 +01:00 |
|
Urban Rotnik
|
5e97116c5a
|
Update results params
|
2019-11-18 11:11:39 +01:00 |
|
Urban Rotnik
|
8b5e346770
|
Remove file deletion manually
|
2019-11-18 11:11:39 +01:00 |
|
Urban Rotnik
|
cc9d987321
|
Add update result(file) and create result(file) API endpoint
|
2019-11-18 11:11:38 +01:00 |
|
Urban Rotnik
|
060125a1c4
|
Add file size validation
|
2019-11-18 11:11:38 +01:00 |
|
Urban Rotnik
|
1be88baab1
|
Add API endpoint for Attachments resource
|
2019-11-18 11:11:38 +01:00 |
|
Urban Rotnik
|
e7083e188c
|
Add API endpoint for Step resource
[SCI-3835]
|
2019-11-18 11:11:37 +01:00 |
|
Urban Rotnik
|
24033bec7a
|
Add API endpoint for Task creation
|
2019-11-18 11:11:37 +01:00 |
|
Urban Rotnik
|
7802d5ee8b
|
Add uniq validation for x and y position scoped to experiment
|
2019-11-18 11:11:36 +01:00 |
|
aignatov-bio
|
3eb6f5695b
|
Merge pull request #2207 from aignatov-bio/mlorb-ml-sci-4004
Add auto-save feature to text fields [SCI-4004]
|
2019-11-18 09:11:10 +01:00 |
|
aignatov-bio
|
a5666cacc5
|
Fix markup
|
2019-11-15 16:28:08 +01:00 |
|
aignatov-bio
|
b9a34fa809
|
Fix placeholder for authors
|
2019-11-15 16:23:48 +01:00 |
|
aignatov-bio
|
d88d479854
|
Merge pull request #2175 from aignatov-bio/ai-sci-4007-error-at-click-to-share-button
Add check for existing elements for shared repository modal [SCI-4007]
|
2019-11-15 14:32:46 +01:00 |
|
aignatov-bio
|
b979435b35
|
Merge pull request #2199 from aignatov-bio/ai-sci-4055-fix-eln-export-for-files-without-extension
Fix eln export for file without extension [SCI-4055]
|
2019-11-15 14:16:07 +01:00 |
|
Alex Kriuchykhin
|
d1a324401e
|
Merge pull request #2210 from biosistemika/release_1_17_6
Master << Release 1.17.6
|
2019-11-14 11:46:51 +01:00 |
|
aignatov-bio
|
1488f75e26
|
Add activities
|
2019-11-13 13:57:04 +01:00 |
|
Alex Kriuchykhin
|
8b665d4f1c
|
Merge pull request #2193 from okriuchykhin/ok_SCI_4028
Fix reports in team importer [SCI-4028]
|
2019-11-13 13:10:15 +01:00 |
|
aignatov-bio
|
19f5f9de67
|
Disable autocomplete for textarea field
|
2019-11-12 14:44:33 +01:00 |
|
aignatov-bio
|
a356c290ea
|
Fix markup
|
2019-11-12 11:32:43 +01:00 |
|
aignatov-bio
|
4a8eb041cb
|
Fix markup
|
2019-11-12 11:31:26 +01:00 |
|
aignatov-bio
|
a9690482d1
|
Add autosave feature to text fields
|
2019-11-12 11:26:18 +01:00 |
|
Urban Rotnik
|
1d180f3688
|
Fix for step description overwriting
[SCI-4067]
|
2019-11-11 10:31:55 +01:00 |
|
aignatov-bio
|
cf2687f7e5
|
Merge branch 'ml-sci-4004' of https://github.com/mlorb/scinote-web into mlorb-ml-sci-4004
|
2019-11-07 13:03:02 +01:00 |
|
aignatov-bio
|
938ea259cc
|
Merge pull request #2195 from aignatov-bio/ai-sci-4051-fix-team-import-for-avatars
Fix team import for user with avatars [SCI-4051]
|
2019-11-07 13:02:30 +01:00 |
|
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 |
|