Browse code Merge pull request #29 from DMPRoadmap/development Latest from CDL dev
commit 23dfaa357ac9f0a4a788926a7a658097859ff81a 2 parents 91aeac6 + 021fee0 Jimmy Angelakos authored on 20 Apr 2017 GitHub committed on 20 Apr 2017

Showing 58 changed files

• app/controllers/answers_controller.rb
• app/controllers/guidances_controller.rb
• app/controllers/roles_controller.rb
• app/controllers/templates_controller.rb
• app/mailers/user_mailer.rb
• app/models/answer.rb
• app/models/exported_plan.rb
• app/models/guidance.rb
• app/models/guidance_group.rb
• app/models/identifier_scheme.rb
• app/models/language.rb
• app/models/note.rb
• app/models/org.rb
• app/models/perm.rb
• app/models/phase.rb
• app/models/question.rb
• app/models/question_format.rb
• app/models/question_option.rb
• app/models/region.rb
• app/models/role.rb
• app/models/section.rb
• app/models/suggested_answer.rb
• app/models/template.rb
• app/models/theme.rb
• app/models/token_permission_type.rb
• app/models/user.rb
• app/models/user_identifier.rb
• app/policies/answer_policy.rb
• app/policies/template_policy.rb
• app/views/answers/update.js.erb
• app/views/devise/mailer/confirmation_instructions.html.erb
• app/views/devise/mailer/invitation_instructions.html.erb
• app/views/devise/mailer/reset_password_instructions.html.erb
• app/views/devise/mailer/unlock_instructions.html.erb
• app/views/devise/registrations/edit.html.erb
• app/views/guidances/admin_index.html.erb
• app/views/layouts/application.html.erb
• app/views/phases/_answer.html.erb
• app/views/phases/_answer_form.html.erb
• app/views/plans/_plan_details.html.erb
• app/views/plans/share.html.erb
• app/views/templates/admin_template.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
• 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
• lib/assets/stylesheets/bootstrap_and_overrides.css.less
• test/configuration_test.rb
• test/functional/answers_controller_test.rb
• test/functional/templates_controller_test.rb
• test/integration/answer_locking_test.rb
• test/missing_translation_test.rb

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

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

Ignore Space Show notes View app/controllers/roles_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/answer.rb

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

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

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

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

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

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

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

Ignore Space Show notes View app/models/perm.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/question_format.rb

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

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View app/views/answers/update.js.erb

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

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

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

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

Ignore Space Show notes View app/views/devise/registrations/edit.html.erb

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

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

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

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

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

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

Ignore Space Show notes View app/views/templates/admin_template.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 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 lib/assets/stylesheets/bootstrap_and_overrides.css.less

Ignore Space Show notes View test/configuration_test.rb

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

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

Ignore Space Show notes View test/integration/answer_locking_test.rb 0 → 100644

Ignore Space Show notes View test/missing_translation_test.rb 0 → 100644

Show line notes below