Merge branch 'master' of https://github.com/DMPRoadmap/roadmap into postgresql
dev
commit 991f1a72245178a16e069d6d48393449f1ecc3e4
2 parents 6d295d3 + 1cdeb13
@Jimmy Angelakos Jimmy Angelakos authored on 18 Oct 2016
Showing 45 changed files
View
.gitignore
View
Gemfile.lock
View
README.md
View
app/assets/javascripts/application.js
View
app/assets/stylesheets/admin.css.less
View
app/assets/stylesheets/bootstrap_and_overrides.css.less
View
app/controllers/application_controller.rb
View
app/controllers/organisations_controller.rb
View
app/controllers/registrations_controller.rb
View
app/controllers/sessions_controller.rb
View
app/controllers/settings/plans_controller.rb
View
app/controllers/settings/projects_controller.rb
View
app/controllers/users_controller.rb
View
app/helpers/plans_helper.rb 100644 → 0
View
app/helpers/projects_helper.rb 0 → 100644
View
app/mailers/user_mailer.rb
View
app/models/exported_plan.rb
View
app/models/organisation.rb
View
app/models/user.rb
View
app/policies/guidance_group_policy.rb
View
app/policies/organisation_policy.rb
View
app/views/devise/registrations/edit.html.erb
View
app/views/guidances/admin_index.html.erb
View
app/views/guidances/admin_new.html.erb
View
app/views/layouts/_dmponline_signin_signout.html.erb
View
app/views/organisations/admin_edit.html.erb
View
app/views/projects/_project_list_head.html.erb
View
app/views/projects/_project_list_item.html.erb
View
app/views/projects/new.html.erb
View
app/views/projects/share.html.erb
View
app/views/shared/_export_links.html.erb
View
app/views/static_pages/help.html.erb
View
app/views/user_mailer/permissions_change_notification.html.erb
View
app/views/user_mailer/sharing_notification.html.erb
View
app/views/users/admin_grant_permissions.html.erb
View
app/views/users/admin_index.html.erb
View
config/application.rb
View
config/branding.yml
View
config/initializers/devise.rb
View
config/locales/de.yml
View
config/locales/en-UK.yml
View
config/locales/en-US.yml
View
config/locales/fr.yml
View
db/seeds.rb
View
lib/custom_failure.rb