Bootstrapped Plan Download #631
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
briri
commented
Sep 8, 2017
briri
commented
- Renamed show_export.html.erb to download.html.erb more closely match page name (updated corresponding controller, policy, link in tab and route)
- Renamed export_settings.js to download.js and converted to ES6. Dropped all of the old auto-save JS. Can reimplement if needed with shared ES6 JS once that's been built out
- Bootstrapped the form Refactor CSS/JS for Download Plan page #561
- Bootstrapped the Write Plan page accordions - Rebased with latest from CDL-MVP bootstrapped the phases accordion DMPRoadmap#567 added es6 function to provide expand/collapse all functionality. bootstrapped several accordions DMPRoadmap#567 finished Bootstrapping write plan accordions DMPRoadmap#567 fixed linter issue DMPRoadmap/roadmap#issue567 fixed linter issue
- Renamed show_export.html.erb to download.html.erb (updated controller, policy, links and route) - Renamed export_settings.js to download.js and dropped unused auto-save JS (no longer a part of wireframes) - Bootstrapped page html changed name of show_export to download to match UI terminology. Bootstrapped download page Added ES6 JS for download page and made tweaks to the format
|
@jollopre it looks like the merge conflict is in the application.js file. You should be able to just resolve it directly in Github. I wonder if it was caused by the new rebasing workflow |
jollopre
approved these changes
Sep 11, 2017
|
Resolved merge conflict on write plan page (pulled in @jollopre changes to the edit plan page). |
|
Fixed tests and linter issues |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.