Browse code Merge branch 'master' into add-orcid-functionality dev
commit 5f2a31c6bba5a7cebf0fbac3d82943542300d69f 2 parents 8d4fa3f + b40a02c briley authored on 8 Nov 2016

Showing 149 changed files

• .gitignore
• app/assets/fonts/GillSansLight.ttf
• app/assets/fonts/fontawesome-webfont.woff
• app/assets/images/2013_Jisc_Logo_RGB72.png
• app/assets/images/asc.gif
• app/assets/images/background.jpg
• app/assets/images/bg.gif
• app/assets/images/bournemouth_logo.png
• app/assets/images/dcc_logo.png
• app/assets/images/desc.gif
• app/assets/images/download.png
• app/assets/images/favicon.ico
• app/assets/images/fullscreen.png
• app/assets/images/glyphicons-halflings-white.png
• app/assets/images/glyphicons-halflings.png
• app/assets/images/help_button.png
• app/assets/images/lancaster_logo.png
• app/assets/images/logo.jpg
• app/assets/images/logo_100x100.jpg
• app/assets/images/logo_300x300.jpg
• app/assets/images/lse-library_logo.png
• app/assets/images/minus_laranja.png
• app/assets/images/newcastle_logo.png
• app/assets/images/plus_laranja.png
• app/assets/images/question-mark.png
• app/assets/images/rails.png
• app/assets/images/salford_logo.png
• app/assets/images/screencast.jpg
• app/assets/images/select2-spinner.gif
• app/assets/images/select2.png
• app/assets/images/select2x2.png
• app/assets/images/uc3_logo.jpg
• app/assets/images/ue_logo.png
• app/assets/javascripts/active_admin.js
• app/assets/javascripts/admin.js
• app/assets/javascripts/application.js
• app/assets/javascripts/bootstrap.min.js
• app/assets/javascripts/export_configure.js
• app/assets/javascripts/jquery.placeholder.js
• app/assets/javascripts/jquery.tablesorter.js
• app/assets/javascripts/jquery.timeago.js
• app/assets/javascripts/plans.js
• app/assets/javascripts/projects.js
• app/assets/javascripts/select2.min.js
• app/assets/javascripts/toolbar.js
• app/assets/javascripts/v1.js
• app/assets/stylesheets/active_admin.scss
• app/assets/stylesheets/admin.css.less
• app/assets/stylesheets/application.css
• app/assets/stylesheets/bootstrap.css
• app/assets/stylesheets/bootstrap_and_overrides.css.less
• app/assets/stylesheets/httpd.conf
• app/assets/stylesheets/select2.css
• app/assets/videos/index.files/html5video/.htaccess
• app/assets/videos/index.files/html5video/flashfox.swf
• app/assets/videos/index.files/html5video/fullscreen.png
• app/assets/videos/index.files/html5video/html5ext.js
• app/assets/videos/index.files/html5video/screencast.jpg
• app/assets/videos/index.files/html5video/screencast.m4v
• app/assets/videos/index.files/html5video/screencast.mp4
• app/assets/videos/index.files/html5video/screencast.ogv
• app/assets/videos/index.files/html5video/screencast.webm
• app/controllers/application_controller.rb
• app/views/layouts/_branding.html.erb
• app/views/layouts/_dmponline_footer.html.erb
• app/views/layouts/_dmponline_header.html.erb
• app/views/layouts/_dmponline_navigation.html.erb
• app/views/layouts/_dmponline_org_branding.html.erb
• app/views/layouts/_dmponline_signin_signout.html.erb
• app/views/layouts/_footer.html.erb
• app/views/layouts/_header.html.erb
• app/views/layouts/_navigation.html.erb
• app/views/layouts/_signin_signout.html.erb
• app/views/layouts/application.html.erb
• config/application.rb
• config/branding.yml
• config/environments/development.rb
• config/environments/production.rb
• config/initializers/locale.rb
• config/locales/de.yml
• config/locales/en-UK.yml
• config/locales/en-US.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/locales/untitled.txt
• lib/assets/fonts/GillSansLight.ttf
• lib/assets/fonts/fontawesome-webfont.woff
• lib/assets/images/2013_Jisc_Logo_RGB72.png
• lib/assets/images/asc.gif
• lib/assets/images/background.jpg
• lib/assets/images/bg.gif
• lib/assets/images/bournemouth_logo.png
• lib/assets/images/dcc_logo.png
• lib/assets/images/desc.gif
• lib/assets/images/download.png
• lib/assets/images/favicon.ico
• lib/assets/images/fullscreen.png
• lib/assets/images/glyphicons-halflings-white.png
• lib/assets/images/glyphicons-halflings.png
• lib/assets/images/help_button.png
• lib/assets/images/lancaster_logo.png
• lib/assets/images/logo.jpg
• lib/assets/images/logo_100x100.jpg
• lib/assets/images/logo_300x300.jpg
• lib/assets/images/lse-library_logo.png
• lib/assets/images/minus_laranja.png
• lib/assets/images/newcastle_logo.png
• lib/assets/images/plus_laranja.png
• lib/assets/images/question-mark.png
• lib/assets/images/rails.png
• lib/assets/images/salford_logo.png
• lib/assets/images/screencast.jpg
• lib/assets/images/select2-spinner.gif
• lib/assets/images/select2.png
• lib/assets/images/select2x2.png
• lib/assets/images/uc3_logo.jpg
• lib/assets/images/ue_logo.png
• lib/assets/javascripts/active_admin.js
• lib/assets/javascripts/admin.js
• lib/assets/javascripts/application.js
• lib/assets/javascripts/bootstrap.min.js
• lib/assets/javascripts/export_configure.js
• lib/assets/javascripts/jquery.placeholder.js
• lib/assets/javascripts/jquery.tablesorter.js
• lib/assets/javascripts/jquery.timeago.js
• lib/assets/javascripts/plans.js
• lib/assets/javascripts/projects.js
• lib/assets/javascripts/select2.min.js
• lib/assets/javascripts/toolbar.js
• lib/assets/javascripts/v1.js
• lib/assets/stylesheets/active_admin.scss
• lib/assets/stylesheets/admin.css.less
• lib/assets/stylesheets/application.css
• lib/assets/stylesheets/bootstrap.css
• lib/assets/stylesheets/bootstrap_and_overrides.css.less
• lib/assets/stylesheets/httpd.conf
• lib/assets/stylesheets/select2.css
• lib/assets/videos/index.files/html5video/.htaccess
• lib/assets/videos/index.files/html5video/flashfox.swf
• lib/assets/videos/index.files/html5video/fullscreen.png
• lib/assets/videos/index.files/html5video/html5ext.js
• lib/assets/videos/index.files/html5video/screencast.jpg
• lib/assets/videos/index.files/html5video/screencast.m4v
• lib/assets/videos/index.files/html5video/screencast.mp4
• lib/assets/videos/index.files/html5video/screencast.ogv
• lib/assets/videos/index.files/html5video/screencast.webm

