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
..
concerns
.keep
activity.rb
asset.rb
asset_text_datum.rb
checklist.rb
checklist_item.rb
comment.rb
connection.rb
custom_field.rb
experiment.rb
log.rb
my_module.rb
my_module_comment.rb
my_module_group.rb
my_module_tag.rb
notification.rb
organization.rb
project.rb
project_comment.rb
protocol.rb
protocol_keyword.rb
protocol_protocol_keyword.rb
report.rb
report_element.rb
result.rb
result_asset.rb
result_comment.rb
result_table.rb
result_text.rb
sample.rb	Merge branch 'smart-annotations'	2017-01-24 14:33:23 +01:00
sample_comment.rb
sample_custom_field.rb
sample_group.rb
sample_my_module.rb
sample_type.rb
samples_table.rb
step.rb
step_asset.rb
step_comment.rb
step_table.rb
table.rb
tag.rb
temp_file.rb
user.rb
user_my_module.rb
user_notification.rb
user_organization.rb
user_project.rb