GitBucket
|
Merge branch 'master' into development
|
|---|
briley
authored
on 10 Nov 2016
|
| .gitignore |
|---|
|
Too large
|
| .travis.yml |
|---|
|
Too large
|
| Gemfile |
|---|
|
Too large
|
| Gemfile.lock |
|---|
|
Too large
|
| README.md |
|---|
|
Too large
|
| app/admin/token_permission_type.rb |
|---|
|
Too large
|
| app/admin/user.rb |
|---|
|
Too large
|
| app/admin/user_org_role.rb 100644 → 0 |
|---|
|
Too large
|
| app/assets/fonts/GillSansLight.ttf 100644 → 0 |
|---|
|
Too large
|
| app/assets/fonts/fontawesome-webfont.woff 100644 → 0 |
|---|
|
Too large
|
| app/assets/images/2013_Jisc_Logo_RGB72.png 100644 → 0 |
|---|
|
Too large
|
| app/assets/images/asc.gif 100644 → 0 |
|---|
|
Too large
|
| app/assets/images/background.jpg 100644 → 0 |
|---|
|
Too large
|
| app/assets/images/bg.gif 100644 → 0 |
|---|
|
Too large
|
| app/assets/images/bournemouth_logo.png 100644 → 0 |
|---|
|
Too large
|
| app/assets/images/dcc_logo.png 100644 → 0 |
|---|
|
Too large
|
| app/assets/images/desc.gif 100644 → 0 |
|---|
|
Too large
|
| app/assets/images/download.png 100644 → 0 |
|---|
|
Too large
|
| app/assets/images/favicon.ico 100644 → 0 |
|---|
|
Too large
|
| app/assets/images/fullscreen.png 100644 → 0 |
|---|
|
Too large
|
| app/assets/images/glyphicons-halflings-white.png 100644 → 0 |
|---|
|
Too large
|
| app/assets/images/glyphicons-halflings.png 100644 → 0 |
|---|
|
Too large
|
| app/assets/images/help_button.png 100644 → 0 |
|---|
|
Too large
|
| app/assets/images/lancaster_logo.png 100644 → 0 |
|---|
|
Too large
|
| app/assets/images/logo.jpg 100644 → 0 |
|---|
|
Too large
|
| app/assets/images/lse-library_logo.png 100644 → 0 |
|---|
|
Too large
|
| app/assets/images/minus_laranja.png 100644 → 0 |
|---|
|
Too large
|
| app/assets/images/newcastle_logo.png 100644 → 0 |
|---|
|
Too large
|
| app/assets/images/plus_laranja.png 100644 → 0 |
|---|
|
Too large
|
| app/assets/images/question-mark.png 100644 → 0 |
|---|
|
Too large
|
| app/assets/images/rails.png 100644 → 0 |
|---|
|
Too large
|
| app/assets/images/salford_logo.png 100644 → 0 |
|---|
|
Too large
|
| app/assets/images/screencast.jpg 100644 → 0 |
|---|
|
Too large
|
| app/assets/images/select2-spinner.gif 100644 → 0 |
|---|
|
Too large
|
| app/assets/images/select2.png 100644 → 0 |
|---|
|
Too large
|
| app/assets/images/select2x2.png 100644 → 0 |
|---|
|
Too large
|
| app/assets/images/uc3_logo.jpg 100644 → 0 |
|---|
|
Too large
|
| app/assets/images/ue_logo.png 100644 → 0 |
|---|
|
Too large
|
| app/assets/javascripts/active_admin.js 100644 → 0 |
|---|
|
Too large
|
| app/assets/javascripts/admin.js 100644 → 0 |
|---|
|
Too large
|
| app/assets/javascripts/application.js 100644 → 0 |
|---|
|
Too large
|
| app/assets/javascripts/bootstrap.min.js 100644 → 0 |
|---|
|
Too large
|
| app/assets/javascripts/export_configure.js 100644 → 0 |
|---|
|
Too large
|
| app/assets/javascripts/jquery.placeholder.js 100644 → 0 |
|---|
|
Too large
|
| app/assets/javascripts/jquery.tablesorter.js 100644 → 0 |
|---|
|
Too large
|
| app/assets/javascripts/jquery.timeago.js 100644 → 0 |
|---|
|
Too large
|
| app/assets/javascripts/plans.js 100644 → 0 |
|---|
|
Too large
|
| app/assets/javascripts/projects.js 100644 → 0 |
|---|
|
Too large
|
| app/assets/javascripts/select2.min.js 100644 → 0 |
|---|
|
Too large
|
| app/assets/javascripts/toolbar.js 100644 → 0 |
|---|
|
Too large
|
| app/assets/javascripts/v1.js 100644 → 0 |
|---|
|
Too large
|
| app/assets/stylesheets/active_admin.scss 100644 → 0 |
|---|
|
Too large
|
| app/assets/stylesheets/admin.css.less 100644 → 0 |
|---|
|
Too large
|
| app/assets/stylesheets/application.css 100644 → 0 |
|---|
|
Too large
|
| app/assets/stylesheets/bootstrap.css 100644 → 0 |
|---|
|
Too large
|
| app/assets/stylesheets/bootstrap_and_overrides.css.less 100644 → 0 |
|---|
|
Too large
|
| app/assets/stylesheets/httpd.conf 100644 → 0 |
|---|
|
Too large
|
| app/assets/stylesheets/select2.css 100644 → 0 |
|---|
|
Too large
|
| app/assets/videos/index.files/html5video/.htaccess 100644 → 0 |
|---|
|
Too large
|
| app/assets/videos/index.files/html5video/flashfox.swf 100644 → 0 |
|---|
|
Too large
|
| app/assets/videos/index.files/html5video/fullscreen.png 100644 → 0 |
|---|
|
Too large
|
| app/assets/videos/index.files/html5video/html5ext.js 100644 → 0 |
|---|
|
Too large
|
| app/assets/videos/index.files/html5video/screencast.jpg 100644 → 0 |
|---|
|
Too large
|
| app/assets/videos/index.files/html5video/screencast.m4v 100644 → 0 |
|---|
|
Too large
|
| app/assets/videos/index.files/html5video/screencast.mp4 100644 → 0 |
|---|
|
Too large
|
| app/assets/videos/index.files/html5video/screencast.ogv 100644 → 0 |
|---|
|
Too large
|
| app/assets/videos/index.files/html5video/screencast.webm 100644 → 0 |
|---|
|
Too large
|
| app/controllers/application_controller.rb |
|---|
|
Too large
|
| app/controllers/dmptemplates_controller.rb |
|---|
|
Too large
|
| app/controllers/organisations_controller.rb |
|---|
|
Too large
|
| app/controllers/passwords_controller.rb |
|---|
|
Too large
|
| app/controllers/plans_controller.rb |
|---|
|
Too large
|
| app/controllers/projects_controller.rb |
|---|
|
Too large
|
| app/controllers/registrations_controller.rb |
|---|
|
Too large
|
| app/controllers/sessions_controller.rb |
|---|
|
Too large
|
| app/controllers/settings/plans_controller.rb |
|---|
|
Too large
|
| app/controllers/settings/projects_controller.rb |
|---|
|
Too large
|
| app/controllers/token_permission_types_controller.rb |
|---|
|
Too large
|
| app/controllers/users_controller.rb |
|---|
|
Too large
|
| app/helpers/plans_helper.rb 100644 → 0 |
|---|
|
Too large
|
| app/helpers/projects_helper.rb 0 → 100644 |
|---|
|
Too large
|
| app/mailers/user_mailer.rb |
|---|
|
Too large
|
| app/models/exported_plan.rb |
|---|
|
Too large
|
| app/models/guidance_group.rb |
|---|
|
Too large
|
| app/models/language.rb |
|---|
|
Too large
|
| app/models/organisation.rb |
|---|
|
Too large
|
| app/models/organisation_type.rb |
|---|
|
Too large
|
| app/models/plan.rb |
|---|
|
Too large
|
| app/models/token_permission_type.rb |
|---|
|
Too large
|
| app/models/user.rb |
|---|
|
Too large
|
| app/policies/guidance_group_policy.rb |
|---|
|
Too large
|
| app/policies/organisation_policy.rb |
|---|
|
Too large
|
| app/views/devise/registrations/edit.html.erb |
|---|
|
Too large
|
| app/views/dmptemplates/_guidance_display.html.erb |
|---|
|
Too large
|
| app/views/dmptemplates/_versions_table.html.erb |
|---|
|
Too large
|
| app/views/dmptemplates/admin_phase.html.erb |
|---|
|
Too large
|
| app/views/guidances/admin_index.html.erb |
|---|
|
Too large
|
| app/views/guidances/admin_new.html.erb |
|---|
|
Too large
|
| app/views/layouts/_branding.html.erb 0 → 100644 |
|---|
|
Too large
|
| app/views/layouts/_dmponline_footer.html.erb 100644 → 0 |
|---|
|
Too large
|
| app/views/layouts/_dmponline_header.html.erb 100644 → 0 |
|---|
|
Too large
|
| app/views/layouts/_dmponline_navigation.html.erb 100644 → 0 |
|---|
|
Too large
|
| app/views/layouts/_dmponline_org_branding.html.erb 100644 → 0 |
|---|
|
Too large
|
| app/views/layouts/_dmponline_signin_signout.html.erb 100644 → 0 |
|---|
|
Too large
|
| app/views/layouts/_footer.html.erb 0 → 100644 |
|---|
|
Too large
|
| app/views/layouts/_header.html.erb 0 → 100644 |
|---|
|
Too large
|
| app/views/layouts/_navigation.html.erb 0 → 100644 |
|---|
|
Too large
|
| app/views/layouts/_signin_signout.html.erb 0 → 100644 |
|---|
|
Too large
|
| app/views/layouts/application.html.erb |
|---|
|
Too large
|
| app/views/organisations/admin_edit.html.erb |
|---|
|
Too large
|
| app/views/plans/_answer_form.html.erb |
|---|
|
Too large
|
| app/views/plans/_comments.html.erb |
|---|
|
Too large
|
| app/views/projects/_project_list_head.html.erb |
|---|
|
Too large
|
| app/views/projects/_project_list_item.html.erb |
|---|
|
Too large
|
| app/views/projects/new.html.erb |
|---|
|
Too large
|
| app/views/projects/share.html.erb |
|---|
|
Too large
|
| app/views/settings/plans/_export_formatting_form.html.erb |
|---|
|
Too large
|
| app/views/shared/_export_links.html.erb |
|---|
|
Too large
|
| app/views/shared/_register_form.html.erb |
|---|
|
Too large
|
| app/views/static_pages/help.html.erb |
|---|
|
Too large
|
| app/views/token_permission_types/index.html.erb |
|---|
|
Too large
|
| app/views/user_mailer/permissions_change_notification.html.erb |
|---|
|
Too large
|
| app/views/user_mailer/sharing_notification.html.erb |
|---|
|
Too large
|
| app/views/users/admin_grant_permissions.html.erb |
|---|
|
Too large
|
| app/views/users/admin_index.html.erb |
|---|
|
Too large
|
| config/application.rb |
|---|
|
Too large
|
| config/branding.yml |
|---|
|
Too large
|
| config/database_example.yml |
|---|
|
Too large
|
| config/environments/development.rb |
|---|
|
Too large
|
| config/environments/production.rb |
|---|
|
Too large
|
| config/initializers/devise.rb |
|---|
|
Too large
|
| config/initializers/devise.rb.example 0 → 100644 |
|---|
|
Too large
|
| config/initializers/devise_example.rb 100644 → 0 |
|---|
|
Too large
|
| config/initializers/locale.rb |
|---|
|
Too large
|
| config/initializers/recaptcha.rb.example 0 → 100644 |
|---|
|
Too large
|
| config/initializers/recaptcha_example.rb 100644 → 0 |
|---|
|
Too large
|
| config/initializers/wicked_pdf_example.rb 0 → 100644 |
|---|
|
Too large
|
| config/locales/de.yml |
|---|
|
Too large
|
| config/locales/en-UK.yml |
|---|
|
Too large
|
| config/locales/en-US.yml |
|---|
|
Too large
|
| config/locales/fr.yml |
|---|
|
Too large
|
| config/locales/static_pages/de.static.yml.example 0 → 100644 |
|---|
|
Too large
|
| config/locales/static_pages/en-UK.static.yml.example 0 → 100644 |
|---|
|
Too large
|
| config/locales/static_pages/en-US.static.yml.example 0 → 100644 |
|---|
|
Too large
|
| config/locales/static_pages/fr.static.yml.example 0 → 100644 |
|---|
|
Too large
|
| config/locales/untitled.txt 100644 → 0 |
|---|
|
Too large
|
| db/migrate/20161021100420_single_organisation_for_users.rb 0 → 100644 |
|---|
|
Too large
|
| db/migrate/20161102221313_change_text_description_to_text_description_in_token_permission_types.rb 0 → 100644 |
|---|
|
Too large
|
| db/schema.rb |
|---|
|
Too large
|
| db/seeds.rb |
|---|
|
Too large
|
| lib/assets/fonts/GillSansLight.ttf 0 → 100644 |
|---|
|
Too large
|
| lib/assets/fonts/fontawesome-webfont.woff 0 → 100644 |
|---|
|
Too large
|
| lib/assets/images/2013_Jisc_Logo_RGB72.png 0 → 100644 |
|---|
|
Too large
|
| lib/assets/images/asc.gif 0 → 100644 |
|---|
|
Too large
|
| lib/assets/images/background.jpg 0 → 100644 |
|---|
|
Too large
|
| lib/assets/images/bg.gif 0 → 100644 |
|---|
|
Too large
|
| lib/assets/images/bournemouth_logo.png 0 → 100644 |
|---|
|
Too large
|
| lib/assets/images/dcc_logo.png 0 → 100644 |
|---|
|
Too large
|
| lib/assets/images/desc.gif 0 → 100644 |
|---|
|
Too large
|
| lib/assets/images/download.png 0 → 100644 |
|---|
|
Too large
|
| lib/assets/images/favicon.ico 0 → 100644 |
|---|
|
Too large
|
| lib/assets/images/fullscreen.png 0 → 100644 |
|---|
|
Too large
|
| lib/assets/images/glyphicons-halflings-white.png 0 → 100644 |
|---|
|
Too large
|
| lib/assets/images/glyphicons-halflings.png 0 → 100644 |
|---|
|
Too large
|
| lib/assets/images/help_button.png 0 → 100644 |
|---|
|
Too large
|
| lib/assets/images/lancaster_logo.png 0 → 100644 |
|---|
|
Too large
|
| lib/assets/images/logo.jpg 0 → 100644 |
|---|
|
Too large
|
| lib/assets/images/logo_100x100.jpg 0 → 100644 |
|---|
|
Too large
|
| lib/assets/images/logo_300x300.jpg 0 → 100644 |
|---|
|
Too large
|
| lib/assets/images/lse-library_logo.png 0 → 100644 |
|---|
|
Too large
|
| lib/assets/images/minus_laranja.png 0 → 100644 |
|---|
|
Too large
|
| lib/assets/images/newcastle_logo.png 0 → 100644 |
|---|
|
Too large
|
| lib/assets/images/plus_laranja.png 0 → 100644 |
|---|
|
Too large
|
| lib/assets/images/question-mark.png 0 → 100644 |
|---|
|
Too large
|
| lib/assets/images/rails.png 0 → 100644 |
|---|
|
Too large
|
| lib/assets/images/salford_logo.png 0 → 100644 |
|---|
|
Too large
|
| lib/assets/images/screencast.jpg 0 → 100644 |
|---|
|
Too large
|
| lib/assets/images/select2-spinner.gif 0 → 100644 |
|---|
|
Too large
|
| lib/assets/images/select2.png 0 → 100644 |
|---|
|
Too large
|
| lib/assets/images/select2x2.png 0 → 100644 |
|---|
|
Too large
|
| lib/assets/images/uc3_logo.jpg 0 → 100644 |
|---|
|
Too large
|
| lib/assets/images/ue_logo.png 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/active_admin.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/admin.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/application.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/bootstrap.min.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/export_configure.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/jquery.placeholder.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/jquery.tablesorter.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/jquery.timeago.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/plans.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/projects.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/select2.min.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/toolbar.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/v1.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/stylesheets/active_admin.scss 0 → 100644 |
|---|
|
Too large
|
| lib/assets/stylesheets/admin.css.less 0 → 100644 |
|---|
|
Too large
|
| lib/assets/stylesheets/application.css 0 → 100644 |
|---|
|
Too large
|
| lib/assets/stylesheets/bootstrap.css 0 → 100644 |
|---|
|
Too large
|
| lib/assets/stylesheets/bootstrap_and_overrides.css.less 0 → 100644 |
|---|
|
Too large
|
| lib/assets/stylesheets/httpd.conf 0 → 100644 |
|---|
|
Too large
|
| lib/assets/stylesheets/select2.css 0 → 100644 |
|---|
|
Too large
|
| lib/assets/videos/index.files/html5video/.htaccess 0 → 100644 |
|---|
|
Too large
|
| lib/assets/videos/index.files/html5video/flashfox.swf 0 → 100644 |
|---|
|
Too large
|
| lib/assets/videos/index.files/html5video/fullscreen.png 0 → 100644 |
|---|
|
Too large
|
| lib/assets/videos/index.files/html5video/html5ext.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/videos/index.files/html5video/screencast.jpg 0 → 100644 |
|---|
|
Too large
|
| lib/assets/videos/index.files/html5video/screencast.m4v 0 → 100644 |
|---|
|
Too large
|
| lib/assets/videos/index.files/html5video/screencast.mp4 0 → 100644 |
|---|
|
Too large
|
| lib/assets/videos/index.files/html5video/screencast.ogv 0 → 100644 |
|---|
|
Too large
|
| lib/assets/videos/index.files/html5video/screencast.webm 0 → 100644 |
|---|
|
Too large
|
| lib/custom_failure.rb |
|---|
|
Too large
|
| lib/tasks/migrate.rake 0 → 100644 |
|---|
|
Too large
|
| public/files/DMP_Checklist_2013.pdf 0 → 100644 |
|---|
|
Too large
|
| public/files/roadmap_logo.png 0 → 100644 |
|---|
|
Too large
|
| public/files/roadmap_logo.svg 0 → 100644 |
|---|
|
Too large
|
| test/assets/logo.jpg 0 → 100644 |
|---|
|
Too large
|
| test/assets/logo_100x100.jpg 0 → 100644 |
|---|
|
Too large
|
| test/assets/logo_300x300.jpg 0 → 100644 |
|---|
|
Too large
|
| test/fixtures/dmptemplates.yml |
|---|
|
Too large
|
| test/fixtures/languages.yml 0 → 100644 |
|---|
|
Too large
|
| test/fixtures/organisation_types.yml |
|---|
|
Too large
|
| test/fixtures/organisations.yml |
|---|
|
Too large
|
| test/fixtures/phases.yml |
|---|
|
Too large
|
| test/fixtures/roles.yml |
|---|
|
Too large
|
| test/fixtures/sections.yml |
|---|
|
Too large
|
| test/fixtures/token_permission_types.yml 0 → 100644 |
|---|
|
Too large
|
| test/fixtures/user_org_roles.yml 100644 → 0 |
|---|
|
Too large
|
| test/fixtures/user_role_types.yml 100644 → 0 |
|---|
|
Too large
|
| test/fixtures/user_statuses.yml 100644 → 0 |
|---|
|
Too large
|
| test/fixtures/user_types.yml 100644 → 0 |
|---|
|
Too large
|
| test/fixtures/users.yml |
|---|
|
Too large
|
| test/fixtures/versions.yml |
|---|
|
Too large
|
| test/functional/api_projects_controller_test.rb |
|---|
|
Too large
|
| test/routing_test.rb 0 → 100644 |
|---|
|
Too large
|
| test/test_helper.rb |
|---|
|
Too large
|
| test/unit/dmptemplate_test.rb |
|---|
|
Too large
|
| test/unit/guidance_group_test.rb |
|---|
|
Too large
|
| test/unit/guidance_test.rb |
|---|
|
Too large
|
| test/unit/organisation_test.rb |
|---|
|
Too large
|
| test/unit/organisation_type_test.rb |
|---|
|
Too large
|
| test/unit/token_permission_type_test.rb 0 → 100644 |
|---|
|
Too large
|
| test/unit/user_org_role_test.rb 100644 → 0 |
|---|
|
Too large
|
| test/unit/user_status_test.rb 100644 → 0 |
|---|
|
Too large
|
| test/unit/user_test.rb |
|---|
|
Too large
|
| test/unit/user_type_test.rb 100644 → 0 |
|---|
|
Too large
|