scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-08 16:40:16 +08:00
Code Issues Projects Releases Packages Wiki Activity
scinote-web/app/assets/javascripts/protocols
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
..
import_export Implemented protocol export through Zip::OutputStream [SCI-742] 2017-01-23 17:43:48 +01:00
edit.js Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
header.js.erb Removed ruby constants duplicates in JS, because of caching problems. 2016-10-17 11:57:47 +02:00
index.js Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00
steps.js.erb Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00