Browse code Merge branch 'development' of https://github.com/CDLUC3/roadmap into development dev
commit be63b8cc0d9314a99dd24718727277f45eedaf54 2 parents 9f56bc0 + 8c25504 briley authored on 10 Jan 2017

Showing 32 changed files

• app/controllers/projects_controller.rb
• app/controllers/static_pages_controller.rb
• app/models/exported_plan.rb
• app/models/project.rb
• app/models/visibility.rb
• app/views/layouts/_navigation.html.erb
• app/views/projects/_project_details.html.erb
• app/views/projects/public_export.html.erb
• app/views/projects/publicly_available.html.erb
• app/views/static_pages/public_plans.html.erb
• config/locales/de.yml
• config/locales/en-UK.yml
• config/locales/en-US.yml
• config/locales/es.yml
• config/locales/fr.yml
• config/locales/static_pages/de.static.yml.example
• config/locales/static_pages/en-UK.static.yml.example
• config/locales/static_pages/en-US.static.yml.example
• config/locales/static_pages/fr.static.yml.example
• config/routes.rb
• db/migrate/20170103171414_add_test_and_public_to_projects.rb
• db/migrate/20170103221846_add_indexes_for_is_test_and_is_public_to_projects.rb
• db/migrate/20170105165111_create_visibilities.rb
• db/schema.rb
• db/seeds.rb
• test/fixtures/plans.yml
• test/fixtures/projects.yml
• test/fixtures/visibilities.yml
• test/functional/projects_controller_test.rb
• test/functional/static_pages_controller_test.rb
• test/routing_test.rb
• test/unit/project_test.rb

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

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

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

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

Ignore Space Show notes View app/models/visibility.rb 0 → 100644

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

Ignore Space Show notes View app/views/projects/_project_details.html.erb

Ignore Space Show notes View app/views/projects/public_export.html.erb 0 → 100644

Show notes View app/views/projects/publicly_available.html.erb 100644 → 0

Ignore Space Show notes View app/views/static_pages/public_plans.html.erb 0 → 100644

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/es.yml

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

Ignore Space Show notes View config/locales/static_pages/de.static.yml.example

Ignore Space Show notes View config/locales/static_pages/en-UK.static.yml.example

Ignore Space Show notes View config/locales/static_pages/en-US.static.yml.example

Ignore Space Show notes View config/locales/static_pages/fr.static.yml.example

Ignore Space Show notes View config/routes.rb

Show notes View db/migrate/20170103171414_add_test_and_public_to_projects.rb 100644 → 0

Show notes View db/migrate/20170103221846_add_indexes_for_is_test_and_is_public_to_projects.rb 100644 → 0

Ignore Space Show notes View db/migrate/20170105165111_create_visibilities.rb 0 → 100644

Ignore Space Show notes View db/schema.rb

Ignore Space Show notes View db/seeds.rb

Ignore Space Show notes View test/fixtures/plans.yml

Ignore Space Show notes View test/fixtures/projects.yml

Ignore Space Show notes View test/fixtures/visibilities.yml 0 → 100644

Ignore Space Show notes View test/functional/projects_controller_test.rb

Ignore Space Show notes View test/functional/static_pages_controller_test.rb 0 → 100644

Ignore Space Show notes View test/routing_test.rb

Ignore Space Show notes View test/unit/project_test.rb

Show line notes below