scinote-web/app
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
..
assets Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00
controllers Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00
datatables Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00
helpers Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00
mailers Bugfix for notification emails 2016-10-13 12:12:28 +02:00
models Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00
utilities Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00
views Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00