Browse code Merge remote-tracking branch 'upstream/development' into xsrust/bugfixes dev
commit 737be12c4171e514f5243e29e5c2b72d314c6288 2 parents 6145260 + b523e94 xsrust authored on 5 Jun 2017

Showing 50 changed files

• app/controllers/answers_controller.rb
• app/controllers/phases_controller.rb
• app/controllers/plans_controller.rb
• app/models/answer.rb
• app/models/org.rb
• app/models/plan.rb
• app/models/section.rb
• app/models/template.rb
• app/views/answers/_form_fields.html.erb
• app/views/answers/_locking.html.erb
• app/views/answers/_new_edit.html.erb
• app/views/answers/_status.html.erb
• app/views/answers/update.js.erb
• app/views/guidances/_add_guidance.html.erb
• app/views/guidances/admin_edit.html.erb
• app/views/guidances/admin_new.html.erb
• app/views/orgs/admin_edit.html.erb
• app/views/phases/_add_note.html.erb
• app/views/phases/_answer.html.erb
• app/views/phases/_answer_form.html.erb
• app/views/phases/_edit_phase.html.erb
• app/views/phases/admin_add.html.erb
• app/views/phases/admin_show.html.erb
• app/views/phases/edit.html.erb
• app/views/plans/_plan_details.html.erb
• app/views/plans/_progress.html.erb
• app/views/plans/edit.html.erb
• app/views/questions/_add_question.html.erb
• app/views/questions/_edit_question.html.erb
• app/views/sections/_add_section.html.erb
• app/views/sections/_edit_section.html.erb
• app/views/sections/_progress.html.erb
• app/views/templates/_edit_template.html.erb
• app/views/templates/admin_new.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/tinymce.yml
• lib/assets/javascripts/answers/status.js
• lib/assets/javascripts/plans.js
• lib/assets/stylesheets/admin.css.less
• lib/assets/stylesheets/bootstrap_and_overrides.css.less
• lib/assets/stylesheets/roadmap-form.scss
• public/shib_logo.png
• test/functional/answers_controller_test.rb
• test/integration/answer_locking_test.rb

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

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/models/answer.rb

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

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

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

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

Ignore Space Show notes View app/views/answers/_form_fields.html.erb 0 → 100644

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

Ignore Space Show notes View app/views/answers/_new_edit.html.erb 0 → 100644

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

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

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

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

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

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

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

Show notes View app/views/phases/_answer.html.erb 100644 → 0

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

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

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

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

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

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

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

Ignore Space Show notes View app/views/plans/edit.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/sections/_add_section.html.erb

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

Ignore Space Show notes View app/views/sections/_progress.html.erb 0 → 100644

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

Ignore Space Show notes View app/views/templates/admin_new.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/tinymce.yml

Ignore Space Show notes View lib/assets/javascripts/answers/status.js

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

Ignore Space Show notes View lib/assets/stylesheets/admin.css.less

Ignore Space Show notes View lib/assets/stylesheets/bootstrap_and_overrides.css.less

Ignore Space Show notes View lib/assets/stylesheets/roadmap-form.scss

Show notes View public/shib_logo.png 100644 → 0

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

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

Show line notes below