Merge pull request #26 from DMPRoadmap/development
Merge Roadmap into DCC
dev
commit bb5f4afd54485dd7940f22ededd1ea58d1e05e5c
2 parents 00b246e + 8a4b1b4
@Ray Carrick Ray Carrick authored on 30 Mar 2017
GitHub committed on 30 Mar 2017
Showing 18 changed files
View
.gitignore
View
app/controllers/guidance_groups_controller.rb
View
app/controllers/guidances_controller.rb
View
app/models/org.rb
View
config/branding.yml 100644 → 0
View
config/branding_example.yml 0 → 100644
View
db/seeds.rb
View
lib/assets/javascripts/admin.js
View
test/configuration_test.rb
View
test/functional/application_controller_test.rb
View
test/functional/registrations_controller_test.rb
View
test/functional/users/omniauth_callbacks_controller_test.rb
View
test/helpers/plans_helper_test.rb
View
test/integration/authentication_test.rb
View
test/routing_test.rb
View
test/test_helper.rb
View
test/unit/guidance_group_test.rb
View
test/unit/user_test.rb