Ignore Space Show notes View .gitignore
Too large

Show notes View app/assets/fonts/GillSansLight.ttf 100644 → 0
Too large

Show notes View app/assets/fonts/fontawesome-webfont.woff 100644 → 0
Too large

Show notes View app/assets/images/2013_Jisc_Logo_RGB72.png 100644 → 0
Too large

Show notes View app/assets/images/asc.gif 100644 → 0
Too large

Show notes View app/assets/images/background.jpg 100644 → 0
Too large

Show notes View app/assets/images/bg.gif 100644 → 0
Too large

Show notes View app/assets/images/bournemouth_logo.png 100644 → 0
Too large

Show notes View app/assets/images/dcc_logo.png 100644 → 0
Too large

Show notes View app/assets/images/desc.gif 100644 → 0
Too large

Show notes View app/assets/images/download.png 100644 → 0
Too large

Show notes View app/assets/images/favicon.ico 100644 → 0
Too large

Show notes View app/assets/images/fullscreen.png 100644 → 0
Too large

Show notes View app/assets/images/glyphicons-halflings-white.png 100644 → 0
Too large

Show notes View app/assets/images/glyphicons-halflings.png 100644 → 0
Too large

Show notes View app/assets/images/help_button.png 100644 → 0
Too large

Show notes View app/assets/images/lancaster_logo.png 100644 → 0
Too large

