Browse code Merge branch 'dmpopidor_branding' into feature/plan_form_v2 dev
commit 96d69fcbd4b00d20869aab101b188215045bc1b1 2 parents 0eec41d + f53d73b Benjamin FAURE authored on 22 Oct 2018 GitHub committed on 22 Oct 2018

Showing 15 changed files

• app/controllers/api/v0/themes_controller.rb
• app/controllers/super_admin/themes_controller.rb
• app/models/answer.rb
• app/models/theme.rb
• app/models/token_permission_type.rb
• app/policies/api/v0/theme_policy.rb
• app/policies/theme_policy.rb
• app/views/api/v0/themes/extract.jbuilder
• app/views/shared/_create_plan_modal.html.erb
• app/views/shared/export/_plan.erb
• config/locale/dmpopidor.pot
• config/locale/en_GB/dmpopidor.po
• config/locale/fr_FR/dmpopidor.po
• config/routes.rb
• lib/tasks/dmpopidor_upgrade.rake

Ignore Space Show notes View app/controllers/api/v0/themes_controller.rb 0 → 100644

Ignore Space Show notes View app/controllers/super_admin/themes_controller.rb

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

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

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

Ignore Space Show notes View app/policies/api/v0/theme_policy.rb 0 → 100644

Ignore Space Show notes View app/policies/theme_policy.rb

Ignore Space Show notes View app/views/api/v0/themes/extract.jbuilder 0 → 100644

Ignore Space Show notes View app/views/shared/_create_plan_modal.html.erb

Ignore Space Show notes View app/views/shared/export/_plan.erb

Ignore Space Show notes View config/locale/dmpopidor.pot

Ignore Space Show notes View config/locale/en_GB/dmpopidor.po

Ignore Space Show notes View config/locale/fr_FR/dmpopidor.po

Ignore Space Show notes View config/routes.rb

Ignore Space Show notes View lib/tasks/dmpopidor_upgrade.rake 0 → 100644

Show line notes below