Browse code Merge branch 'development' of https://github.com/DMPRoadmap/roadmap into development dev
commit bfb1f52a7099e88ef1c6c7a3ada0abaea7ec095d 2 parents d2b3dbf + cbcd557 Jimmy Angelakos authored on 13 Mar 2018

Showing 12 changed files

• app/models/concerns/exportable_plan.rb
• app/views/notes/_list.html.erb
• app/views/notes/_show.html.erb
• config/locales/fr.yml
• config/locales/fr.yml.old
• db/migrate/20180312135238_add_default_to_org_links.rb
• db/migrate/20180312141558_add_default_to_plan_visibility.rb
• db/migrate/20180313120831_add_required_indices.rb
• db/schema.rb
• lib/assets/fonts/GillSansLight.ttf
• lib/tasks/upgrade.rake
• test/functional/super_admin/orgs_controller_test.rb

Ignore Space Show notes View app/models/concerns/exportable_plan.rb

Ignore Space Show notes View app/views/notes/_list.html.erb

Ignore Space Show notes View app/views/notes/_show.html.erb

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

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

Ignore Space Show notes View db/migrate/20180312135238_add_default_to_org_links.rb 0 → 100644

Ignore Space Show notes View db/migrate/20180312141558_add_default_to_plan_visibility.rb 0 → 100644

Ignore Space Show notes View db/migrate/20180313120831_add_required_indices.rb 0 → 100644

Ignore Space Show notes View db/schema.rb

Show notes View lib/assets/fonts/GillSansLight.ttf 100644 → 0
Not supported

Ignore Space Show notes View lib/tasks/upgrade.rake

Ignore Space Show notes View test/functional/super_admin/orgs_controller_test.rb

Show line notes below