Browse code Merge branch 'development' of https://github.com/DigitalCurationCentre/roadmap into development dev
commit ed5105caefd25ac013c6dd8a058e5ac1605e8f20 2 parents 4722f1b + 57ae8a2 ray.carrick authored on 28 Mar 2017

Showing 30 changed files

• Gemfile
• Gemfile.lock
• app/controllers/phases_controller.rb
• app/controllers/sections_controller.rb
• app/controllers/templates_controller.rb
• app/dashboards/guidance_group_dashboard.rb
• app/dashboards/identifier_scheme_dashboard.rb
• app/dashboards/language_dashboard.rb
• app/dashboards/org_dashboard.rb
• app/dashboards/perm_dashboard.rb
• app/dashboards/token_permission_type_dashboard.rb
• app/dashboards/user_dashboard.rb
• app/dashboards/user_identifier_dashboard.rb
• app/models/org.rb
• app/models/perm.rb
• app/models/user.rb
• app/views/admin/application/_collection.html.erb
• app/views/admin/application/_form.html.erb
• app/views/admin/application/edit.html.erb
• app/views/admin/application/index.html.erb
• app/views/admin/application/new.html.erb
• app/views/admin/application/show.html.erb
• app/views/orgs/admin_show.html.erb
• app/views/phases/admin_add.html.erb
• app/views/phases/admin_preview.html.erb
• app/views/sections/_show_section.html.erb
• app/views/templates/_admin_nav_tabs.html.erb
• app/views/templates/_show_phases_sections.html.erb
• app/views/templates/admin_template.html.erb
• config/locales/administrate.en_GB.yml

Ignore Space Show notes View Gemfile

Ignore Space Show notes View Gemfile.lock

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

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

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

Ignore Space Show notes View app/dashboards/guidance_group_dashboard.rb

Ignore Space Show notes View app/dashboards/identifier_scheme_dashboard.rb

Ignore Space Show notes View app/dashboards/language_dashboard.rb

Ignore Space Show notes View app/dashboards/org_dashboard.rb

Ignore Space Show notes View app/dashboards/perm_dashboard.rb

Ignore Space Show notes View app/dashboards/token_permission_type_dashboard.rb

Ignore Space Show notes View app/dashboards/user_dashboard.rb

Ignore Space Show notes View app/dashboards/user_identifier_dashboard.rb

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

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

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

Show notes View app/views/admin/application/_collection.html.erb 100644 → 0

Show notes View app/views/admin/application/_form.html.erb 100644 → 0

Show notes View app/views/admin/application/edit.html.erb 100644 → 0

Show notes View app/views/admin/application/index.html.erb 100644 → 0

Show notes View app/views/admin/application/new.html.erb 100644 → 0

Show notes View app/views/admin/application/show.html.erb 100644 → 0

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

Ignore Space Show notes View app/views/phases/admin_add.html.erb

Ignore Space Show notes View app/views/phases/admin_preview.html.erb

Ignore Space Show notes View app/views/sections/_show_section.html.erb

Ignore Space Show notes View app/views/templates/_admin_nav_tabs.html.erb

Ignore Space Show notes View app/views/templates/_show_phases_sections.html.erb

Ignore Space Show notes View app/views/templates/admin_template.html.erb

Ignore Space Show notes View config/locales/administrate.en_GB.yml

Show line notes below