scinote-web/app/views/results/_result_text.html.erb

<div class="ql-editor">
  <%= auto_link(smart_annotation_parser(simple_format(sanitize_input(result.result_text.text))),
                link: :urls,
                sanitize: false,
                html: { target: '_blank' }).html_safe %>
</div>
fixed bullets 2016-11-16 22:30:14 +08:00			`<div class="ql-editor">`
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 21:33:23 +08:00			`<%= auto_link(smart_annotation_parser(simple_format(sanitize_input(result.result_text.text))),`
adds autolink to comments, tast desc., step desc., experiment desc., samples table 'only custom fields', checklists [fixes SCI-643] 2016-11-23 21:18:50 +08:00			`link: :urls,`
add to fields with rich text formatting 2017-01-19 22:27:24 +08:00			`sanitize: false,`
adds autolink to comments, tast desc., step desc., experiment desc., samples table 'only custom fields', checklists [fixes SCI-643] 2016-11-23 21:18:50 +08:00			`html: { target: '_blank' }).html_safe %>`
fixed bullets 2016-11-16 22:30:14 +08:00			`</div>`