Luka Murn 82f982e983 Merge branch 'rails-5.1' into decoupling-settings-page ... Conflicts: Gemfile Gemfile.lock		2017-10-23 10:59:10 +02:00
..
concerns	Add default settings migration and concern	2017-08-10 11:30:57 +02:00
.keep
activity.rb	Finish the user settings jsonb, also fix references throughout app	2017-08-10 14:29:01 +02:00
application_record.rb
asset.rb	Merge branch 'master' into rails-5.1	2017-08-07 08:45:53 +02:00
asset_text_datum.rb
checklist.rb
checklist_item.rb
comment.rb
connection.rb	Optimize update canvas SQL and remove module group name [SCI-1642]	2017-10-05 16:19:25 +02:00
custom_field.rb
experiment.rb	Merge branch 'master' into rails-5.1	2017-10-23 08:57:57 +02:00
my_module.rb	Additional fixes required by latest merge from master	2017-10-23 09:51:13 +02:00
my_module_group.rb	Merge branch 'master' into rails-5.1	2017-10-23 08:57:57 +02:00
my_module_repository_row.rb
my_module_tag.rb
notification.rb
project.rb
project_comment.rb
protocol.rb
protocol_keyword.rb
protocol_protocol_keyword.rb
report.rb
report_element.rb
repository.rb	Merge branch 'master' into rails-5.1	2017-10-23 08:57:57 +02:00
repository_cell.rb	Fix adding and editing repository items [SCI-1519]	2017-07-26 11:22:26 +02:00
repository_column.rb
repository_date_value.rb
repository_row.rb	Merge branch 'master' into rails-5.1	2017-07-06 15:12:15 +02:00
repository_table_state.rb
repository_text_value.rb
result.rb
result_asset.rb
result_comment.rb
result_table.rb
result_text.rb
sample.rb
sample_custom_field.rb
sample_group.rb
sample_my_module.rb
sample_type.rb
samples_table.rb
settings.rb
step.rb
step_asset.rb
step_comment.rb
step_table.rb
table.rb
tag.rb
task_comment.rb
team.rb	Merge branch 'master' into rails-5.1	2017-10-23 08:57:57 +02:00
temp_file.rb
tiny_mce_asset.rb
token.rb
user.rb	fix hound, add custom hook for webpacker:compile	2017-10-16 17:02:35 +02:00
user_my_module.rb
user_notification.rb	Finish the user settings jsonb, also fix references throughout app	2017-08-10 14:29:01 +02:00
user_project.rb
user_team.rb	Merge branch 'master' into rails-5.1	2017-07-06 15:12:15 +02:00
wopi_action.rb
wopi_app.rb
wopi_discovery.rb
zip_export.rb