GitBucket
|
Merge branch 'development' of https://github.com/DMPRoadmap/roadmap
Lots of merge conflicts so I had to go through and manually fix them Hopefully have not missed any conflicts nor destroyed any work done by somebody Most of the conflicts were on account of changes to branding in files, but others were content changed on both forks New Gem requires ruby 2.2.2 (contact_us) |
|---|
xsrust
authored
on 11 Aug 2016
|
| .gitignore |
|---|
| Gemfile |
|---|
| Gemfile.lock 100644 → 0 |
|---|
| Rakefile |
|---|
| app/admin/dashboard.rb |
|---|
| app/admin/dmptemplate.rb |
|---|
| app/admin/guidance.rb |
|---|
| app/admin/guidance_group.rb |
|---|
| app/admin/option.rb |
|---|
| app/admin/organisation.rb |
|---|
| app/admin/organisation_type.rb |
|---|
| app/admin/phase.rb |
|---|
| app/admin/project.rb |
|---|
| app/admin/project_group.rb |
|---|
| app/admin/question.rb |
|---|
| app/admin/question_format.rb |
|---|
| app/admin/role.rb |
|---|
| app/admin/section.rb |
|---|
| app/admin/suggested_answer.rb |
|---|
| app/admin/theme.rb |
|---|
| app/admin/user.rb |
|---|
| app/admin/user_org_role.rb |
|---|
| app/admin/user_role_type.rb |
|---|
| app/admin/user_status.rb |
|---|
| app/admin/user_type.rb |
|---|
| app/admin/version.rb |
|---|
| app/assets/images/logo.jpg |
|---|
|
|
| app/assets/images/uc3_logo.jpg 0 → 100644 |
|---|
|
|
| app/assets/javascripts/admin.js |
|---|
| app/assets/stylesheets/admin.css.less |
|---|
| app/assets/stylesheets/bootstrap_and_overrides.css.less |
|---|
| app/controllers/api/v0/projects_controller.rb |
|---|
| app/controllers/dmptemplates_controller.rb |
|---|
| app/models/guidance.rb |
|---|
| app/models/phase.rb |
|---|
| app/views/contact_us/contacts/new.html.erb |
|---|
| app/views/dmptemplates/_add_question.html.erb |
|---|
| app/views/dmptemplates/_edit_question.html.erb |
|---|
| app/views/dmptemplates/_edit_section.html.erb |
|---|
| app/views/dmptemplates/_show_question.html.erb |
|---|
| app/views/home/index.html.erb |
|---|
| app/views/layouts/_dmponline_footer.html.erb |
|---|
| app/views/layouts/application.html.erb |
|---|
| app/views/plans/_answer_form.html.erb |
|---|
| app/views/static_pages/about_us.html.erb |
|---|
| app/views/static_pages/help.html.erb |
|---|
| app/views/static_pages/roadmap.html.erb |
|---|
| app/views/static_pages/termsuse.html.erb |
|---|
| config.ru |
|---|
| config/application.rb |
|---|
| config/branding.yml 0 → 100644 |
|---|
| config/environments/development.rb |
|---|
| config/environments/production.rb 0 → 100644 |
|---|
| config/environments/test.rb |
|---|
| config/initializers/active_admin.rb |
|---|
| config/initializers/contact_us.rb 0 → 100644 |
|---|
| config/initializers/devise.rb |
|---|
| config/initializers/locale.rb |
|---|
| config/locales/bootstrap/de.bootstrap.yml 0 → 100644 |
|---|
| config/locales/bootstrap/en-UK.bootstrap.yml 0 → 100644 |
|---|
| config/locales/bootstrap/en-US.bootstrap.yml 0 → 100644 |
|---|
| config/locales/bootstrap/fr.bootstrap.yml 0 → 100644 |
|---|
| config/locales/contact_us/contact_us.de.yml 0 → 100644 |
|---|
| config/locales/contact_us/contact_us.el.yml 0 → 100644 |
|---|
| config/locales/contact_us/contact_us.en-UK.yml 0 → 100644 |
|---|
| config/locales/contact_us/contact_us.en-US.yml 0 → 100644 |
|---|
| config/locales/contact_us/contact_us.es.yml 0 → 100644 |
|---|
| config/locales/contact_us/contact_us.fr.yml 0 → 100644 |
|---|
| config/locales/contact_us/contact_us.he.yml 0 → 100644 |
|---|
| config/locales/contact_us/contact_us.it.yml 0 → 100644 |
|---|
| config/locales/contact_us/contact_us.ja.yml 0 → 100644 |
|---|
| config/locales/contact_us/contact_us.pl.yml 0 → 100644 |
|---|
| config/locales/contact_us/contact_us.pt-BR.yml 0 → 100644 |
|---|
| config/locales/contact_us/contact_us.pt-PT.yml 0 → 100644 |
|---|
| config/locales/contact_us/contact_us.ru.yml 0 → 100644 |
|---|
| config/locales/contact_us/contact_us.zh-TW.yml 0 → 100644 |
|---|
| config/locales/contact_us/contact_us.zh.yml 0 → 100644 |
|---|
| config/locales/de.bootstrap.yml 100644 → 0 |
|---|
| config/locales/devise.de.yml 100644 → 0 |
|---|
| config/locales/devise.en-UK.yml 100644 → 0 |
|---|
| config/locales/devise.fr.yml 100644 → 0 |
|---|
| config/locales/devise/devise.de.yml 0 → 100644 |
|---|
| config/locales/devise/devise.en-UK.yml 0 → 100644 |
|---|
| config/locales/devise/devise.en-US.yml 0 → 100644 |
|---|
| config/locales/devise/devise.fr.yml 0 → 100644 |
|---|
| config/locales/devise/devise_invitable.de.yml 0 → 100644 |
|---|
| config/locales/devise/devise_invitable.en-UK.yml 0 → 100644 |
|---|
| config/locales/devise/devise_invitable.en-US.yml 0 → 100644 |
|---|
| config/locales/devise/devise_invitable.fr.yml 0 → 100644 |
|---|
| config/locales/devise_invitable.de.yml 100644 → 0 |
|---|
| config/locales/devise_invitable.en-UK.yml 100644 → 0 |
|---|
| config/locales/devise_invitable.fr.yml 100644 → 0 |
|---|
| config/locales/en-UK.bootstrap.yml 100644 → 0 |
|---|
| config/locales/en-UK.yml |
|---|
| config/locales/en-US.yml 0 → 100644 |
|---|
| config/locales/fr.bootstrap.yml 100644 → 0 |
|---|
| config/locales/untitled.txt 0 → 100644 |
|---|