Browse code Merge pull request #9 from DMPRoadmap/master Pull latest DMPRoadmap changes dev
commit 347483d58bac05543e02997f1fbf2062da3ae503 2 parents 2685cc5 + b4491c7 Ray Carrick authored on 4 Nov 2016 GitHub committed on 4 Nov 2016

Showing 57 changed files

• .travis.yml
• Gemfile
• Gemfile.lock
• app/admin/token_permission_type.rb
• app/assets/images/logo_100x100.jpg
• app/assets/images/logo_300x300.jpg
• app/controllers/application_controller.rb
• app/helpers/projects_helper.rb
• app/models/guidance_group.rb
• app/models/language.rb
• app/models/organisation.rb
• app/models/organisation_type.rb
• app/models/token_permission_type.rb
• app/models/user.rb
• app/views/settings/plans/_export_formatting_form.html.erb
• app/views/token_permission_types/index.html.erb
• config/database_example.yml
• config/initializers/devise.rb
• config/locales/de.yml
• config/locales/en-UK.yml
• config/locales/en-US.yml
• config/locales/fr.yml
• db/migrate/20161021100420_single_organisation_for_users.rb
• db/migrate/20161102221313_change_text_description_to_text_description_in_token_permission_types.rb
• db/schema.rb
• db/seeds.rb
• lib/tasks/migrate.rake
• test/assets/logo.jpg
• test/assets/logo_100x100.jpg
• test/assets/logo_300x300.jpg
• test/fixtures/dmptemplates.yml
• test/fixtures/languages.yml
• test/fixtures/organisation_types.yml
• test/fixtures/organisations.yml
• test/fixtures/phases.yml
• test/fixtures/roles.yml
• test/fixtures/sections.yml
• test/fixtures/token_permission_types.yml
• test/fixtures/user_org_roles.yml
• test/fixtures/user_role_types.yml
• test/fixtures/user_statuses.yml
• test/fixtures/user_types.yml
• test/fixtures/users.yml
• test/fixtures/versions.yml
• test/functional/api_projects_controller_test.rb
• test/routing_test.rb
• test/test_helper.rb
• test/unit/dmptemplate_test.rb
• test/unit/guidance_group_test.rb
• test/unit/guidance_test.rb
• test/unit/organisation_test.rb
• test/unit/organisation_type_test.rb
• test/unit/token_permission_type_test.rb
• test/unit/user_org_role_test.rb
• test/unit/user_status_test.rb
• test/unit/user_test.rb
• test/unit/user_type_test.rb

Ignore Space Show notes View .travis.yml

Ignore Space Show notes View Gemfile

Ignore Space Show notes View Gemfile.lock

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

Ignore Space Show notes View app/assets/images/logo_100x100.jpg 0 → 100644

Ignore Space Show notes View app/assets/images/logo_300x300.jpg 0 → 100644

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

Ignore Space Show notes View app/helpers/projects_helper.rb

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

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

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

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

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

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

Ignore Space Show notes View app/views/settings/plans/_export_formatting_form.html.erb

Ignore Space Show notes View app/views/token_permission_types/index.html.erb

Ignore Space Show notes View config/database_example.yml

Ignore Space Show notes View config/initializers/devise.rb

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

Ignore Space Show notes View db/migrate/20161021100420_single_organisation_for_users.rb

Ignore Space Show notes View db/migrate/20161102221313_change_text_description_to_text_description_in_token_permission_types.rb 0 → 100644

Ignore Space Show notes View db/schema.rb

Ignore Space Show notes View db/seeds.rb

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

Ignore Space Show notes View test/assets/logo.jpg 0 → 100644

Ignore Space Show notes View test/assets/logo_100x100.jpg 0 → 100644

Ignore Space Show notes View test/assets/logo_300x300.jpg 0 → 100644

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

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

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

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

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

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

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

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

Show notes View test/fixtures/user_org_roles.yml 100644 → 0

Show notes View test/fixtures/user_role_types.yml 100644 → 0

Show notes View test/fixtures/user_statuses.yml 100644 → 0

Show notes View test/fixtures/user_types.yml 100644 → 0

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

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

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

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

Ignore Space Show notes View test/test_helper.rb

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

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

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

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

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

Ignore Space Show notes View test/unit/token_permission_type_test.rb 0 → 100644

Show notes View test/unit/user_org_role_test.rb 100644 → 0

Show notes View test/unit/user_status_test.rb 100644 → 0

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

Show notes View test/unit/user_type_test.rb 100644 → 0

Show line notes below