scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-28 11:14:24 +08:00
Code Issues Projects Releases Packages Wiki Activity
scinote-web/app/utilities
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
..
delayed_uploader_tutorial.rb Save first time tutorial Activity-s without callbacks 2016-11-14 15:55:44 +01:00
encryptor.rb
first_time_data_generator.rb Save first time tutorial Activity-s without callbacks 2016-11-14 15:55:44 +01:00
protocols_exporter.rb Add export to protocol management page and code style improvements [SCI-742] 2017-01-23 17:43:48 +01:00
protocols_importer.rb Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00
renaming_util.rb
smart_annotation.rb fixes highlight.js 2017-01-19 17:09:25 +01:00
users_generator.rb fixed typos and added truncation to org name 2016-10-17 15:21:19 +02:00