Browse code Resolve merge conflicts. DMPRoadmap/roadmap#587 dev
1 parent b25923f commit 25abd31a82bb346711791aff06dfd970635a9e56 Jose Lloret authored on 18 Aug 2017

Showing 57 changed files

• .gitignore
• .travis.yml
• Gemfile
• Gemfile.lock
• app/helpers/application_helper.rb
• app/views/devise/passwords/new.html.erb
• app/views/devise/registrations/edit.html.erb
• app/views/guidance_groups/admin_edit.html.erb
• app/views/guidance_groups/admin_new.html.erb
• app/views/guidances/admin_index.html.erb
• app/views/guidances/admin_new.html.erb
• app/views/home/index.html.erb
• app/views/layouts/_es5_scripts.html.erb
• app/views/layouts/application.html.erb
• app/views/orgs/admin_edit.html.erb
• app/views/phases/admin_add.html.erb
• app/views/phases/admin_show.html.erb
• app/views/plans/_available_templates.html.erb
• app/views/plans/_edit_details.html.erb
• app/views/plans/new.html.erb
• app/views/plans/share.html.erb
• app/views/plans/show_export.html.erb
• app/views/shared/_accessible_combobox.html.erb
• app/views/shared/_accessible_submit_button.html.erb
• app/views/templates/admin_new.html.erb
• app/views/templates/admin_template.html.erb
• app/views/users/_notification_preferences.html.erb
• config/environments/development.rb
• config/environments/production.rb
• config/environments/test.rb
• config/initializers/assets.rb
• lib/assets/.eslintrc.json
• lib/assets/README.md
• lib/assets/fonts/fontawesome-webfont.woff
• lib/assets/javascripts/application.js
• lib/assets/javascripts/define.js
• lib/assets/javascripts/utils/define.js
• lib/assets/javascripts/views/devise/registrations/edit.js
• lib/assets/javascripts/views/orgs/admin_edit.js
• lib/assets/javascripts/views/plans/available_templates.js
• lib/assets/javascripts/views/plans/new.js
• lib/assets/javascripts/views/plans/show.js
• lib/assets/javascripts/views/shared/accessible_combobox.js
• lib/assets/javascripts/views/shared/accessible_submit_button.js
• lib/assets/javascripts/views/users/notification_preferences.js
• lib/assets/package.json
• lib/assets/stylesheets/application.scss
• lib/assets/webpack.config.js
• public/favicon.ico
• public/fonts/.keep
• public/images/.keep
• public/javascripts/.keep
• public/javascripts/translations.js
• public/stylesheets/.keep
• public/videos/.keep
• test/helpers/application_helper_test.rb
• vendor/package.json

Ignore Space Show notes View .gitignore

Ignore Space Show notes View .travis.yml

Ignore Space Show notes View Gemfile

Ignore Space Show notes View Gemfile.lock

Ignore Space Show notes View app/helpers/application_helper.rb

Ignore Space Show notes View app/views/devise/passwords/new.html.erb

Ignore Space Show notes View app/views/devise/registrations/edit.html.erb

Ignore Space Show notes View app/views/guidance_groups/admin_edit.html.erb

Ignore Space Show notes View app/views/guidance_groups/admin_new.html.erb

Ignore Space Show notes View app/views/guidances/admin_index.html.erb

Ignore Space Show notes View app/views/guidances/admin_new.html.erb

Ignore Space Show notes View app/views/home/index.html.erb

Ignore Space Show notes View app/views/layouts/_es5_scripts.html.erb 0 → 100644

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

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

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

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

Ignore Space Show notes View app/views/plans/_available_templates.html.erb

Ignore Space Show notes View app/views/plans/_edit_details.html.erb

Ignore Space Show notes View app/views/plans/new.html.erb

Ignore Space Show notes View app/views/plans/share.html.erb

Ignore Space Show notes View app/views/plans/show_export.html.erb

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

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

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

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

Ignore Space Show notes View app/views/users/_notification_preferences.html.erb

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

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

Ignore Space Show notes View config/environments/test.rb

Show notes View config/initializers/assets.rb 100644 → 0

Ignore Space Show notes View lib/assets/.eslintrc.json 0 → 100644

Ignore Space Show notes View lib/assets/README.md 0 → 100644

Show notes View lib/assets/fonts/fontawesome-webfont.woff 100644 → 0
Not supported

Ignore Space Show notes View lib/assets/javascripts/application.js

Show notes View lib/assets/javascripts/define.js 100644 → 0

Ignore Space Show notes View lib/assets/javascripts/utils/define.js 0 → 100644

Ignore Space Show notes View lib/assets/javascripts/views/devise/registrations/edit.js

Ignore Space Show notes View lib/assets/javascripts/views/orgs/admin_edit.js

Ignore Space Show notes View lib/assets/javascripts/views/plans/available_templates.js 0 → 100644

Ignore Space Show notes View lib/assets/javascripts/views/plans/new.js

Ignore Space Show notes View lib/assets/javascripts/views/plans/show.js

Ignore Space Show notes View lib/assets/javascripts/views/shared/accessible_combobox.js 0 → 100644

Ignore Space Show notes View lib/assets/javascripts/views/shared/accessible_submit_button.js 0 → 100644

Ignore Space Show notes View lib/assets/javascripts/views/users/notification_preferences.js 0 → 100644

Ignore Space Show notes View lib/assets/package.json 0 → 100644

Ignore Space Show notes View lib/assets/stylesheets/application.scss

Ignore Space Show notes View lib/assets/webpack.config.js 0 → 100644

Show notes View public/favicon.ico 100644 → 0

Ignore Space Show notes View public/fonts/.keep 0 → 100644

Ignore Space Show notes View public/images/.keep 0 → 100644

Ignore Space Show notes View public/javascripts/.keep 0 → 100644

Show notes View public/javascripts/translations.js 100644 → 0

Ignore Space Show notes View public/stylesheets/.keep 0 → 100644

Ignore Space Show notes View public/videos/.keep 0 → 100644

Ignore Space Show notes View test/helpers/application_helper_test.rb

Show notes View vendor/package.json 100644 → 0

Show line notes below