Anton Ignatov
|
e5b4adcc25
|
Merge branch 'master-with-note-section' into features/marvinjs-integration
|
2019-05-11 20:51:01 +02:00 |
|
aignatov-bio
|
634b58bd6a
|
Various UX improvements for note section [SCI-3444] (#1742)
* Various UX improvments for note section
|
2019-05-11 16:04:28 +02:00 |
|
Anton Ignatov
|
995408e7fc
|
Fix protocol update error, rollback bootstrap gems and fix step name
|
2019-05-08 17:18:19 +02:00 |
|
Anton Ignatov
|
dcf94e78e1
|
Merge branch 'master-with-note-section' into feature/marvinjs-integration
|
2019-05-08 14:03:41 +02:00 |
|
mlorb
|
df16b54be0
|
Merge pull request #1719 from mlorb/ml-sci-3399
Visual fixes for edit/add step on protocol [SCI-3399]
|
2019-05-06 10:33:28 +02:00 |
|
aignatov-bio
|
cc8a152278
|
Fix step attachments sorting (#1718)
|
2019-05-06 09:56:26 +02:00 |
|
Anton Ignatov
|
565a4959b4
|
small fixes and improvments
|
2019-05-03 15:24:28 +02:00 |
|
Anton Ignatov
|
fef691d30f
|
Add error handling and secutiry checks
|
2019-05-02 16:12:25 +02:00 |
|
Mojca Lorber
|
7be151bd2d
|
Visual fixes for edit/add step on protocol
|
2019-04-30 14:57:50 +02:00 |
|
Anton Ignatov
|
2847ec7609
|
Add env variable and check for MarvinJS available
|
2019-04-28 17:08:18 +02:00 |
|
Anton Ignatov
|
54731856f0
|
Finish step chemical attachments
|
2019-04-27 19:08:40 +02:00 |
|
Anton Ignatov
|
cf4ff41ec6
|
Add delete feature
|
2019-04-27 13:51:35 +02:00 |
|
Anton Ignatov
|
46f0e0c0c2
|
Add marvin js assets to assets sort and name field
|
2019-04-27 12:46:45 +02:00 |
|
Anton Ignatov
|
fe620c4a63
|
Add marvin model and controller
|
2019-04-26 22:59:38 +02:00 |
|
Anton Ignatov
|
baa9b94a63
|
Add new graph button to step
|
2019-04-26 20:33:20 +02:00 |
|
Anton Ignatov
|
40c1c9aef7
|
Add marvin js modal
|
2019-04-26 18:24:21 +02:00 |
|
Urban Rotnik
|
dba1ccfc34
|
Merge pull request #1705 from urbanrotnik/ur-sci-3387-office-files-icons
Show icons for office files [SCI-3387]
|
2019-04-26 15:53:53 +02:00 |
|
aignatov-bio
|
57b80280dc
|
Update attachemnts css (#1700)
|
2019-04-26 15:20:39 +02:00 |
|
Urban Rotnik
|
c41413234c
|
Use MS office icons for MS files
|
2019-04-26 09:29:39 +02:00 |
|
Anton Ignatov
|
0779ed598b
|
Reuse inline editing logic
|
2019-04-25 11:14:55 +02:00 |
|
Anton Ignatov
|
e52b985e7b
|
xMerge branch 'ur-sci-3135-comments-section-changes' of https://github.com/urbanrotnik/scinote-web into urbanrotnik-ur-sci-3135-comments-section-changes
|
2019-04-24 13:40:41 +02:00 |
|
Oleksii Kriuchykhin
|
88123f5ecd
|
Fix paths for highlightjs-github-theme [SCI-3377]
|
2019-04-24 12:35:01 +02:00 |
|
Urban Rotnik
|
774521df7a
|
Changes to comments section in Task Steps
|
2019-04-23 15:02:58 +02:00 |
|
Urban Rotnik
|
11a7a975af
|
Merge branch 'features/scinote-improvements' into master-with-note-section
|
2019-04-23 14:50:03 +02:00 |
|
Urban Rotnik
|
7a2bfc12ce
|
Remove form_asset partial
|
2019-04-23 13:50:48 +02:00 |
|
Urban Rotnik
|
b1dabaca15
|
New helper for file thumbnails
|
2019-04-23 13:50:48 +02:00 |
|
Urban Rotnik
|
ea0368aa11
|
Attachments update for edit page
|
2019-04-23 13:50:47 +02:00 |
|
Anton Ignatov
|
aa2dab2014
|
Merge branch 'features/note-section' into master-with-note-section
|
2019-04-23 10:31:37 +02:00 |
|
Urban Rotnik
|
ee3dc571e1
|
Update attachments view, add ordering on FE
|
2019-04-09 14:17:40 +02:00 |
|
Urban Rotnik
|
a3932cc67f
|
New asset box style update
|
2019-04-09 14:17:40 +02:00 |
|
Urban Rotnik
|
26cf8271a1
|
Change step header, remove vertical line
|
2019-04-05 10:57:38 +02:00 |
|
Jure Grabnar
|
cbf109f884
|
Fix create WOPI file button
Closes SCI-3137
|
2019-04-04 17:05:25 +02:00 |
|
Jure Grabnar
|
613843d095
|
Temp commit
|
2019-04-04 16:58:55 +02:00 |
|
Jure Grabnar
|
9a4cd4fda2
|
Add file_present true
|
2019-04-04 16:57:36 +02:00 |
|
Jure Grabnar
|
3b8e6fa47c
|
Test office online
|
2019-04-04 16:57:36 +02:00 |
|
Jure Grabnar
|
26848ecaef
|
Refactor step position + 1 into a method
|
2019-04-03 13:07:30 +02:00 |
|
Miha Mencin
|
1b19e67c07
|
Revert "Step header changes, removed vertical line"
This reverts commit b0f0ded87d.
|
2019-03-27 10:21:40 +01:00 |
|
Urban Rotnik
|
b0f0ded87d
|
Step header changes, removed vertical line
SCI-3134
|
2019-03-25 17:25:13 +01:00 |
|
Anton Ignatov
|
4ec0a3c871
|
Update TinyMCE image loader for new fields
|
2019-03-22 10:52:26 +01:00 |
|
Anton Ignatov
|
bc58f0aecd
|
Merge branch 'features/note-section' into ai-sci-3131-improve-image-file-upload
|
2019-03-21 11:48:51 +01:00 |
|
Anton Ignatov
|
07c2819163
|
refactoring tinymce image uploading
|
2019-03-20 14:46:54 +01:00 |
|
Oleksii Kriuchykhin
|
eb3d1ea6fe
|
Update RTE for step description [SCI-3111]
|
2019-03-19 17:42:49 +01:00 |
|
mz3944
|
4d460d14ea
|
Merge pull request #1378 from mz3944/mz-SCI-2861
All users in smart annotation have removed in brackets [SCI-2861]
|
2018-11-20 21:22:23 +01:00 |
|
Matej Zrimšek
|
c144d599fc
|
Fix user smart annotation showing as if the user is removed from team [SCI-2861]
|
2018-11-19 08:02:25 +01:00 |
|
Oleksii Kriuchykhin
|
fb309a12b9
|
Refactor result and step comments initialization [SCI-2830]
|
2018-11-13 16:57:42 +01:00 |
|
Luka Murn
|
63b4f7d909
|
Merge pull request #1274 from Zanz2/zz_in_app_tooltips_help_sci2662
Added Tooltips (bootstrap popovers) for various elements in scinote [SCI-2662]
|
2018-09-24 16:23:53 +02:00 |
|
Zanz2
|
22a565a684
|
Made fixes according to review
|
2018-09-14 13:07:09 +02:00 |
|
Zanz2
|
2d1d4c78bc
|
Merge branch 'master' into zz_in_app_tooltips_help_sci2662
|
2018-08-21 11:27:01 +02:00 |
|
Zanz2
|
36cca3d6aa
|
Implemented popover tooltips in all specified places, and fixed a bug where old popovers were open on page switch with ajax
|
2018-08-21 11:11:25 +02:00 |
|
Zanz2
|
1159a32ce2
|
Implemented all except 2 tooltips, debbugging why they dont work now
|
2018-08-20 13:03:30 +02:00 |
|
Zanz2
|
dfcaa40f1a
|
Merge branch 'master' into zz_refactor_icons_sci_2445_v2
|
2018-08-14 13:33:43 +02:00 |
|
Zanz2
|
45a4c1c598
|
changed the icons as per last comment in jira issue
|
2018-08-14 13:26:48 +02:00 |
|
Oleksii Kriuchykhin
|
6669beaf0e
|
Change icons throughout the rest of application [SCI-2445]
|
2018-07-27 15:27:08 +02:00 |
|
mlorb
|
c4ecfc4d38
|
Change icons throughout sciNote - navigation, project, task cards
|
2018-05-22 16:55:58 +02:00 |
|
mlorb
|
81392362ac
|
Final button colour changes
|
2018-05-18 16:24:24 +02:00 |
|
mlorb
|
7df40e56c7
|
UI/UX restyle - fixes throughout application part one
|
2018-05-08 16:33:42 +02:00 |
|
mlorb
|
763d934aa7
|
fix buttons again
|
2018-04-26 15:02:24 +02:00 |
|
mlorb
|
9e11f3b220
|
update buttons positions and wording throughout app
|
2018-04-25 13:57:12 +02:00 |
|
zmagod
|
b4deb232c0
|
rename variable: not_in_repository => display_image_tag
|
2018-04-12 13:40:17 +02:00 |
|
zmagod
|
233e73c709
|
adds asset preview link to repository row modal and to table row item [fixes SCI-2110]
|
2018-04-10 17:06:53 +02:00 |
|
Oleksii Kriuchykhin
|
cc5d8550b1
|
Refactor file preview modal [SCI-2217]
|
2018-03-30 11:50:28 +02:00 |
|
mz3944
|
bb21f6543c
|
Merge pull request #1004 from mz3944/mz-SCI-2011
Wrapping up the permissions [SCI-2011]
|
2018-03-06 07:10:40 +01:00 |
|
Luka Murn
|
070450f813
|
Merge branch 'release-1.12.11'
Conflicts:
config/initializers/extends.rb
|
2018-03-01 14:04:57 +01:00 |
|
Oleksii Kriuchykhin
|
aa933ad1f4
|
Add extendable file types mappings for icons [PIP-46]
|
2018-02-26 14:23:02 +01:00 |
|
Matej Zrimšek
|
5bda53eebf
|
Overall refactoring of all canaid permissions and code related to their calls.
|
2018-02-16 10:54:06 +01:00 |
|
Matej Zrimšek
|
8ef6c8f91f
|
Refactored remaining experiment level permissions (and everything below it).
|
2018-02-14 14:39:07 +01:00 |
|
Matej Zrimšek
|
d6e7ef465c
|
Grouped remaining permissions for experiment, protocol, task, and partially step levels. [SCI-1964]
|
2018-02-14 14:19:22 +01:00 |
|
Matej Zrimšek
|
854333b0e6
|
Grouped permissions for experiment with canaid gem (WIP).
|
2018-02-14 14:19:00 +01:00 |
|
zmagod
|
f8a3fca2db
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling
|
2018-01-23 11:06:33 +01:00 |
|
mlorb
|
806fcbce36
|
refactor update protocol in repository permission
|
2017-12-14 14:18:16 +01:00 |
|
mlorb
|
e0d1ae174e
|
refactor read protocol in repository permission
|
2017-12-14 14:18:15 +01:00 |
|
Zmago Devetak
|
00be4460cc
|
Merge pull request #806 from ZmagoD/disable_tiny_mce_asset_unless_step
Fixes bug with embedded images [SCI-1624]
|
2017-12-12 09:53:24 +01:00 |
|
okriuchykhin
|
b3b0e367e8
|
Merge pull request #889 from okriuchykhin/ok_SCI_1747
Improve server side assets validation display for steps [SCI-1747]
|
2017-12-04 14:12:43 +01:00 |
|
zmagod
|
066c782cd2
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into disable_tiny_mce_asset_unless_step
|
2017-11-24 16:29:32 +01:00 |
|
zmagod
|
afbeafb137
|
adds RTE images import, disables turbolinks on edit step actions
|
2017-11-22 16:28:14 +01:00 |
|
Oleksii Kriuchykhin
|
fe8b7d26c1
|
Improve server side assets validation display for steps [SCI-1747]
|
2017-11-21 13:48:06 +01:00 |
|
zmagod
|
3dc3ed906f
|
fixes bug with embedded images [fixes SCI.1624]
|
2017-10-02 18:06:42 +02:00 |
|
zmagod
|
33b996ffee
|
refactor
|
2017-06-09 09:49:57 +02:00 |
|
zmagod
|
c6bb20039b
|
adds drag'n drop feature in task results [fixes SCI-1011], [fixes SCI-1310] and [fixes SCI-285]
|
2017-06-07 13:29:39 +02:00 |
|
zmagod
|
67d902db52
|
refactor
|
2017-06-05 10:43:58 +02:00 |
|
zmagod
|
1c021b11db
|
adds drag and drop files upload to steps [fixes SCI-1310]
|
2017-06-02 16:34:09 +02:00 |
|
zmagod
|
2081e0a94b
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into release-1.10.1
|
2017-05-10 15:14:17 +02:00 |
|
zmagod
|
8d0c22327b
|
adds asc order to checklists [fixes SCI-1228]
|
2017-05-04 15:17:34 +02:00 |
|
zmagod
|
55c8c498e2
|
add image upload functionality to result text
|
2017-04-24 12:28:27 +02:00 |
|
zmagod
|
550f563666
|
working version for steps first run
|
2017-04-21 16:09:04 +02:00 |
|
zmagod
|
c25df63a14
|
add tinymce img importer and refactor input sanitize helper
|
2017-04-19 09:11:52 +02:00 |
|
Oleksii Kriuchykhin
|
4fac6484b5
|
Hide office edit buttons in protocol preview and fix image preview in protocol edit [SCI-877]
|
2017-04-14 16:05:35 +02:00 |
|
zmagod
|
7b16e5643e
|
fix assets preprocesor for wopi files
|
2017-03-13 13:20:49 +01:00 |
|
zmagod
|
0c2523beca
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration
|
2017-03-10 16:21:43 +01:00 |
|
Luka Murn
|
86a800a84e
|
Open edit/view Office files in new browser tab/window
Closes SCI-838.
|
2017-03-06 14:12:18 +01:00 |
|
Oleksii Kriuchykhin
|
c55f3cb99c
|
Add flag to disable simple_format in custom_auto_link [SCI-940]
|
2017-01-25 17:18:19 +01:00 |
|
Oleksii Kriuchykhin
|
310d8c1920
|
Refactor smart annotation/auto_link/simple_format rendering [SCI-940]
|
2017-01-25 17:18:19 +01:00 |
|
Mojca Lorber
|
2277af534c
|
fix table titles
|
2017-01-25 11:01:35 +01:00 |
|
Luka Murn
|
53699193a2
|
Merge branch 'smart-annotations'
Conflicts:
app/assets/javascripts/comments.js.erb
app/assets/javascripts/protocols/index.js
app/assets/javascripts/protocols/steps.js.erb
app/assets/javascripts/samples/sample_datatable.js.erb
app/controllers/my_module_comments_controller.rb
app/controllers/project_comments_controller.rb
app/controllers/result_comments_controller.rb
app/controllers/step_comments_controller.rb
app/datatables/sample_datatable.rb
app/views/my_module_comments/_comment.html.erb
app/views/project_comments/_comment.html.erb
app/views/projects/show/_experiment.html.erb
app/views/reports/elements/_experiment_element.html.erb
app/views/reports/elements/_result_comments_element.html.erb
app/views/reports/elements/_result_text_element.html.erb
app/views/reports/elements/_step_checklist_element.html.erb
app/views/reports/elements/_step_comments_element.html.erb
app/views/reports/elements/_step_element.html.erb
app/views/result_comments/_comment.html.erb
app/views/results/_result_text.html.erb
app/views/step_comments/_comment.html.erb
app/views/steps/_step.html.erb
db/schema.rb
|
2017-01-24 14:33:23 +01:00 |
|
mlorb
|
9a3c56de97
|
Merge pull request #421 from mlorb/ml_sci_540
Protocol steps/results - adding titles for tables [SCI-540]
|
2017-01-20 11:41:49 +01:00 |
|
Mojca Lorber
|
6653f0d4c1
|
small fixes
|
2017-01-19 16:42:14 +01:00 |
|
zmagod
|
f2d5066dc7
|
fix some bugs
|
2017-01-19 11:37:59 +01:00 |
|
zmagod
|
27d3868f37
|
fix bugs
|
2017-01-19 09:40:39 +01:00 |
|
zmagod
|
65fa631b1c
|
adding tinyMce first run
|
2017-01-18 22:40:08 +01:00 |
|
Mojca Lorber
|
dde9854bf1
|
update protocol import/export and clone
|
2017-01-18 14:22:19 +01:00 |
|
Mojca Lorber
|
b3c423c582
|
add table name in protocol step
|
2017-01-18 14:22:18 +01:00 |
|
Oleksii Kriuchykhin
|
a490a12fb1
|
Add truncation of image description in the preview [SCI-873]
|
2017-01-18 13:28:56 +01:00 |
|
Luka Murn
|
cf72da5635
|
Merge branch 'improved-files-handling' into 'master'
Conflicts:
app/assets/javascripts/protocols/steps.js.erb
app/helpers/assets_helper.rb
db/schema.rb
|
2017-01-18 11:29:40 +01:00 |
|
okriuchykhin
|
02bfd19d1c
|
Merge pull request #385 from okriuchykhin/ok_SCI_102
Fix XSS on activites and throghout the rest of app [SCI-102]
|
2017-01-16 11:41:38 +01:00 |
|
Oleksii Kriuchykhin
|
0350f2f792
|
Add html escaping to name filelds in the views [SCI-102]
|
2017-01-12 11:03:14 +01:00 |
|
Oleksii Kriuchykhin
|
d05c16b0ba
|
Added auto_link wrapper with custom sanitization [SCI-102]
|
2017-01-11 17:02:17 +01:00 |
|
Oleksii Kriuchykhin
|
0546716a0b
|
Improve user input sanitization, fix bugs [SCI-102]
|
2017-01-11 15:50:11 +01:00 |
|
zmagod
|
3a1ec0eb5e
|
refactor [fixes SCI-834] [fixes SCI-837] [fixes SCI-823] [fixes SCI-835] [fixes SCI-836] [fixes SCI-824]
|
2017-01-11 14:56:47 +01:00 |
|
Matej Zrimšek
|
852dc2eb7e
|
Added file downloading to protocol preview in protocol repository. [SCI-878]
|
2017-01-11 14:14:12 +01:00 |
|
zmagod
|
89e8946a47
|
expand smart annotation
|
2017-01-10 14:14:21 +01:00 |
|
zmagod
|
94262b56ef
|
prepare data for atwho
|
2017-01-10 14:14:21 +01:00 |
|
Oleksii Kriuchykhin
|
aa2b573278
|
Enable image preview while editing steps and code style improvements [SCI-694]
|
2017-01-06 15:58:23 +01:00 |
|
Oleksii Kriuchykhin
|
cd3924afd3
|
Sanitize .html_safe marked strings which contain tags [SCI-102]
|
2017-01-05 13:04:19 +01:00 |
|
zmagod
|
a434649f42
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration
|
2017-01-03 16:35:25 +01:00 |
|
Oleksii Kriuchykhin
|
cbef971d85
|
Fix timeouts when fetching images from S3 [SCI-694]
|
2016-12-20 15:36:07 +01:00 |
|
Oleksii Kriuchykhin
|
b537feb8a0
|
Added large preview [SCI-694]
|
2016-12-16 17:07:08 +01:00 |
|
Oleksii Kriuchykhin
|
0541253ffa
|
Added modal for images preview [SCI-694]
|
2016-12-16 15:53:16 +01:00 |
|
zmagod
|
de3099e4d1
|
removes asset_helper, fixes loading of processed thumbnails in results and steps and when loading protocols from repository
|
2016-12-09 13:59:49 +01:00 |
|
zmagod
|
ac52e643be
|
cleanup direct upload
|
2016-12-08 11:26:13 +01:00 |
|
zmagod
|
fafecce264
|
adds autolink to comments, tast desc., step desc., experiment desc., samples table 'only custom fields', checklists [fixes SCI-643]
|
2016-11-23 14:18:50 +01:00 |
|
Mojca Lorber
|
086f937fbb
|
fix empty space and blockquote padding - rich text editing
|
2016-11-18 12:43:57 +01:00 |
|
Luka Murn
|
d1701bd7ae
|
Merge pull request #276 from Ducz0r/lm-sci-637
Automatically resize textarea elements [SCI-637]
|
2016-11-17 09:58:36 +01:00 |
|
Luka Murn
|
a3bbf94643
|
Add a smart_text_area tag & implement it throughout application
This fixes the mentioned issues @mlorb mentioned.
Closes SCI-637.
|
2016-11-16 17:57:01 +01:00 |
|
zmagod
|
b781db9667
|
fixed bullets
|
2016-11-16 15:30:14 +01:00 |
|
zmagod
|
7953372d83
|
add description label
|
2016-11-16 13:59:35 +01:00 |
|
zmagod
|
67c508a891
|
fixes description label [fixes SCI-662]
|
2016-11-14 13:47:20 +01:00 |
|
mlorb
|
b0b2484fdf
|
Merge pull request #279 from mlorb/ml_sci_638_vol2
Fix validation problems for rich text fields [SCI-638]
|
2016-11-11 12:37:02 +01:00 |
|
Luka Murn
|
acd8ce8932
|
Merge pull request #270 from Ducz0r/lm-sci-644
Convert all large text input fields into text areas (10000 characters)
|
2016-11-11 09:07:25 +01:00 |
|
Mojca Lorber
|
1facd2cefe
|
fix validation problems
|
2016-11-10 17:20:17 +01:00 |
|
Mojca Lorber
|
ab0879e8d6
|
Integrate library with default settings
|
2016-11-09 13:09:53 +01:00 |
|
Luka Murn
|
d44a757b25
|
Add textareas to checklist name & items
Closes SCI-644
|
2016-11-08 11:50:29 +01:00 |
|
Matej Zrimšek
|
ece89da391
|
Removed ruby constants duplicates in JS, because of caching problems.
|
2016-10-17 11:57:47 +02:00 |
|
Matej Zrimšek
|
a3dfb59558
|
Added remaining constants.
|
2016-10-17 11:30:05 +02:00 |
|
zmagod
|
ea305b356a
|
fixes protocol steps [fixes SCI-548]
|
2016-10-11 09:10:12 +02:00 |
|
Jure Grabnar
|
0c7cd52dba
|
Add WOPI icons/buttons to files
|
2016-10-04 12:34:43 +02:00 |
|
Jure Grabnar
|
1e14955ade
|
Prevent deleting asset on step update
|
2016-10-01 18:47:05 +02:00 |
|
Jure Grabnar
|
d9fa882d6a
|
Add check for locked files on step delete
|
2016-10-01 14:51:55 +02:00 |
|
Mojca Lorber
|
c9fbf845f1
|
Remove Info tab and change comment title
|
2016-09-29 14:37:29 +02:00 |
|
Mojca Lorber
|
5d905f0094
|
refactoring
|
2016-09-29 14:18:04 +02:00 |
|
Jure Grabnar
|
e96e8486ea
|
Add check file permissions to assets controller
SCI-502 #close
|
2016-09-28 09:33:44 +02:00 |
|
Jure Grabnar
|
0e9756ad94
|
Fix bad step view rebase
|
2016-09-28 09:33:44 +02:00 |
|
Nejc Bernot
|
1b260785ec
|
First working version of office integration
Only works on scinote-preview
|
2016-09-28 09:33:44 +02:00 |
|
zmagod
|
9f56df02d2
|
removes comment tab and add comment in the info tab [fixes SCI-436]
|
2016-09-20 18:53:51 +02:00 |
|
zmagod
|
cd64e035c0
|
set form validations
|
2016-09-20 09:50:03 +02:00 |
|
zmagod
|
f48553e807
|
fixed ajax call
|
2016-09-19 16:12:07 +02:00 |
|
zmagod
|
e90f0bd3d5
|
refactor step view
|
2016-09-16 09:04:21 +02:00 |
|
zmagod
|
0a2ab57e28
|
styled new comments layout
|
2016-09-15 11:45:51 +02:00 |
|
zmagod
|
e3ae22763e
|
removed comments tab in protocol step
|
2016-09-15 08:46:14 +02:00 |
|
Matej Zrimšek
|
e3a7f45fdf
|
Merge branch 'master' into mz_file_upload_and_client_side_upgrade
Conflicts:
app/assets/javascripts/application.js
app/views/results/_result_asset.html.erb
app/views/steps/_step.html.erb
|
2016-08-26 11:13:40 +02:00 |
|
zmagod
|
6bb8d075e0
|
truncate asset name in task step and result [fixes SCI-294]
|
2016-08-18 09:22:12 +02:00 |
|