scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-07 15:33:50 +08:00
Code Issues Projects Releases Packages Wiki Activity
scinote-web/app/views/reports/elements
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
..
_element_controls.html.erb Rename _module_element_controls to element_controls 2016-08-03 12:52:06 +02:00
_experiment_element.html.erb Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00
_my_module_activity_element.html.erb Initial code commit [SCI-102] 2017-01-05 13:04:19 +01:00
_my_module_element.html.erb Added auto_link wrapper with custom sanitization [SCI-102] 2017-01-11 17:02:17 +01:00
_my_module_samples_element.html.erb Replace all occurences of module_elements 2016-08-03 12:52:52 +02:00
_new_element.html.erb Additional steps added to tutorial and numbering of the steps fixed [SCI-571] 2016-11-11 10:07:34 +01:00
_project_header_element.html.erb Initial commit. 2016-02-12 16:52:43 +01:00
_result_asset_element.html.erb Ruby constants are now automatically available in JS. Refactoring was needed. 2016-10-17 11:57:37 +02:00
_result_comments_element.html.erb Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00
_result_table_element.html.erb Restyle step table display in reports so 2016-12-19 15:09:49 +01:00
_result_text_element.html.erb Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00
_step_asset_element.html.erb Removed ruby constants duplicates in JS, because of caching problems. 2016-10-17 11:57:47 +02:00
_step_checklist_element.html.erb Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00
_step_comments_element.html.erb Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00
_step_element.html.erb Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00
_step_table_element.html.erb add names to tables from protocol steps in reports 2017-01-18 14:22:19 +01:00