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/models
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
..
concerns fixes search 2016-11-16 14:50:06 +01:00
.keep
activity.rb Merge pull request #260 from mlorb/ml_sci_614 2016-11-08 11:30:49 +01:00
asset.rb Enable image preview while editing steps and code style improvements [SCI-694] 2017-01-06 15:58:23 +01:00
asset_text_datum.rb
checklist.rb Remove input sanitization in the models [SCI-102] 2017-01-12 16:20:37 +01:00
checklist_item.rb Remove input sanitization in the models [SCI-102] 2017-01-12 16:20:37 +01:00
comment.rb Remove input sanitization in the models [SCI-102] 2017-01-12 16:20:37 +01:00
connection.rb
custom_field.rb Remove input sanitization in the models [SCI-102] 2017-01-12 16:20:37 +01:00
experiment.rb fixes highlight.js 2017-01-19 17:09:25 +01:00
log.rb
my_module.rb fixes highlight.js 2017-01-19 17:09:25 +01:00
my_module_comment.rb
my_module_group.rb Remove input sanitization in the models [SCI-102] 2017-01-12 16:20:37 +01:00
my_module_tag.rb
notification.rb Fix destroying of users in relation to notifications 2016-11-15 15:56:32 +01:00
organization.rb Remove input sanitization in the models [SCI-102] 2017-01-12 16:20:37 +01:00
project.rb fixes highlight.js 2017-01-19 17:09:25 +01:00
project_comment.rb
protocol.rb update protocol import/export and clone 2017-01-18 14:22:19 +01:00
protocol_keyword.rb Remove double sanitization from views [SCI-102] 2017-01-12 16:54:15 +01:00
protocol_protocol_keyword.rb
report.rb Remove input sanitization in the models [SCI-102] 2017-01-12 16:20:37 +01:00
report_element.rb
result.rb Remove input sanitization in the models [SCI-102] 2017-01-12 16:20:37 +01:00
result_asset.rb
result_comment.rb
result_table.rb
result_text.rb Remove input sanitization in the models [SCI-102] 2017-01-12 16:20:37 +01:00
sample.rb Merge branch 'smart-annotations' 2017-01-24 14:33:23 +01:00
sample_comment.rb
sample_custom_field.rb Remove input sanitization in the models [SCI-102] 2017-01-12 16:20:37 +01:00
sample_group.rb Remove double sanitization from views [SCI-102] 2017-01-12 16:54:15 +01:00
sample_my_module.rb
sample_type.rb Remove input sanitization in the models [SCI-102] 2017-01-12 16:20:37 +01:00
samples_table.rb add new column on first position 2016-12-15 11:20:40 +01:00
step.rb Remove input sanitization in the models [SCI-102] 2017-01-12 16:20:37 +01:00
step_asset.rb
step_comment.rb
step_table.rb
table.rb update search 2017-01-18 14:22:19 +01:00
tag.rb Remove input sanitization in the models [SCI-102] 2017-01-12 16:20:37 +01:00
temp_file.rb
user.rb Remove input sanitization in the models [SCI-102] 2017-01-12 16:20:37 +01:00
user_my_module.rb
user_notification.rb
user_organization.rb fixed user without permissions bug [fixes SCI-922] 2017-01-23 10:53:42 +01:00
user_project.rb