Browse code Merge branch 'development' of https://github.com/CDLUC3/roadmap into development dev
commit 715854ff3f505275f6f629fda41930b4246fe491 2 parents 1db1a76 + 6ca9b3b briley authored on 8 Dec 2016

Showing 24 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/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

Ignore Space Show notes View config/branding.yml

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