Browse code Merge pull request #40 from DMPRoadmap/development Development dev
commit 848391e7748c17d492ca1c046da08c267d6e6291 2 parents b523e94 + c4bec2f Jimmy Angelakos authored on 6 Jun 2017 GitHub committed on 6 Jun 2017

Showing 27 changed files

• app/controllers/annotations_controller.rb
• app/controllers/templates_controller.rb
• app/models/phase.rb
• app/models/question.rb
• app/models/user.rb
• app/policies/annotation_policy.rb
• app/views/annotations/_add_annotation.html.erb
• app/views/annotations/_edit_annotation.html.erb
• app/views/annotations/_show_annotation.html.erb
• app/views/guidance_groups/admin_edit.html.erb
• app/views/guidance_groups/admin_new.html.erb
• app/views/phases/_answer_form.html.erb
• app/views/questions/_show_question.html.erb
• app/views/templates/_admin_nav_tabs.html.erb
• app/views/templates/_show_template.html.erb
• app/views/templates/admin_index.html.erb
• app/views/templates/admin_template.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
• lib/assets/javascripts/admin.js
• test/functional/annotations_controller_test.rb
• test/functional/templates_controller_test.rb

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

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

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

Ignore Space Show notes View app/views/annotations/_add_annotation.html.erb

Ignore Space Show notes View app/views/annotations/_edit_annotation.html.erb

Ignore Space Show notes View app/views/annotations/_show_annotation.html.erb

Ignore Space Show notes View app/views/guidance_groups/admin_edit.html.erb

Ignore Space Show notes View app/views/guidance_groups/admin_new.html.erb

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

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

Ignore Space Show notes View app/views/templates/_admin_nav_tabs.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 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 lib/assets/javascripts/admin.js

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

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

Show line notes below