mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-02-08 16:06:03 +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 | ||
| archive | ||
| modals | ||
| protocols | ||
| _activities.html.erb | ||
| _description.html.erb | ||
| _description_label.html.erb | ||
| _due_date.html.erb | ||
| _due_date_label.html.erb | ||
| _module_header.html.erb | ||
| _module_header_due_date_label.html.erb | ||
| _result.html.erb | ||
| _result_user_generated.html.erb | ||
| _show.html.erb | ||
| _tags.html.erb | ||
| activities.html.erb | ||
| archive.html.erb | ||
| protocols.html.erb | ||
| results.html.erb | ||
| samples.html.erb | ||