Browse code Merge pull request #279 from CDLUC3/development Latest bug fixes from CDL dev
commit 6db1d84d273e4f58449be5fdfef7472a9832890f 2 parents 664f001 + 00e7fe8 Jimmy Angelakos authored on 28 Apr 2017 GitHub committed on 28 Apr 2017

Showing 61 changed files

• app/controllers/application_controller.rb
• app/controllers/confirmations_controller.rb
• app/controllers/phases_controller.rb
• app/controllers/plans_controller.rb
• app/controllers/projects_controller.rb
• app/controllers/questions_controller.rb
• app/controllers/registrations_controller.rb
• app/controllers/sections_controller.rb
• app/controllers/settings/plans_controller.rb
• app/controllers/settings/projects_controller.rb
• app/controllers/suggested_answers_controller.rb
• app/controllers/templates_controller.rb
• app/mailers/user_mailer.rb
• app/models/phase.rb
• app/models/question.rb
• app/models/section.rb
• app/models/settings/plan_list.rb
• app/models/template.rb
• app/models/user.rb
• app/policies/template_policy.rb
• app/views/devise/mailer/reset_password_instructions.html.erb
• app/views/layouts/_navigation.html.erb
• app/views/phases/_answer.html.erb
• app/views/plans/_plan_list_head.html.erb
• app/views/plans/_plan_list_item.html.erb
• app/views/plans/_toolbar.html.erb
• app/views/questions/_show_question.html.erb
• app/views/sections/_show_section.html.erb
• app/views/settings/plans/show.html.erb
• app/views/templates/_edit_template.html.erb
• app/views/templates/_show_phases_sections.html.erb
• app/views/templates/_show_template.html.erb
• app/views/templates/admin_index.html.erb
• app/views/templates/admin_template.html.erb
• app/views/templates/admin_template_history.html.erb
• app/views/user_mailer/api_token_granted_notification.html.erb
• app/views/user_mailer/permissions_change_notification.html.erb
• app/views/user_mailer/project_access_removed_notification.html.erb
• app/views/user_mailer/sharing_notification.html.erb
• app/views/user_mailer/welcome_notification.html.erb
• config/locale/app.pot
• config/locale/de/app.po
• config/locale/en_GB/app.po
• config/locale/en_US/app.po
• config/locale/es/app.po
• config/locale/fr/app.po
• config/routes.rb
• db/migrate/20170421170849_add_dirty_to_templates.rb
• db/schema.rb
• lib/tasks/templates.rake
• test/functional/confirmations_controller_test.rb
• test/functional/phases_controller_test.rb
• test/functional/questions_controller_test.rb
• test/functional/registrations_controller_test.rb
• test/functional/sections_controller_test.rb
• test/functional/templates_controller_test.rb
• test/integration/template_versioning_test.rb
• test/test_helper.rb
• test/unit/org_test.rb
• test/unit/template_test.rb
• test/unit/user_test.rb

Ignore Space Show notes View app/controllers/application_controller.rb

Show notes View app/controllers/confirmations_controller.rb 100644 → 0

Ignore Space Show notes View app/controllers/phases_controller.rb

Ignore Space Show notes View app/controllers/plans_controller.rb

Ignore Space Show notes View app/controllers/projects_controller.rb

Ignore Space Show notes View app/controllers/questions_controller.rb

Ignore Space Show notes View app/controllers/registrations_controller.rb

Ignore Space Show notes View app/controllers/sections_controller.rb

Ignore Space Show notes View app/controllers/settings/plans_controller.rb

Show notes View app/controllers/settings/projects_controller.rb 100644 → 0

Ignore Space Show notes View app/controllers/suggested_answers_controller.rb

Ignore Space Show notes View app/controllers/templates_controller.rb

Ignore Space Show notes View app/mailers/user_mailer.rb

Ignore Space Show notes View app/models/phase.rb

Ignore Space Show notes View app/models/question.rb

Ignore Space Show notes View app/models/section.rb

Show notes View app/models/settings/plan_list.rb 100644 → 0

Ignore Space Show notes View app/models/template.rb

Ignore Space Show notes View app/models/user.rb

Ignore Space Show notes View app/policies/template_policy.rb

Ignore Space Show notes View app/views/devise/mailer/reset_password_instructions.html.erb

Ignore Space Show notes View app/views/layouts/_navigation.html.erb

Ignore Space Show notes View app/views/phases/_answer.html.erb

Ignore Space Show notes View app/views/plans/_plan_list_head.html.erb

Ignore Space Show notes View app/views/plans/_plan_list_item.html.erb

Ignore Space Show notes View app/views/plans/_toolbar.html.erb

Ignore Space Show notes View app/views/questions/_show_question.html.erb

Ignore Space Show notes View app/views/sections/_show_section.html.erb

Show notes View app/views/settings/plans/show.html.erb 100644 → 0

Ignore Space Show notes View app/views/templates/_edit_template.html.erb

Ignore Space Show notes View app/views/templates/_show_phases_sections.html.erb

Ignore Space Show notes View app/views/templates/_show_template.html.erb

Ignore Space Show notes View app/views/templates/admin_index.html.erb

Ignore Space Show notes View app/views/templates/admin_template.html.erb

Ignore Space Show notes View app/views/templates/admin_template_history.html.erb

Ignore Space Show notes View app/views/user_mailer/api_token_granted_notification.html.erb

Ignore Space Show notes View app/views/user_mailer/permissions_change_notification.html.erb

Ignore Space Show notes View app/views/user_mailer/project_access_removed_notification.html.erb

Ignore Space Show notes View app/views/user_mailer/sharing_notification.html.erb

Ignore Space Show notes View app/views/user_mailer/welcome_notification.html.erb 0 → 100644

Ignore Space Show notes View config/locale/app.pot

Ignore Space Show notes View config/locale/de/app.po

Ignore Space Show notes View config/locale/en_GB/app.po

Ignore Space Show notes View config/locale/en_US/app.po

Ignore Space Show notes View config/locale/es/app.po

Ignore Space Show notes View config/locale/fr/app.po

Ignore Space Show notes View config/routes.rb

Ignore Space Show notes View db/migrate/20170421170849_add_dirty_to_templates.rb 0 → 100644

Ignore Space Show notes View db/schema.rb

Ignore Space Show notes View lib/tasks/templates.rake 0 → 100644

Show notes View test/functional/confirmations_controller_test.rb 100644 → 0

Ignore Space Show notes View test/functional/phases_controller_test.rb

Ignore Space Show notes View test/functional/questions_controller_test.rb

Ignore Space Show notes View test/functional/registrations_controller_test.rb

Ignore Space Show notes View test/functional/sections_controller_test.rb

Ignore Space Show notes View test/functional/templates_controller_test.rb

Ignore Space Show notes View test/integration/template_versioning_test.rb

Ignore Space Show notes View test/test_helper.rb

Ignore Space Show notes View test/unit/org_test.rb

Ignore Space Show notes View test/unit/template_test.rb

Ignore Space Show notes View test/unit/user_test.rb

Show line notes below