scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-03-04 03:36:44 +08:00
Code Issues Projects Releases Packages Wiki Activity
scinote-web/app/controllers
History
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
users
activities_controller.rb
application_controller.rb
assets_controller.rb
at_who_controller.rb
canvas_controller.rb
custom_fields_controller.rb
experiments_controller.rb
my_module_comments_controller.rb Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00
my_module_tags_controller.rb
my_modules_controller.rb
organizations_controller.rb
project_activities_controller.rb
project_comments_controller.rb Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00
projects_controller.rb
protocols_controller.rb
reports_controller.rb
result_assets_controller.rb
result_comments_controller.rb Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00
result_tables_controller.rb
result_texts_controller.rb
results_controller.rb
sample_groups_controller.rb
sample_my_modules_controller.rb
sample_types_controller.rb
samples_controller.rb
search_controller.rb
step_comments_controller.rb Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00
steps_controller.rb Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00
tags_controller.rb
user_my_modules_controller.rb
user_notifications_controller.rb
user_projects_controller.rb
user_samples_controller.rb