Browse code fixed rebase issues dev
commit d7f33b8e4c4426883aa0efcfdb4b70ff15892566 2 parents 1189b62 + 543cc05 briley authored on 5 Apr 2017

Showing 31 changed files

• Gemfile
• Gemfile.lock
• app/controllers/guidances_controller.rb
• app/models/guidance.rb
• app/views/guidances/_add_guidance.html.erb
• app/views/guidances/admin_edit.html.erb
• app/views/guidances/admin_new.html.erb
• app/views/guidances/admin_show.html.erb
• app/views/guidances/update_phases.js.erb
• app/views/guidances/update_questions.js.erb
• app/views/guidances/update_sections.js.erb
• app/views/guidances/update_versions.js.erb
• app/views/layouts/application.html.erb
• config/initializers/gettext_i18n_rails_js.rb
• config/locale/app.pot
• config/locale/de/app.po
• config/locale/en_GB/app.po
• config/locale/en_US/app.po
• config/locale/es/app.po
• config/locale/fr/app.po
• lib/assets/javascripts/admin.js
• lib/assets/javascripts/application.js
• lib/assets/javascripts/export_configure.js
• lib/assets/javascripts/jquery.timeago.js
• lib/assets/javascripts/locale/de/app.js
• lib/assets/javascripts/locale/en_GB/app.js
• lib/assets/javascripts/locale/en_US/app.js
• lib/assets/javascripts/locale/es/app.js
• lib/assets/javascripts/locale/fr/app.js
• lib/assets/javascripts/plans.js
• lib/assets/javascripts/toolbar.js

Ignore Space Show notes View Gemfile

Ignore Space Show notes View Gemfile.lock

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

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

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

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

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

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

Show notes View app/views/guidances/update_phases.js.erb 100644 → 0

Show notes View app/views/guidances/update_questions.js.erb 100644 → 0

Show notes View app/views/guidances/update_sections.js.erb 100644 → 0

Show notes View app/views/guidances/update_versions.js.erb 100644 → 0

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

Ignore Space Show notes View config/initializers/gettext_i18n_rails_js.rb 0 → 100644

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

Ignore Space Show notes View config/locale/de/app.po

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

Ignore Space Show notes View config/locale/en_US/app.po

Ignore Space Show notes View config/locale/es/app.po

Ignore Space Show notes View config/locale/fr/app.po

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

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

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

Ignore Space Show notes View lib/assets/javascripts/jquery.timeago.js

Ignore Space Show notes View lib/assets/javascripts/locale/de/app.js 0 → 100644

Ignore Space Show notes View lib/assets/javascripts/locale/en_GB/app.js 0 → 100644

Ignore Space Show notes View lib/assets/javascripts/locale/en_US/app.js 0 → 100644

Ignore Space Show notes View lib/assets/javascripts/locale/es/app.js 0 → 100644

Ignore Space Show notes View lib/assets/javascripts/locale/fr/app.js 0 → 100644

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

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

Show line notes below