Browse code Merge pull request #51 from DMPRoadmap/development Rebasing v0.33 dev
commit cec2cdcfe6dc485ab3253e77cde86aee74353aaf 2 parents 7f6148e + 78dcd33 Brian Riley authored on 15 May 2017 GitHub committed on 15 May 2017

Showing 36 changed files

• Gemfile
• Gemfile.lock
• app/controllers/plans_controller.rb
• app/controllers/registrations_controller.rb
• app/models/org.rb
• app/models/plan.rb
• app/models/template.rb
• app/policies/plan_policy.rb
• app/views/contact_us/contacts/new.html.erb
• app/views/devise/registrations/edit.html.erb
• app/views/phases/_add_note.html.erb
• app/views/phases/_answer_form.html.erb
• app/views/phases/_edit_note.html.erb
• app/views/phases/_note.html.erb
• app/views/plans/_answer_form.html.erb
• app/views/plans/_available_templates.html.erb
• app/views/plans/_dropdowns_new_plan.html.erb
• app/views/plans/_plan_details.html.erb
• app/views/plans/create.js.erb
• app/views/plans/new.html.erb
• app/views/plans/share.html.erb
• app/views/projects/_dropdowns_new_project.html.erb
• app/views/shared/_accessible_combobox.html.erb
• app/views/shared/_accessible_submit_button.html.erb
• app/views/shared/_export_links.html.erb
• config/application.rb
• lib/assets/javascripts/application.js
• lib/assets/javascripts/contacts/new_contact.js
• lib/assets/javascripts/jquery-accessible-autocomplet-list-aria.js
• lib/assets/javascripts/plans.js
• lib/assets/javascripts/plans/new_plan.js
• lib/assets/stylesheets/application.css
• lib/assets/stylesheets/roadmap-form.scss
• test/functional/plans_controller_test.rb
• test/functional/users/omniauth_callbacks_controller_test.rb
• test/integration/template_selection_test.rb

Ignore Space Show notes View Gemfile

Ignore Space Show notes View Gemfile.lock

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

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

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

Ignore Space Show notes View app/views/contact_us/contacts/new.html.erb

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

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

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

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

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

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

Ignore Space Show notes View app/views/plans/_available_templates.html.erb 0 → 100644

Show notes View app/views/plans/_dropdowns_new_plan.html.erb 100644 → 0

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

Ignore Space Show notes View app/views/plans/create.js.erb 0 → 100644

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

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

Show notes View app/views/projects/_dropdowns_new_project.html.erb 100644 → 0

Ignore Space Show notes View app/views/shared/_accessible_combobox.html.erb 0 → 100644

Ignore Space Show notes View app/views/shared/_accessible_submit_button.html.erb 0 → 100644

Ignore Space Show notes View app/views/shared/_export_links.html.erb

Ignore Space Show notes View config/application.rb

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

Ignore Space Show notes View lib/assets/javascripts/contacts/new_contact.js 0 → 100644

Ignore Space Show notes View lib/assets/javascripts/jquery-accessible-autocomplet-list-aria.js 0 → 100755

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

Ignore Space Show notes View lib/assets/javascripts/plans/new_plan.js 0 → 100644

Ignore Space Show notes View lib/assets/stylesheets/application.css

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

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

Ignore Space Show notes View test/functional/users/omniauth_callbacks_controller_test.rb

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

Show line notes below