Show notes View app/assets/images/logo.jpg 100644 → 0
Too large

Show notes View app/assets/images/logo_100x100.jpg 100644 → 0
Too large

Show notes View app/assets/images/logo_300x300.jpg 100644 → 0
Too large

Show notes View app/assets/images/lse-library_logo.png 100644 → 0
Too large

Show notes View app/assets/images/minus_laranja.png 100644 → 0
Too large

Show notes View app/assets/images/newcastle_logo.png 100644 → 0
Too large

Show notes View app/assets/images/plus_laranja.png 100644 → 0
Too large

Show notes View app/assets/images/question-mark.png 100644 → 0
Too large

Show notes View app/assets/images/rails.png 100644 → 0
Too large

Show notes View app/assets/images/salford_logo.png 100644 → 0
Too large

Show notes View app/assets/images/screencast.jpg 100644 → 0
Too large

Show notes View app/assets/images/select2-spinner.gif 100644 → 0
Too large

Show notes View app/assets/images/select2.png 100644 → 0
Too large

Show notes View app/assets/images/select2x2.png 100644 → 0
Too large

Show notes View app/assets/images/uc3_logo.jpg 100644 → 0
Too large

Show notes View app/assets/images/ue_logo.png 100644 → 0
Too large

Show notes View app/assets/javascripts/active_admin.js 100644 → 0
Too large

Show notes View app/assets/javascripts/admin.js 100644 → 0
Too large

Show notes View app/assets/javascripts/application.js 100644 → 0
Too large

Show notes View app/assets/javascripts/bootstrap.min.js 100644 → 0
Too large

Show notes View app/assets/javascripts/export_configure.js 100644 → 0
Too large

Show notes View app/assets/javascripts/jquery.placeholder.js 100644 → 0
Too large

Show notes View app/assets/javascripts/jquery.tablesorter.js 100644 → 0
Too large

Show notes View app/assets/javascripts/jquery.timeago.js 100644 → 0
Too large

Show notes View app/assets/javascripts/plans.js 100644 → 0
Too large

Show notes View app/assets/javascripts/projects.js 100644 → 0
Too large

Show notes View app/assets/javascripts/select2.min.js 100644 → 0
Too large

Show notes View app/assets/javascripts/toolbar.js 100644 → 0
Too large

Show notes View app/assets/javascripts/v1.js 100644 → 0
Too large

Show notes View app/assets/stylesheets/active_admin.scss 100644 → 0
Too large

Show notes View app/assets/stylesheets/admin.css.less 100644 → 0
Too large

Show notes View app/assets/stylesheets/application.css 100644 → 0
Too large

Show notes View app/assets/stylesheets/bootstrap.css 100644 → 0
Too large

Show notes View app/assets/stylesheets/bootstrap_and_overrides.css.less 100644 → 0
Too large

Show notes View app/assets/stylesheets/httpd.conf 100644 → 0
Too large

Show notes View app/assets/stylesheets/select2.css 100644 → 0
Too large

Show notes View app/assets/videos/index.files/html5video/.htaccess 100644 → 0
Too large

Show notes View app/assets/videos/index.files/html5video/flashfox.swf 100644 → 0
Too large

Show notes View app/assets/videos/index.files/html5video/fullscreen.png 100644 → 0
Too large

Show notes View app/assets/videos/index.files/html5video/html5ext.js 100644 → 0
Too large

Show notes View app/assets/videos/index.files/html5video/screencast.jpg 100644 → 0
Too large

Show notes View app/assets/videos/index.files/html5video/screencast.m4v 100644 → 0
Too large

Show notes View app/assets/videos/index.files/html5video/screencast.mp4 100644 → 0
Too large

Show notes View app/assets/videos/index.files/html5video/screencast.ogv 100644 → 0
Too large

Show notes View app/assets/videos/index.files/html5video/screencast.webm 100644 → 0
Too large

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

Ignore Space Show notes View app/views/layouts/_branding.html.erb 0 → 100644
Too large

