scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-31 04:32:06 +08:00
Code Issues Projects Releases Packages Wiki Activity
scinote-web/app/views/projects
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
..
archive Initial commit. 2016-02-12 16:52:43 +01:00
experiment_archive adds user preview to user smart annotation [fixes SCI-832] 2017-01-13 11:34:10 +01:00
index displays org name on the project index page if no project 2016-10-17 15:21:19 +02:00
show Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00
_edit.html.erb Initial commit. 2016-02-12 16:52:43 +01:00
_new.html.erb fixed new project form 2016-10-17 15:10:26 +02:00
_notifications.html.erb Initial commit. 2016-02-12 16:52:43 +01:00
archive.html.erb removes org selector form project archive [fixes SCI-587] 2016-10-20 12:50:55 +02:00
experiment_archive.html.erb Remove double sanitization from views [SCI-102] 2017-01-12 16:54:15 +01:00
index.html.erb Added additional tutorial step for showing protocol link. Tutorial steps 1-3 are now completelly handled in JS and not in HTML (preferred way). 2016-11-17 18:03:49 +01:00
samples.html.erb Remove double sanitization from views [SCI-102] 2017-01-12 16:54:15 +01:00
show.html.erb Merge pull request #385 from okriuchykhin/ok_SCI_102 2017-01-16 11:41:38 +01:00