Browse code Merge pull request #11 from DigitalCurationCentre/postgresql Postgresql - pull latest changes into master dev
commit 35d8a66c549174e40ed1ec3f569b72ef4025a46e 2 parents 7fd2e46 + 65f84b7 Ray Carrick authored on 21 Nov 2016 GitHub committed on 21 Nov 2016

Showing 25 changed files

• app/admin/organisation.rb
• app/controllers/guidances_controller.rb
• app/controllers/organisations_controller.rb
• app/controllers/registrations_controller.rb
• app/models/organisation.rb
• app/models/phase.rb
• app/models/user.rb
• app/policies/guidance_policy.rb
• app/views/dmptemplates/_preview_question.html.erb
• app/views/layouts/_navigation.html.erb
• app/views/layouts/_signin_signout.html.erb
• app/views/static_pages/about_us.html.erb
• config/branding.yml
• config/branding.yml
• config/locales/bootstrap/es.bootstrap.yml
• config/locales/contact_us/contact_us.en-UK.yml
• config/locales/devise/devise.es.yml
• config/locales/devise/devise_invitable.es.yml
• config/locales/es.yml
• config/locales/fr.yml
• config/locales/fr.yml.old
• db/migrate/20131118094629_change_versions_published.rb
• db/seeds.rb
• lib/assets/javascripts/admin.js
• lib/assets/javascripts/projects.js

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

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

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

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

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

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

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

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

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

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

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

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

Show notes View config/branding.yml 100644 → 0

Ignore Space Show notes View config/branding.yml 0 → 120000

Ignore Space Show notes View config/locales/bootstrap/es.bootstrap.yml 0 → 100644

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

Ignore Space Show notes View config/locales/devise/devise.es.yml 0 → 100644

Ignore Space Show notes View config/locales/devise/devise_invitable.es.yml 0 → 100644

Ignore Space Show notes View config/locales/es.yml 0 → 100644

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

Ignore Space Show notes View config/locales/fr.yml.old 0 → 100644

Ignore Space Show notes View db/migrate/20131118094629_change_versions_published.rb

Ignore Space Show notes View db/seeds.rb

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

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

Show line notes below