Browse code Merge pull request #1741 from CDLUC3/release Cherry picked commits for bug fixes: DO NOT MERGE YET dev
commit afbb01d9cd38bc378ed08205635109efbe04569e 2 parents c627043 + 1fbbb99 Brian Riley authored on 19 Jul 2018 GitHub committed on 19 Jul 2018

Showing 44 changed files

• CONTRIBUTING.md
• app/controllers/org_admin/questions_controller.rb
• app/controllers/orgs_controller.rb
• app/controllers/plans_controller.rb
• app/controllers/roles_controller.rb
• app/helpers/feedbacks_helper.rb
• app/helpers/mailer_helper.rb
• app/helpers/orgs_helper.rb
• app/mailers/user_mailer.rb
• app/models/plan.rb
• app/services/guidance_service.rb
• app/views/guidance_groups/_index_by_theme.html.erb
• app/views/guidances/new_edit.html.erb
• app/views/layouts/application.html.erb
• app/views/org_admin/annotations/_show.html.erb
• app/views/org_admin/phases/preview.html.erb
• app/views/org_admin/question_options/_option_fields.html.erb
• app/views/org_admin/shared/_theme_selector.html.erb
• app/views/orgs/_feedback_form.html.erb
• app/views/phases/_edit_plan_answers.html.erb
• app/views/phases/_guidances_notes.html.erb
• app/views/plans/_share_form.html.erb
• app/views/shared/_create_account_form.html.erb
• app/views/user_mailer/_email_signature.html.erb
• app/views/user_mailer/feedback_complete.html.erb
• app/views/user_mailer/feedback_notification.html.erb
• app/views/user_mailer/sharing_notification.html.erb
• bin/bundle
• bin/rails
• bin/rake
• bin/setup
• config/application.rb
• lib/assets/javascripts/utils/ariatiseForm.js
• lib/assets/javascripts/utils/isValidInputType.js
• lib/assets/javascripts/utils/validation.js
• lib/assets/javascripts/views/devise/registrations/edit.js
• lib/assets/javascripts/views/guidances/new_edit.js
• lib/assets/javascripts/views/org_admin/phases/new_edit.js
• lib/assets/javascripts/views/org_admin/question_options/index.js
• lib/assets/javascripts/views/orgs/admin_edit.js
• lib/assets/javascripts/views/shared/create_account_form.js
• lib/assets/javascripts/views/super_admin/notifications/edit.js
• lib/assets/stylesheets/overrides.scss
• test/mailers/previews/user_mailer_preview.rb

Ignore Space Show notes View CONTRIBUTING.md

Ignore Space Show notes View app/controllers/org_admin/questions_controller.rb

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

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

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

Ignore Space Show notes View app/helpers/feedbacks_helper.rb 0 → 100644

Ignore Space Show notes View app/helpers/mailer_helper.rb

Ignore Space Show notes View app/helpers/orgs_helper.rb 0 → 100644

Ignore Space Show notes View app/mailers/user_mailer.rb

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

Show notes View app/services/guidance_service.rb 100644 → 0

Show notes View app/views/guidance_groups/_index_by_theme.html.erb 100644 → 0

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

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

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

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

Ignore Space Show notes View app/views/org_admin/question_options/_option_fields.html.erb

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

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

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

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

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

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

Ignore Space Show notes View app/views/user_mailer/_email_signature.html.erb

Ignore Space Show notes View app/views/user_mailer/feedback_complete.html.erb

Ignore Space Show notes View app/views/user_mailer/feedback_notification.html.erb

Ignore Space Show notes View app/views/user_mailer/sharing_notification.html.erb

Ignore Space Show notes View bin/bundle

Ignore Space Show notes View bin/rails

Ignore Space Show notes View bin/rake

Ignore Space Show notes View bin/setup

Ignore Space Show notes View config/application.rb

Ignore Space Show notes View lib/assets/javascripts/utils/ariatiseForm.js

Ignore Space Show notes View lib/assets/javascripts/utils/isValidInputType.js

Ignore Space Show notes View lib/assets/javascripts/utils/validation.js

Ignore Space Show notes View lib/assets/javascripts/views/devise/registrations/edit.js

Ignore Space Show notes View lib/assets/javascripts/views/guidances/new_edit.js

Ignore Space Show notes View lib/assets/javascripts/views/org_admin/phases/new_edit.js

Ignore Space Show notes View lib/assets/javascripts/views/org_admin/question_options/index.js

Ignore Space Show notes View lib/assets/javascripts/views/orgs/admin_edit.js

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

Ignore Space Show notes View lib/assets/javascripts/views/super_admin/notifications/edit.js

Ignore Space Show notes View lib/assets/stylesheets/overrides.scss

Ignore Space Show notes View test/mailers/previews/user_mailer_preview.rb

Show line notes below