Browse code fixed merge conflict in seeds.rb file. installed substance-rails gem and updated code to swap in the substance-forms text-area for tinymce on the answer section of the edit plans page dev
commit 132ddebca0fac57c18d5ee2376e67e12d3159848 2 parents 04ba97e + 533df66 Brian Riley authored on 13 Jan 2017

Showing 89 changed files

• Gemfile
• Gemfile.lock
• app/controllers/answers_controller.rb
• app/controllers/dmptemplates_controller.rb
• app/controllers/projects_controller.rb
• app/controllers/static_pages_controller.rb
• app/helpers/projects_helper.rb
• app/models/answer.rb
• app/models/comment.rb
• app/models/dmptemplate.rb
• app/models/exported_plan.rb
• app/models/plan.rb
• app/models/project.rb
• app/models/user.rb
• app/models/visibility.rb
• app/views/dmptemplates/_show_question.html.erb
• app/views/plans/_answer_form.html.erb
• app/views/plans/edit.html.erb
• app/views/projects/_project_details.html.erb
• app/views/projects/public_export.html.erb
• app/views/projects/public_export.pdf.erb
• app/views/static_pages/public_export.html.erb
• app/views/static_pages/public_export.pdf.erb
• config/locales/de.yml
• config/locales/en-UK.yml
• config/locales/en-US.yml
• config/locales/es.yml
• config/locales/fr.yml
• config/locales/static_pages/de.static.yml.example
• config/locales/static_pages/en-UK.static.yml.example
• config/locales/static_pages/en-US.static.yml.example
• db/migrate/20170105165111_create_visibilities.rb
• db/migrate/20170110092511_add_is_test_and_visibility_to_projects.rb
• db/schema.rb
• db/seeds.rb
• lib/assets/javascripts/application.js
• lib/assets/javascripts/plans.js
• lib/assets/javascripts/projects.js
• lib/assets/stylesheets/application.css
• lib/assets/stylesheets/bootstrap_and_overrides.css.less
• test/fixtures/organisations.yml
• test/fixtures/projects.yml
• test/fixtures/visibilities.yml
• test/functional/answers_controller_test.rb
• test/functional/dmptemplates_controller_test.rb
• test/functional/file_types_controller_test.rb
• test/functional/file_uploads_controller_test.rb
• test/functional/guidances_controller_test.rb
• test/functional/home_controller_test.rb
• test/functional/organisation_types_controller_test.rb
• test/functional/organisations_controller_test.rb
• test/functional/pages_controller_test.rb
• test/functional/phases_controller_test.rb
• test/functional/plan_sections_controller_test.rb
• test/functional/plans_controller_test.rb
• test/functional/project_groups_controller_test.rb
• test/functional/project_partners_controller_test.rb
• test/functional/projects_controller_test.rb
• test/functional/question_themes_controller_test.rb
• test/functional/questions_controller_test.rb
• test/functional/sections_controller_test.rb
• test/functional/static_pages_controller_test.rb
• test/functional/themes_controller_test.rb
• test/functional/user_org_roles_controller_test.rb
• test/functional/user_role_types_controller_test.rb
• test/functional/user_statuses_controller_test.rb
• test/functional/user_types_controller_test.rb
• test/functional/versions_controller_test.rb
• test/test_helper.rb
• test/unit/admin_user_test.rb
• test/unit/answer_test.rb
• test/unit/comment_test.rb
• test/unit/dmptemplate_test.rb
• test/unit/exported_plan_test.rb
• test/unit/guidance_test.rb
• test/unit/organisation_type_test.rb
• test/unit/page_test.rb
• test/unit/phase_test.rb
• test/unit/plan_section_test.rb
• test/unit/plan_test.rb
• test/unit/project_group_test.rb
• test/unit/project_partner_test.rb
• test/unit/project_test.rb
• test/unit/question_test.rb
• test/unit/section_test.rb
• test/unit/theme_test.rb
• test/unit/user_role_type_test.rb
• test/unit/user_test.rb
• test/unit/version_test.rb

Ignore Space Show notes View Gemfile

Ignore Space Show notes View Gemfile.lock

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

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

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

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

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

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

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

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

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

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

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

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

Show notes View app/models/visibility.rb 100644 → 0

Ignore Space Show notes View app/views/dmptemplates/_show_question.html.erb

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

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

Ignore Space Show notes View app/views/projects/_project_details.html.erb

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

