Merge branch 'development' of https://github.com/DMPRoadmap/roadmap into issue/1682
dev
commit 2dd0b80cc0eebe48403e9e23b78f70c810fcc3c3
2 parents 2cb3c46 + 76908e5
@Sam Rust Sam Rust authored on 4 Mar 2020
Showing 23 changed files
View
Gemfile
View
Gemfile.lock
View
app/controllers/static_pages_controller.rb
View
app/javascript/utils/tinymce.js 100644 → 0
View
app/javascript/utils/tinymce.js.erb 0 → 100644
View
app/javascript/views/answers/edit.js
View
app/javascript/views/guidances/new_edit.js
View
app/javascript/views/notes/index.js
View
app/javascript/views/org_admin/phases/new_edit.js
View
app/javascript/views/org_admin/templates/edit.js
View
app/javascript/views/org_admin/templates/new.js
View
app/javascript/views/orgs/admin_edit.js
View
app/javascript/views/plans/edit_details.js
View
app/javascript/views/super_admin/notifications/edit.js
View
app/javascript/views/super_admin/themes/new_edit.js
View
app/views/layouts/_footer.html.erb
View
config/webpack/environment.js
View
config/webpack/loaders/erb.js 0 → 100644
View
config/webpacker.yml
View
package.json
View
spec/javascripts/tinymceSpec.js
View
spec/karma/unit.js
View
yarn.lock