Browse code Merge branch 'development' dev
commit 18c0c9d178706ca8d659135bb824fffe445b24c1 2 parents 14df3a7 + a7e48fc briley authored on 1 Sep 2016

Showing 22 changed files

• Gemfile.lock
• app/assets/stylesheets/admin.css.less
• app/controllers/application_controller.rb
• app/controllers/organisations_controller.rb
• app/controllers/token_permission_types_controller.rb
• app/models/organisation.rb
• app/validators/email_validator.rb
• app/views/layouts/_dmponline_header.html.erb
• app/views/layouts/_dmponline_org_branding.html.erb
• app/views/organisations/admin_edit.html.erb
• app/views/organisations/admin_show.html.erb
• app/views/plans/export.docx.caracal
• config/environments/development.rb
• config/locales/de.yml
• config/locales/en-UK.yml
• config/locales/en-US.yml
• config/locales/fr.yml
• db/migrate/20160822130601_remove_description_from_organisation.rb
• db/migrate/20160822130701_add_contact_email_to_organisation.rb
• db/schema.rb
• db/seeds.rb
• public/403.html

Ignore Space Show notes View Gemfile.lock

Ignore Space Show notes View app/assets/stylesheets/admin.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/token_permission_types_controller.rb

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

Ignore Space Show notes View app/validators/email_validator.rb 0 → 100644

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

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

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

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

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

Ignore Space Show notes View config/environments/development.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/migrate/20160822130601_remove_description_from_organisation.rb 0 → 100644

Ignore Space Show notes View db/migrate/20160822130701_add_contact_email_to_organisation.rb 0 → 100644

Ignore Space Show notes View db/schema.rb

Ignore Space Show notes View db/seeds.rb

Ignore Space Show notes View public/403.html

Show line notes below