Show notes View app/views/layouts/_dmponline_footer.html.erb 100644 → 0
Too large

Show notes View app/views/layouts/_dmponline_header.html.erb 100644 → 0
Too large

Show notes View app/views/layouts/_dmponline_navigation.html.erb 100644 → 0
Too large

Show notes View app/views/layouts/_dmponline_org_branding.html.erb 100644 → 0
Too large

Show notes View app/views/layouts/_dmponline_signin_signout.html.erb 100644 → 0
Too large

Ignore Space Show notes View app/views/layouts/_footer.html.erb 0 → 100644
Too large

Ignore Space Show notes View app/views/layouts/_header.html.erb 0 → 100644
Too large

Ignore Space Show notes View app/views/layouts/_navigation.html.erb 0 → 100644
Too large

Ignore Space Show notes View app/views/layouts/_signin_signout.html.erb 0 → 100644
Too large

Ignore Space Show notes View app/views/layouts/application.html.erb
Too large

Ignore Space Show notes View config/application.rb
Too large

Ignore Space Show notes View config/branding.yml
Too large

Ignore Space Show notes View config/environments/development.rb
Too large

Ignore Space Show notes View config/environments/production.rb
Too large

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

Ignore Space Show notes View config/locales/de.yml
Too large

Ignore Space Show notes View config/locales/en-UK.yml
Too large

Ignore Space Show notes View config/locales/en-US.yml
Too large

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

Ignore Space Show notes View config/locales/static_pages/de.static.yml.example 0 → 100644
Too large

Ignore Space Show notes View config/locales/static_pages/en-UK.static.yml.example 0 → 100644
Too large

Ignore Space Show notes View config/locales/static_pages/en-US.static.yml.example 0 → 100644
Too large

Ignore Space Show notes View config/locales/static_pages/fr.static.yml.example 0 → 100644
Too large

Show notes View config/locales/untitled.txt 100644 → 0
Too large

Ignore Space Show notes View lib/assets/fonts/GillSansLight.ttf 0 → 100644
Too large

Ignore Space Show notes View lib/assets/fonts/fontawesome-webfont.woff 0 → 100644
Too large

Ignore Space Show notes View lib/assets/images/2013_Jisc_Logo_RGB72.png 0 → 100644
Too large

Ignore Space Show notes View lib/assets/images/asc.gif 0 → 100644
Too large

Ignore Space Show notes View lib/assets/images/background.jpg 0 → 100644
Too large

Ignore Space Show notes View lib/assets/images/bg.gif 0 → 100644
Too large

Ignore Space Show notes View lib/assets/images/bournemouth_logo.png 0 → 100644
Too large

Ignore Space Show notes View lib/assets/images/dcc_logo.png 0 → 100644
Too large

Ignore Space Show notes View lib/assets/images/desc.gif 0 → 100644
Too large

Ignore Space Show notes View lib/assets/images/download.png 0 → 100644
Too large

Ignore Space Show notes View lib/assets/images/favicon.ico 0 → 100644
Too large

Ignore Space Show notes View lib/assets/images/fullscreen.png 0 → 100644
Too large

Ignore Space Show notes View lib/assets/images/glyphicons-halflings-white.png 0 → 100644
Too large

Ignore Space Show notes View lib/assets/images/glyphicons-halflings.png 0 → 100644
Too large

Ignore Space Show notes View lib/assets/images/help_button.png 0 → 100644
Too large

Ignore Space Show notes View lib/assets/images/lancaster_logo.png 0 → 100644
Too large

Ignore Space Show notes View lib/assets/images/logo.jpg 0 → 100644
Too large

Ignore Space Show notes View lib/assets/images/logo_100x100.jpg 0 → 100644
Too large

Ignore Space Show notes View lib/assets/images/logo_300x300.jpg 0 → 100644
Too large

Ignore Space Show notes View lib/assets/images/lse-library_logo.png 0 → 100644
Too large

Ignore Space Show notes View lib/assets/images/minus_laranja.png 0 → 100644
Too large

Ignore Space Show notes View lib/assets/images/newcastle_logo.png 0 → 100644
Too large

