Browse code Merge branch 'development' of https://github.com/CDLUC3/roadmap into development dev
commit b88da9f356820a18daa24cb72345fea8f5aadf66 2 parents 2736a23 + 3d35cde Brian Riley authored on 23 Jun 2017

Showing 53 changed files

• app/controllers/api/v0/guidance_groups_controller.rb
• app/controllers/api/v0/guidances_controller.rb
• app/controllers/plans_controller.rb
• app/views/answers/_new_edit.html.erb
• app/views/api/v0/guidance_groups/show.json.jbuilder
• app/views/api/v0/guidances/index.json.jbuilder
• app/views/api/v0/guidances/show.json.jbuilder
• app/views/devise/registrations/edit.html.erb
• app/views/guidances/_add_guidance.html.erb
• app/views/guidances/admin_edit.html.erb
• app/views/guidances/admin_new.html.erb
• app/views/notes/_add.html.erb
• app/views/notes/_archive.html.erb
• app/views/notes/_edit.html.erb
• app/views/notes/_list.html.erb
• app/views/notes/_view.html.erb
• app/views/orgs/admin_edit.html.erb
• app/views/phases/_add_note.html.erb
• app/views/phases/_answer_form.html.erb
• app/views/phases/_archive_note.html.erb
• app/views/phases/_edit_note.html.erb
• app/views/phases/_list_notes.html.erb
• app/views/phases/_note.html.erb
• app/views/phases/_show_phase.html
• app/views/phases/_show_phase.html.erb
• app/views/phases/_view_note.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/edit.html.erb
• app/views/plans/export.docx.erb
• app/views/plans/share.html.erb
• app/views/question_options/_option_fields.html.erb
• app/views/questions/_add_question.html.erb
• app/views/questions/_edit_question.html.erb
• app/views/shared/_register_form.html.erb
• app/views/templates/admin_new.html.erb
• app/views/templates/admin_template.html.erb
• config/application.rb
• config/tinymce.yml
• lib/assets/javascripts/Dmproadmap.js
• lib/assets/javascripts/admin.js
• lib/assets/javascripts/answers/status.js
• lib/assets/javascripts/application.js
• lib/assets/javascripts/bootstrap_listeners.js
• lib/assets/javascripts/export_configure.js
• lib/assets/javascripts/notes/index.js
• lib/assets/javascripts/plans.js
• lib/assets/javascripts/plans/edit.js
• lib/assets/javascripts/plans/share.js
• lib/assets/javascripts/projects.js
• lib/assets/javascripts/shared/register_form.js

Ignore Space Show notes View app/controllers/api/v0/guidance_groups_controller.rb

Show notes View app/controllers/api/v0/guidances_controller.rb 100644 → 0

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

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

Show notes View app/views/api/v0/guidance_groups/show.json.jbuilder 100644 → 0

Show notes View app/views/api/v0/guidances/index.json.jbuilder 100644 → 0

Show notes View app/views/api/v0/guidances/show.json.jbuilder 100644 → 0

Ignore Space Show notes View app/views/devise/registrations/edit.html.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/notes/_add.html.erb 0 → 100644

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View app/views/phases/_show_phase.html 0 → 100644

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

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

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/edit.html.erb

Ignore Space Show notes View app/views/plans/export.docx.erb

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

Ignore Space Show notes View app/views/question_options/_option_fields.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/shared/_register_form.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/application.rb

Ignore Space Show notes View config/tinymce.yml

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

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

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

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

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

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

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

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

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

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

Show notes View lib/assets/javascripts/projects.js 100644 → 0

Ignore Space Show notes View lib/assets/javascripts/shared/register_form.js

Show line notes below