Jure Grabnar
|
c63737f750
|
Add check_pending! call for test migrations
Close SCI-3567
|
2019-07-31 14:57:47 +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 |
|
Urban Rotnik
|
916ff06f99
|
Merge pull request #1945 from urbanrotnik/ur-sci-3708-missing-error-message-at-import
Fix showing errors [SCI-3708]
|
2019-07-26 13:01:19 +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 |
|
Luka Murn
|
0e71351473
|
Remove unnecesary report element checks in extends.rb
|
2019-07-26 10:34:30 +02:00 |
|
Luka Murn
|
75d7cce6b7
|
Remove the samples -> repositories migration service/s & specs
|
2019-07-26 10:28:05 +02:00 |
|
Luka Murn
|
6017f40cef
|
Add migration to remove samples' associated data from DB
|
2019-07-26 10:28:05 +02:00 |
|
Luka Murn
|
a568d39f4c
|
Remove commit_param_routing Gem
This Gem was only used for certain sample controller actions.
|
2019-07-26 10:18:31 +02:00 |
|
Luka Murn
|
12dd9c9b5c
|
Update the first time data generator to ignore sample names.
|
2019-07-26 10:13:14 +02:00 |
|
Luka Murn
|
83bb89fdf5
|
Cherry-picked commit from ZZ (and LM)'s various changes
|
2019-07-26 10:13:14 +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
|
a472efc968
|
Merge pull request #1949 from urbanrotnik/ur-sci-3724-file-preview-problem-safari
Fix for file annotating on Safari [SCI-3724]
|
2019-07-24 14:42:03 +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 |
|
Miha Mencin
|
daccad1346
|
Merge pull request #1928 from NicolasCARPi/patch-1
Improve "make run" command
|
2019-07-22 17:20:26 +02:00 |
|
Anton Ignatov
|
3b7f715e0b
|
Merge branch 'activestorage_migration' into features/marvinjs-integration
|
2019-07-22 13:09:17 +02:00 |
|
aignatov-bio
|
cd40084c82
|
Merge pull request #1876 from aignatov-bio/ai-sci-3624-refactor-marvin-js-over-active-storage
Refactor MarvinJS core over active storage [SCI-3624]
|
2019-07-22 10:53:37 +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 |
|
Miha Mencin
|
7e0efa2490
|
Update Version
|
2019-07-17 09:39:11 +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
|
88dcf8edb4
|
Merge pull request #1937 from biosistemika/3702-report-error-fix
SCI-3702 Error at generating docx report
|
2019-07-15 16:42:53 +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 |
|