briley
authored
on 26 Jan 2017
|
|
.. |
|
|
|
|
settings
|
resolved merge conflicts
|
9 years ago
|
|
|
ability.rb
|
Added magic strings and identifier schemes to new ES locale file. Updated names of magic string categories so that they match the table names
|
9 years ago
|
|
|
admin_user.rb
|
Merging master (#20)
|
9 years ago
|
|
|
answer.rb
|
resolved merge conflicts
|
9 years ago
|
|
|
exported_plan.rb
|
resolved merge conflicts
|
9 years ago
|
|
|
file_upload.rb
|
began changing models to reflect the new model names and relationships, additionally deleting some old/unused models which no longer apply in the new schema.
|
9 years ago
|
|
|
guidance.rb
|
resolved merge conflicts
|
9 years ago
|
|
|
guidance_group.rb
|
resolved merge conflicts
|
9 years ago
|
|
|
identifier_scheme.rb
|
Had to remove code that was building devise omniauth connections dynamically. The timing of when the rails engine builds the routes and the models is not conducive to this approach
|
9 years ago
|
|
|
language.rb
|
resolved merge conflicts
|
9 years ago
|
|
|
new_plan.rb
|
changed has_one to belongs_to in new_plans -> templates relationship
|
9 years ago
|
|
|
note.rb
|
resolved merge conflicts
|
9 years ago
|
|
|
org.rb
|
resolved merge conflicts
|
9 years ago
|
|
|
org_token_permission.rb
|
began changing models to reflect the new model names and relationships, additionally deleting some old/unused models which no longer apply in the new schema.
|
9 years ago
|
|
|
organisation_type.rb
|
began changing models to reflect the new model names and relationships, additionally deleting some old/unused models which no longer apply in the new schema.
|
9 years ago
|
|
|
perm.rb
|
began changing models to reflect the new model names and relationships, additionally deleting some old/unused models which no longer apply in the new schema.
|
9 years ago
|
|
|
phase.rb
|
resolved merge conflicts
|
9 years ago
|
|
|
plan.rb
|
resolved merge conflicts
|
9 years ago
|
|
|
question.rb
|
resolved merge conflicts
|
9 years ago
|
|
|
question_format.rb
|
resolved merge conflicts
|
9 years ago
|
|
|
question_option.rb
|
began changing models to reflect the new model names and relationships, additionally deleting some old/unused models which no longer apply in the new schema.
|
9 years ago
|
|
|
region.rb
|
Merging master (#20)
|
9 years ago
|
|
|
region_group.rb
|
Merging master (#20)
|
9 years ago
|
|
|
role.rb
|
updated roles_controller and model functions
|
9 years ago
|
|
|
section.rb
|
resolved merge conflicts
|
9 years ago
|
|
|
splash_log.rb
|
Merging master (#20)
|
9 years ago
|
|
|
suggested_answer.rb
|
updated additional parts of the admin_phase view to use the new schema's data access. Additionally changed models for suggested_answer, user, guidance_group and question to better reflect the associations in the schema
|
9 years ago
|
|
|
template.rb
|
resolved merge conflicts
|
9 years ago
|
|
|
theme.rb
|
updated theme and user models's associations
|
9 years ago
|
|
|
token_permission_type.rb
|
resolved merge conflicts
|
9 years ago
|
|
|
user.rb
|
resolved merge conflicts
|
9 years ago
|
|
|
user_identifier.rb
|
added and finalized unit tests for user, token_permission_types, identifier_Schemes, user_identifiers, organisations
|
9 years ago
|
|
|
users_perm.rb
|
final tweks to ensure all migrations happen together
|
9 years ago
|
