Bpp production #67
Merged
Bpp production #67
Conversation
This file contains hidden or 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
added 30 commits
November 15, 2019 11:10
Should keep master up-to-date?
…listener dependency
…t reordering file
…icle_coding in it) into testing
added 27 commits
July 7, 2020 15:02
This reverts commit 82d474e. Part of temporary reversion of export page branch to get it out of testing.
…ink from admin index" This reverts commit 2131a0d. Part of temporary revert of export page branch to get it out of testing.
…feature (re-merge to revert revert)
# Conflicts: # models.py # mpeds_coder.py # templates/event-creator-block.html
# Conflicts: # mpeds_coder.py
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.
All right, here's the final loop to close I think (aside from unfinished feature branches). This branch the result of merging the new upstream with our production version, and so should make both branches identical.
The only changes here are to merge the commit histories for the two projects and to overwrite upstream's article annotation template (which has never been used) with the BPP production version (which will become the default).