scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 07:26:15 +08:00
Code Issues Packages Projects Releases 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 Initial commit. 2016-02-12 16:52:43 +01:00
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 Fixes files deletion when rails worker is running [fixes SCI-411] and fixes picture's style files deletion. 2016-09-06 10:40:01 +02:00
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 Initial commit. 2016-02-12 16:52:43 +01:00
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 Initial commit. 2016-02-12 16:52:43 +01:00
my_module.rb fixes highlight.js 2017-01-19 17:09:25 +01:00
my_module_comment.rb Initial commit. 2016-02-12 16:52:43 +01:00
my_module_group.rb Remove input sanitization in the models [SCI-102] 2017-01-12 16:20:37 +01:00
my_module_tag.rb Initial commit. 2016-02-12 16:52:43 +01:00
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 Initial commit. 2016-02-12 16:52:43 +01:00
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 Word wrapping and truncating added to whole application [fixes SCI-458]. Fixed some bugs which were related to long/too long text and validations. Modified parts of application to accomodate for longer text limits. 2016-09-21 19:48:18 +02:00
report.rb Remove input sanitization in the models [SCI-102] 2017-01-12 16:20:37 +01:00
report_element.rb cleans experiment form report if moved [fixes SCI-335] 2016-08-17 15:21:53 +02:00
result.rb Remove input sanitization in the models [SCI-102] 2017-01-12 16:20:37 +01:00
result_asset.rb Replaced hardcoded values with unified constants. Minor refactoring. Also front-end error handling was updated accordingly. [fixes SCI-408] 2016-09-16 15:56:44 +02:00
result_comment.rb Replaced hardcoded values with unified constants. Minor refactoring. Also front-end error handling was updated accordingly. [fixes SCI-408] 2016-09-16 15:56:44 +02:00
result_table.rb Replaced hardcoded values with unified constants. Minor refactoring. Also front-end error handling was updated accordingly. [fixes SCI-408] 2016-09-16 15:56:44 +02:00
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 Initial commit. 2016-02-12 16:52:43 +01:00
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 Added missing validations for text fields. Added text trimming, which removes spaces from beginning and ending of text. [fixes SCI-408] 2016-09-21 19:37:36 +02:00
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 Fixed hound alerts. 2016-08-17 21:02:05 +02:00
step_comment.rb Initial commit. 2016-02-12 16:52:43 +01:00
step_table.rb Initial commit. 2016-02-12 16:52:43 +01:00
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 Initial commit. 2016-02-12 16:52:43 +01:00
user.rb Remove input sanitization in the models [SCI-102] 2017-01-12 16:20:37 +01:00
user_my_module.rb Initial commit. 2016-02-12 16:52:43 +01:00
user_notification.rb Replaced hardcoded infinity values with constants. Added quotation marks to Ruby string constants in JS. 2016-10-17 11:57:47 +02:00
user_organization.rb fixed user without permissions bug [fixes SCI-922] 2017-01-23 10:53:42 +01:00
user_project.rb fixed models 2016-07-22 15:36:48 +02:00