Luka Murn d30a9780f4 Merge branch 'lm-sci-711-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-711-fix ... Conflicts: app/assets/javascripts/samples/sample_datatable.js		2016-12-12 09:57:37 +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
asset_text_datum.rb
checklist.rb
checklist_item.rb
comment.rb
connection.rb
custom_field.rb	Add delete custom field functionality	2016-12-09 13:49:19 +01:00
experiment.rb
log.rb
my_module.rb
my_module_comment.rb
my_module_group.rb
my_module_tag.rb
notification.rb	Fix destroying of users in relation to notifications	2016-11-15 15:56:32 +01:00
organization.rb	create samples table model and migration	2016-12-05 11:08:33 +01:00
project.rb
project_comment.rb
protocol.rb
protocol_keyword.rb
protocol_protocol_keyword.rb
report.rb
report_element.rb
result.rb
result_asset.rb
result_comment.rb
result_table.rb
result_text.rb	fix validation logic	2016-11-11 11:42:16 +01:00
sample.rb
sample_comment.rb
sample_custom_field.rb
sample_group.rb	refactor sample types/groups [fixes SCI-700]	2016-12-02 09:58:35 +01:00
sample_my_module.rb
sample_type.rb	refactor sample types/groups [fixes SCI-700]	2016-12-02 09:58:35 +01:00
samples_table.rb	Initial code commit [SCI-779]	2016-12-09 15:21:26 +01:00
step.rb	fix validation logic	2016-11-11 11:42:16 +01:00
step_asset.rb
step_comment.rb
step_table.rb
table.rb
tag.rb
temp_file.rb
user.rb	create samples table model and migration	2016-12-05 11:08:33 +01:00
user_my_module.rb
user_notification.rb
user_organization.rb	refactoring	2016-12-08 14:41:35 +01:00
user_project.rb