Browse code Merge pull request #1 from DMPRoadmap/development Pulled in latest API and I18n work dev
commit b93d2642643232810384a2889f430f6ed33c93df 2 parents 88081bf + 189c22c Brian Riley authored on 22 Jul 2016 GitHub committed on 22 Jul 2016

Showing 81 changed files

• .gitignore
• Gemfile
• Rakefile
• app/admin/org_token_permission.rb
• app/admin/organisation.rb
• app/admin/token_permission_type.rb
• app/admin/user.rb
• app/controllers/api/v0/base_controller.rb
• app/controllers/api/v0/guidance_groups_controller.rb
• app/controllers/api/v0/guidances_controller.rb
• app/controllers/api/v0/projects_controller.rb
• app/controllers/application_controller.rb
• app/controllers/guidances_controller.rb
• app/controllers/organisation_users_controller.rb
• app/controllers/projects_controller.rb
• app/controllers/token_permission_types_controller.rb
• app/controllers/users_controller.rb
• app/mailers/user_mailer.rb
• app/models/dmptemplate.rb
• app/models/guidance.rb
• app/models/guidance_group.rb
• app/models/language.rb
• app/models/organisation.rb
• app/models/plan.rb
• app/models/question.rb
• app/models/token_permission_type.rb
• app/models/user.rb
• app/views/api/v0/guidance_groups/index.json.jbuilder
• app/views/api/v0/guidance_groups/show.json.jbuilder
• app/views/contact_us/contacts/new.html.erb
• app/views/devise/registrations/edit.html.erb
• app/views/dmptemplates/_edit_question.html.erb
• app/views/guidance_groups/admin_edit.html.erb
• app/views/guidance_groups/admin_new.html.erb
• app/views/guidance_groups/admin_show.html.erb
• app/views/guidances/admin_edit.html.erb
• app/views/guidances/admin_new.html.erb
• app/views/layouts/_dmponline_navigation.html.erb
• app/views/organisation_users/admin_index.html.erb
• app/views/plans/export.pdf.erb
• app/views/settings/plans/show.html.erb
• app/views/token_permission_types/index.html.erb
• app/views/user_mailer/api_token_granted_notification.html.erb
• app/views/users/admin_index.html.erb
• config/application.rb
• config/environment/development.rb
• config/initializers/locale.rb
• config/locales/de.bootstrap.yml
• config/locales/de.yml
• config/locales/devise.de.yml
• config/locales/devise.en-UK.yml
• config/locales/devise.en.yml
• config/locales/devise.fr.yml
• config/locales/devise_invitable.de.yml
• config/locales/devise_invitable.en-UK.yml
• config/locales/devise_invitable.en.yml
• config/locales/devise_invitable.fr.yml
• config/locales/en-UK.bootstrap.yml
• config/locales/en-UK.yml
• config/locales/en.bootstrap.yml
• config/locales/en.yml
• config/locales/fr.bootstrap.yml
• config/locales/fr.yml
• config/routes.rb
• db/migrate/20160719102542_remove_depricated_api_structure.rb
• db/migrate/20160719140055_create_languages.rb
• db/schema.rb
• db/seeds.rb
• test/fixtures/dmptemplates_guidance_groups.yml
• test/fixtures/guidance_groups.yml
• test/fixtures/option_warnings.yml
• test/fixtures/options.yml
• test/fixtures/organisations.yml
• test/fixtures/sections.yml
• test/fixtures/user_org_roles.yml
• test/fixtures/users.yml
• test/fixtures/versions.yml
• test/unit/dmptemplate_test.rb
• test/unit/guidance_group_test.rb
• test/unit/guidance_test.rb
• test/unit/organisation_test.rb

Ignore Space Show notes View .gitignore

Ignore Space Show notes View Gemfile

Ignore Space Show notes View Rakefile

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

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

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

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

Ignore Space Show notes View app/controllers/api/v0/base_controller.rb

Ignore Space Show notes View app/controllers/api/v0/guidance_groups_controller.rb

Ignore Space Show notes View app/controllers/api/v0/guidances_controller.rb

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

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

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

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

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

Ignore Space Show notes View app/controllers/token_permission_types_controller.rb 0 → 100644

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

Ignore Space Show notes View app/mailers/user_mailer.rb

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

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

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

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

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

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

Ignore Space Show notes View app/models/question.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/api/v0/guidance_groups/index.json.jbuilder

Ignore Space Show notes View app/views/api/v0/guidance_groups/show.json.jbuilder

Ignore Space Show notes View app/views/contact_us/contacts/new.html.erb

Ignore Space Show notes View app/views/devise/registrations/edit.html.erb

Ignore Space Show notes View app/views/dmptemplates/_edit_question.html.erb

Ignore Space Show notes View app/views/guidance_groups/admin_edit.html.erb

Ignore Space Show notes View app/views/guidance_groups/admin_new.html.erb

Ignore Space Show notes View app/views/guidance_groups/admin_show.html.erb

Ignore Space Show notes View app/views/guidances/admin_edit.html.erb

Ignore Space Show notes View app/views/guidances/admin_new.html.erb

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

Ignore Space Show notes View app/views/organisation_users/admin_index.html.erb

Ignore Space Show notes View app/views/plans/export.pdf.erb

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

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

Ignore Space Show notes View app/views/user_mailer/api_token_granted_notification.html.erb 0 → 100644

Ignore Space Show notes View app/views/users/admin_index.html.erb 0 → 100644

Ignore Space Show notes View config/application.rb

Ignore Space Show notes View config/environment/development.rb

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

Ignore Space Show notes View config/locales/de.bootstrap.yml 0 → 100644

Ignore Space Show notes View config/locales/de.yml 0 → 100644

Ignore Space Show notes View config/locales/devise.de.yml 0 → 100644

Ignore Space Show notes View config/locales/devise.en-UK.yml 0 → 100644

Show notes View config/locales/devise.en.yml 100644 → 0

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

Ignore Space Show notes View config/locales/devise_invitable.de.yml 0 → 100644

Ignore Space Show notes View config/locales/devise_invitable.en-UK.yml 0 → 100644

Show notes View config/locales/devise_invitable.en.yml 100644 → 0

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

Ignore Space Show notes View config/locales/en-UK.bootstrap.yml 0 → 100644

Ignore Space Show notes View config/locales/en-UK.yml 0 → 100644

Show notes View config/locales/en.bootstrap.yml 100644 → 0

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

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

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

Ignore Space Show notes View config/routes.rb

Ignore Space Show notes View db/migrate/20160719102542_remove_depricated_api_structure.rb 0 → 100644

Ignore Space Show notes View db/migrate/20160719140055_create_languages.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/dmptemplates_guidance_groups.yml 0 → 100644

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

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

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

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

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

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

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

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

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

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

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

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

Show line notes below