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
..
.keep
atwho_res.js.erb	fixes checklist item user popover bug [fixes SCI-907]	2017-01-23 09:47:04 +01:00
draw_components.js
form_cleanups.js
form_errors.js
form_validators.js.erb	fix some bugs	2017-01-19 11:37:59 +01:00
gestures.js
image_preview.js	Enable image preview after editing protocol and disable preview modal animation [SCI-868]	2017-01-09 17:19:46 +01:00
invite_users_modal.js.erb
rough_size_of_object.js
sample_info_modal.js	Add sample info modal popup to sample smart annotations	2017-01-16 15:52:02 +01:00
string_utils.js
textarea_autosize.js
tiny_mce.js.erb	remove functionalities from rich text formatting	2017-01-24 09:44:37 +01:00
url_handling.js
utils.js