mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-02-07 15:33:50 +08:00
53699193a2
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 |
||
|---|---|---|
| .. | ||
| activities | ||
| canvas | ||
| comments | ||
| experiments | ||
| layouts | ||
| my_module_comments | ||
| my_module_tags | ||
| my_modules | ||
| organizations | ||
| project_activities | ||
| project_comments | ||
| projects | ||
| protocols | ||
| reports | ||
| result_assets | ||
| result_comments | ||
| result_tables | ||
| result_texts | ||
| results | ||
| sample_groups | ||
| sample_my_modules | ||
| sample_types | ||
| samples | ||
| search | ||
| shared | ||
| step_comments | ||
| steps | ||
| user_my_modules | ||
| user_notifications | ||
| user_projects | ||
| users | ||