Complete merge Development -> Master
dev
commit 8a1d1fb8a89fb28aac092421aa5c23e8b9d3e3f5
2 parents c7291b4 + bcef6c8
@Sam Rust Sam Rust authored on 22 Apr 2019
Showing 95 changed files
View
Gemfile
View
Gemfile.lock
View
app/assets/fonts/GillSans-Light.ttf 0 → 100644
Not supported
View
app/assets/stylesheets/application.scss
View
app/assets/stylesheets/blocks/_datepicker.scss 0 → 100644
View
app/assets/stylesheets/blocks/_question_container.scss 0 → 100644
View
app/assets/stylesheets/blocks/_readonly_textarea.scss 0 → 100644
View
app/assets/stylesheets/utils/_break_words.scss 0 → 100644
View
app/assets/stylesheets/variables/_bootstrap.scss
View
app/assets/stylesheets/vendor/jquery-ui/datepicker/jquery-ui.min.css 0 → 100644
View
app/assets/stylesheets/vendor/jquery-ui/datepicker/jquery-ui.structure.min.css 0 → 100644
View
app/assets/stylesheets/vendor/jquery-ui/datepicker/jquery-ui.theme.min.css 0 → 100644
View
app/assets/vendor/jquery-ui/datepicker/images/ui-bg_flat_0_aaaaaa_40x100.png 0 → 100644
View
app/assets/vendor/jquery-ui/datepicker/images/ui-icons_444444_256x240.png 0 → 100644
View
app/assets/vendor/jquery-ui/datepicker/images/ui-icons_555555_256x240.png 0 → 100644
View
app/assets/vendor/jquery-ui/datepicker/images/ui-icons_777620_256x240.png 0 → 100644
View
app/assets/vendor/jquery-ui/datepicker/images/ui-icons_777777_256x240.png 0 → 100644
View
app/assets/vendor/jquery-ui/datepicker/images/ui-icons_FFF_256x240.png 0 → 100644
View
app/assets/vendor/jquery-ui/datepicker/images/ui-icons_cc0000_256x240.png 0 → 100644
View
app/controllers/answers_controller.rb
View
app/controllers/api/v0/statistics_controller.rb
View
app/controllers/notes_controller.rb
View
app/controllers/org_admin/plans_controller.rb
View
app/controllers/org_admin/templates_controller.rb
View
app/controllers/paginable/guidance_groups_controller.rb
View
app/controllers/paginable/guidances_controller.rb
View
app/controllers/paginable/orgs_controller.rb
View
app/controllers/paginable/plans_controller.rb
View
app/controllers/paginable/templates_controller.rb
View
app/controllers/paginable/users_controller.rb
View
app/controllers/plan_exports_controller.rb
View
app/controllers/public_pages_controller.rb
View
app/controllers/registrations_controller.rb
View
app/controllers/super_admin/orgs_controller.rb
View
app/controllers/users_controller.rb
View
app/helpers/customizable_template_link_helper.rb 0 → 100644
View
app/helpers/exports_helper.rb
View
app/helpers/feedbacks_helper.rb
View
app/helpers/orgs_helper.rb
View
app/javascript/utils/datePicker.js 0 → 100644
View
app/javascript/utils/panelHeading.js
View
app/javascript/views/answers/edit.js
View
app/javascript/views/usage/index.js
View
app/mailers/user_mailer.rb
View
app/models/concerns/exportable_plan.rb
View
app/models/guidance.rb
View
app/models/guidance_group.rb
View
app/models/org.rb
View
app/models/plan.rb
View
app/models/stat_created_plan.rb
View
app/models/stat_created_plan/create_or_update.rb
View
app/models/template.rb
View
app/models/theme.rb
View
app/models/user.rb
View
app/views/answers/_new_edit.html.erb
View
app/views/guidance_groups/_index_by_theme.html.erb
View
app/views/guidances/_guidance_display.html.erb
View
app/views/notes/_list.html.erb
View
app/views/notes/_show.html.erb
View
app/views/org_admin/annotations/_show.html.erb
View
app/views/org_admin/phases/_index.html.erb
View
app/views/org_admin/phases/_phase.html.erb
View
app/views/org_admin/phases/_show.html.erb
View
app/views/org_admin/questions/_show.html.erb
View
app/views/orgs/_feedback_form.html.erb
View
app/views/paginable/guidance_groups/_index.html.erb
View
app/views/paginable/notifications/_index.html.erb
View
app/views/paginable/orgs/_index.html.erb
View
app/views/paginable/templates/_customisable.html.erb
View
app/views/paginable/templates/_organisational.html.erb
View
app/views/paginable/themes/_index.html.erb
View
app/views/phases/_edit_plan_answers.html.erb
View
app/views/phases/_overview.html.erb
View
app/views/plans/_overview_details.html.erb
View
app/views/plans/_share_form.html.erb
View
app/views/questions/_new_edit_question_datefield.html.erb 0 → 100644
View
app/views/questions/_new_edit_question_option_based.html.erb
View
app/views/questions/_new_edit_question_textarea.html.erb
View
app/views/shared/export/_plan.erb
View
app/views/shared/export/_plan_coversheet.erb
View
app/views/shared/export/_plan_styling.erb
View
app/views/usage/index.html.erb
View
app/views/user_mailer/new_comment.html.erb
View
config/branding.yml.sample
View
config/initializers/fast_gettext.rb
View
config/webpack/environment.js
View
config/webpack/loaders/babel-loader.js 0 → 100644
View
config/webpack/production.js
View
lib/csvable.rb
View
lib/tasks/upgrade.rake
View
public/tinymce/skins/lightgray/skin.min.css
View
spec/models/stat_created_plan_spec.rb
View
spec/requests/stat_created_plans_by_template_controller_spec.rb
View
spec/services/org/create_created_plan_service_spec.rb
View
spec/services/org/create_last_month_created_plan_service_spec.rb