Merge pull request #6 from DMPRoadmap/development
- Rails XSS patch
- pulling in organisation logo functionality
- cleaned up Gemfile
dev
commit d95388bb9b9de7d09e078b65b6ad039ea236b370
2 parents 611f9cb + 13eb204
@Brian Riley Brian Riley authored on 17 Aug 2016
GitHub committed on 17 Aug 2016
Showing 13 changed files
View
.gitignore
View
Gemfile
View
Gemfile.lock
View
app/controllers/organisations_controller.rb
View
app/models/organisation.rb
View
app/views/layouts/_dmponline_header.html.erb
View
app/views/organisations/admin_edit.html.erb
View
app/views/organisations/admin_show.html.erb
View
config/environments/development.rb
View
config/initializers/dragonfly.rb 0 → 100644
View
config/locales/en-UK.yml
View
db/migrate/20160810193149_add_logouid_to_organisations.rb 0 → 100644
View
db/schema.rb