Ignore Space Show notes View lib/assets/images/plus_laranja.png 0 → 100644
Too large

Ignore Space Show notes View lib/assets/images/question-mark.png 0 → 100644
Too large

Ignore Space Show notes View lib/assets/images/rails.png 0 → 100644
Too large

Ignore Space Show notes View lib/assets/images/salford_logo.png 0 → 100644
Too large

Ignore Space Show notes View lib/assets/images/screencast.jpg 0 → 100644
Too large

Ignore Space Show notes View lib/assets/images/select2-spinner.gif 0 → 100644
Too large

Ignore Space Show notes View lib/assets/images/select2.png 0 → 100644
Too large

Ignore Space Show notes View lib/assets/images/select2x2.png 0 → 100644
Too large

Ignore Space Show notes View lib/assets/images/uc3_logo.jpg 0 → 100644
Too large

Ignore Space Show notes View lib/assets/images/ue_logo.png 0 → 100644
Too large

Ignore Space Show notes View lib/assets/javascripts/active_admin.js 0 → 100644
Too large

Ignore Space Show notes View lib/assets/javascripts/admin.js 0 → 100644
Too large

Ignore Space Show notes View lib/assets/javascripts/application.js 0 → 100644
Too large

Ignore Space Show notes View lib/assets/javascripts/bootstrap.min.js 0 → 100644
Too large

Ignore Space Show notes View lib/assets/javascripts/export_configure.js 0 → 100644
Too large

Ignore Space Show notes View lib/assets/javascripts/jquery.placeholder.js 0 → 100644
Too large

Ignore Space Show notes View lib/assets/javascripts/jquery.tablesorter.js 0 → 100644
Too large

Ignore Space Show notes View lib/assets/javascripts/jquery.timeago.js 0 → 100644
Too large

Ignore Space Show notes View lib/assets/javascripts/plans.js 0 → 100644
Too large

Ignore Space Show notes View lib/assets/javascripts/projects.js 0 → 100644
Too large

Ignore Space Show notes View lib/assets/javascripts/select2.min.js 0 → 100644
Too large

Ignore Space Show notes View lib/assets/javascripts/toolbar.js 0 → 100644
Too large

Ignore Space Show notes View lib/assets/javascripts/v1.js 0 → 100644
Too large

Ignore Space Show notes View lib/assets/stylesheets/active_admin.scss 0 → 100644
Too large

Ignore Space Show notes View lib/assets/stylesheets/admin.css.less 0 → 100644
Too large

Ignore Space Show notes View lib/assets/stylesheets/application.css 0 → 100644
Too large

Ignore Space Show notes View lib/assets/stylesheets/bootstrap.css 0 → 100644
Too large

Ignore Space Show notes View lib/assets/stylesheets/bootstrap_and_overrides.css.less 0 → 100644
Too large

Ignore Space Show notes View lib/assets/stylesheets/httpd.conf 0 → 100644
Too large

Ignore Space Show notes View lib/assets/stylesheets/select2.css 0 → 100644
Too large

Ignore Space Show notes View lib/assets/videos/index.files/html5video/.htaccess 0 → 100644
Too large

Ignore Space Show notes View lib/assets/videos/index.files/html5video/flashfox.swf 0 → 100644
Too large

Ignore Space Show notes View lib/assets/videos/index.files/html5video/fullscreen.png 0 → 100644
Too large

Ignore Space Show notes View lib/assets/videos/index.files/html5video/html5ext.js 0 → 100644
Too large

Ignore Space Show notes View lib/assets/videos/index.files/html5video/screencast.jpg 0 → 100644
Too large

Ignore Space Show notes View lib/assets/videos/index.files/html5video/screencast.m4v 0 → 100644
Too large

Ignore Space Show notes View lib/assets/videos/index.files/html5video/screencast.mp4 0 → 100644
Too large

Ignore Space Show notes View lib/assets/videos/index.files/html5video/screencast.ogv 0 → 100644
Too large

Ignore Space Show notes View lib/assets/videos/index.files/html5video/screencast.webm 0 → 100644
Too large

Show line notes below