Browse code Merge pull request #32 from DMPRoadmap/development Development dev
commit 9512c1be2e5b46057782603b5da138295274d66a 2 parents df210c1 + 0280a26 Jimmy Angelakos authored on 12 May 2017 GitHub committed on 12 May 2017

Showing 32 changed files

• app/controllers/application_controller.rb
• app/controllers/plans_controller.rb
• app/controllers/roles_controller.rb
• app/mailers/user_mailer.rb
• app/models/guidance.rb
• app/views/devise/mailer/invitation_instructions.html.erb
• app/views/layouts/_footer.html.erb
• app/views/phases/_answer.html.erb
• app/views/phases/_answer_form.html.erb
• app/views/phases/_answer_form_ro.html.erb
• app/views/plans/_answer_form.html.erb
• app/views/plans/_answer_form_ro.html.erb
• app/views/plans/_plan_details.html.erb
• app/views/questions/_add_question.html.erb
• app/views/questions/_edit_question.html.erb
• app/views/questions/_show_question.html.erb
• app/views/sections/_edit_section.html.erb
• app/views/templates/_edit_annotations.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/application.rb
• config/initializers/contac_us_example.rb
• config/initializers/contact_us.rb.example
• 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/locale/i18n_placeholders.rb
• lib/assets/javascripts/admin.js

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

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

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

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

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

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

Ignore Space Show notes View app/views/layouts/_footer.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/phases/_answer_form_ro.html.erb

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

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

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

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

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

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

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

Ignore Space Show notes View app/views/templates/_edit_annotations.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/application.rb

Show notes View config/initializers/contac_us_example.rb 100644 → 0

Ignore Space Show notes View config/initializers/contact_us.rb.example 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/locale/i18n_placeholders.rb

Ignore Space Show notes View lib/assets/javascripts/admin.js

Show line notes below