Show notes View app/views/projects/public_export.pdf.erb 100644 → 0

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

Ignore Space Show notes View app/views/static_pages/public_export.pdf.erb 0 → 100644

Ignore Space Show notes View config/locales/de.yml

Ignore Space Show notes View config/locales/en-UK.yml

Ignore Space Show notes View config/locales/en-US.yml

Ignore Space Show notes View config/locales/es.yml

Ignore Space Show notes View config/locales/fr.yml

Ignore Space Show notes View config/locales/static_pages/de.static.yml.example

Ignore Space Show notes View config/locales/static_pages/en-UK.static.yml.example

Ignore Space Show notes View config/locales/static_pages/en-US.static.yml.example

Show notes View db/migrate/20170105165111_create_visibilities.rb 100644 → 0

Ignore Space Show notes View db/migrate/20170110092511_add_is_test_and_visibility_to_projects.rb 0 → 100644

Ignore Space Show notes View db/schema.rb

Ignore Space Show notes View db/seeds.rb

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

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

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

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

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

Ignore Space Show notes View test/fixtures/organisations.yml

Ignore Space Show notes View test/fixtures/projects.yml

Show notes View test/fixtures/visibilities.yml 100644 → 0

Show notes View test/functional/answers_controller_test.rb 100644 → 0

Show notes View test/functional/dmptemplates_controller_test.rb 100644 → 0

Show notes View test/functional/file_types_controller_test.rb 100644 → 0

Show notes View test/functional/file_uploads_controller_test.rb 100644 → 0

Show notes View test/functional/guidances_controller_test.rb 100644 → 0

Show notes View test/functional/home_controller_test.rb 100644 → 0

Show notes View test/functional/organisation_types_controller_test.rb 100644 → 0

Show notes View test/functional/organisations_controller_test.rb 100644 → 0

Show notes View test/functional/pages_controller_test.rb 100644 → 0

Show notes View test/functional/phases_controller_test.rb 100644 → 0

Show notes View test/functional/plan_sections_controller_test.rb 100644 → 0

Show notes View test/functional/plans_controller_test.rb 100644 → 0

Show notes View test/functional/project_groups_controller_test.rb 100644 → 0

Show notes View test/functional/project_partners_controller_test.rb 100644 → 0

Show notes View test/functional/projects_controller_test.rb 100644 → 0

Show notes View test/functional/question_themes_controller_test.rb 100644 → 0

Show notes View test/functional/questions_controller_test.rb 100644 → 0

Show notes View test/functional/sections_controller_test.rb 100644 → 0

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

Show notes View test/functional/themes_controller_test.rb 100644 → 0

Show notes View test/functional/user_org_roles_controller_test.rb 100644 → 0

Show notes View test/functional/user_role_types_controller_test.rb 100644 → 0

Show notes View test/functional/user_statuses_controller_test.rb 100644 → 0

Show notes View test/functional/user_types_controller_test.rb 100644 → 0

Show notes View test/functional/versions_controller_test.rb 100644 → 0

Ignore Space Show notes View test/test_helper.rb

Show notes View test/unit/admin_user_test.rb 100644 → 0

Ignore Space Show notes View test/unit/answer_test.rb

Ignore Space Show notes View test/unit/comment_test.rb

Ignore Space Show notes View test/unit/dmptemplate_test.rb

Ignore Space Show notes View test/unit/exported_plan_test.rb 0 → 100644

Show notes View test/unit/guidance_test.rb 100644 → 0

Show notes View test/unit/organisation_type_test.rb 100644 → 0

Show notes View test/unit/page_test.rb 100644 → 0

Show notes View test/unit/phase_test.rb 100644 → 0

Show notes View test/unit/plan_section_test.rb 100644 → 0

Show notes View test/unit/plan_test.rb 100644 → 0

Show notes View test/unit/project_group_test.rb 100644 → 0

Show notes View test/unit/project_partner_test.rb 100644 → 0

Show notes View test/unit/project_test.rb 100644 → 0

Show notes View test/unit/question_test.rb 100644 → 0

Show notes View test/unit/section_test.rb 100644 → 0

Show notes View test/unit/theme_test.rb 100644 → 0

Show notes View test/unit/user_role_type_test.rb 100644 → 0

Ignore Space Show notes View test/unit/user_test.rb

Show notes View test/unit/version_test.rb 100644 → 0

Show line notes below