Browse code Merge pull request #38 from CDLUC3/master Bug fixes Merging various bug fixes (Closes #34, #37, #36, #35) dev
commit 1cdeb134c3cfe46395ede1c151dfe62ba33648bb 2 parents 0577967 + 3d8f817 Brian Riley authored on 10 Oct 2016 GitHub committed on 10 Oct 2016

Showing 45 changed files

• .gitignore
• Gemfile.lock
• app/assets/javascripts/application.js
• app/assets/stylesheets/admin.css.less
• app/assets/stylesheets/bootstrap_and_overrides.css.less
• app/controllers/application_controller.rb
• app/controllers/organisations_controller.rb
• app/controllers/plans_controller.rb
• app/controllers/registrations_controller.rb
• app/controllers/sessions_controller.rb
• app/controllers/settings/plans_controller.rb
• app/controllers/settings/projects_controller.rb
• app/controllers/users_controller.rb
• app/helpers/plans_helper.rb
• app/helpers/projects_helper.rb
• app/mailers/user_mailer.rb
• app/models/exported_plan.rb
• app/models/organisation.rb
• app/models/user.rb
• app/policies/guidance_group_policy.rb
• app/policies/organisation_policy.rb
• app/views/devise/registrations/edit.html.erb
• app/views/guidances/admin_index.html.erb
• app/views/guidances/admin_new.html.erb
• app/views/layouts/_dmponline_signin_signout.html.erb
• app/views/organisations/admin_edit.html.erb
• app/views/projects/_project_list_head.html.erb
• app/views/projects/_project_list_item.html.erb
• app/views/projects/new.html.erb
• app/views/projects/share.html.erb
• app/views/shared/_export_links.html.erb
• app/views/static_pages/help.html.erb
• app/views/user_mailer/permissions_change_notification.html.erb
• app/views/user_mailer/sharing_notification.html.erb
• app/views/users/admin_grant_permissions.html.erb
• app/views/users/admin_index.html.erb
• config/application.rb
• config/branding.yml
• config/initializers/devise.rb
• config/locales/de.yml
• config/locales/en-UK.yml
• config/locales/en-US.yml
• config/locales/fr.yml
• db/seeds.rb
• lib/custom_failure.rb

Ignore Space Show notes View .gitignore

Ignore Space Show notes View Gemfile.lock

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

Ignore Space Show notes View app/assets/stylesheets/admin.css.less

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

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

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

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/controllers/sessions_controller.rb

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

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

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

Show notes View app/helpers/plans_helper.rb 100644 → 0

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View app/views/static_pages/help.html.erb

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

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

Ignore Space Show notes View app/views/users/admin_grant_permissions.html.erb

Ignore Space Show notes View app/views/users/admin_index.html.erb

Ignore Space Show notes View config/application.rb

Ignore Space Show notes View config/branding.yml

Ignore Space Show notes View config/initializers/devise.rb

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/fr.yml

Ignore Space Show notes View db/seeds.rb

Ignore Space Show notes View lib/custom_failure.rb

Show line notes below