Browse code Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development dev
commit 2c08319a454c9dc93a23105590d44a4aba55ccbf 2 parents 848391e + 7c30197 Jose Lloret authored on 12 Jun 2017

Showing 31 changed files

• app/controllers/plans_controller.rb
• app/controllers/questions_controller.rb
• app/controllers/registrations_controller.rb
• app/controllers/templates_controller.rb
• app/models/question.rb
• app/models/question_format.rb
• app/models/template.rb
• app/policies/template_policy.rb
• app/views/annotations/_add_annotation.html.erb
• app/views/answers/_locking.html.erb
• app/views/devise/registrations/new.html.erb
• app/views/home/index.html.erb
• app/views/layouts/_footer.html.erb
• app/views/layouts/_signin_signout.html.erb
• app/views/plans/_plan_details.html.erb
• app/views/questions/_add_question.html.erb
• app/views/shared/_register_form.html.erb
• app/views/static_pages/about_us.html.erb
• app/views/templates/admin_index.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/questions_controller_test.rb
• test/functional/registrations_controller_test.rb
• test/integration/answer_locking_test.rb
• test/test_helper.rb

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

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

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

Ignore Space Show notes View app/views/answers/_locking.html.erb

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

Ignore Space Show notes View app/views/home/index.html.erb

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

Ignore Space Show notes View app/views/layouts/_signin_signout.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/shared/_register_form.html.erb

Ignore Space Show notes View app/views/static_pages/about_us.html.erb

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

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

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

Ignore Space Show notes View test/test_helper.rb

Show line notes below