scinote-web/app/models
Luka Murn 9f60ece25f Merge branch 'master' into rails-5.1
Conflicts:
	app/models/repository.rb
	app/models/repository_row.rb
	app/views/projects/index.html.erb
	app/views/shared/_secondary_navigation.html.erb
2017-07-06 15:12:15 +02:00
..
concerns Add advanced search options [SCI-1158] 2017-05-05 16:41:23 +02:00
.keep Initial commit. 2016-02-12 16:52:43 +01:00
activity.rb Fix activities [SCI-1412] 2017-06-28 16:49:50 +02:00
application_record.rb setup sciNote for Rails 5.1 2017-06-23 15:19:08 +02:00
asset.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
asset_text_datum.rb Woops, almost forgot on this one 2017-07-04 15:00:14 +02:00
checklist.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
checklist_item.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
comment.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
connection.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
custom_field.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
experiment.rb refactor 2017-07-03 15:32:02 +02:00
my_module.rb Fixes DEPRECATION WARNING-s for Rails 5.1.2 2017-07-04 14:35:51 +02:00
my_module_group.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
my_module_repository_row.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
my_module_tag.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
notification.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
project.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
project_comment.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
protocol.rb Hound is Love, Hound is Life 2017-07-04 14:47:58 +02:00
protocol_keyword.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
protocol_protocol_keyword.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
report.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
report_element.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
repository.rb Merge branch 'master' into rails-5.1 2017-07-06 15:12:15 +02:00
repository_cell.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
repository_column.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
repository_date_value.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
repository_row.rb Merge branch 'master' into rails-5.1 2017-07-06 15:12:15 +02:00
repository_table_state.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
repository_text_value.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
result.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
result_asset.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
result_comment.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
result_table.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
result_text.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
sample.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
sample_custom_field.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
sample_group.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
sample_my_module.rb fixes hound 2017-06-28 15:29:10 +02:00
sample_type.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
samples_table.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
settings.rb setup sciNote for Rails 5.1 2017-06-23 15:19:08 +02:00
step.rb Fixes DEPRECATION WARNING-s for Rails 5.1.2 2017-07-04 14:35:51 +02:00
step_asset.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
step_comment.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
step_table.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
table.rb Fixes DEPRECATION WARNING-s for Rails 5.1.2 2017-07-04 14:35:51 +02:00
tag.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
task_comment.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
team.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
temp_file.rb setup sciNote for Rails 5.1 2017-06-23 15:19:08 +02:00
tiny_mce_asset.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
token.rb fixes tabs 2017-06-28 15:40:15 +02:00
user.rb setup sciNote for Rails 5.1 2017-06-23 15:19:08 +02:00
user_my_module.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
user_notification.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
user_project.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
user_team.rb Merge branch 'master' into rails-5.1 2017-07-06 15:12:15 +02:00
wopi_action.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
wopi_app.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00
wopi_discovery.rb setup sciNote for Rails 5.1 2017-06-23 15:19:08 +02:00
zip_export.rb fixes experiment page [fixes SCI-1395] 2017-06-28 15:21:32 +02:00