staging to levelbuilder#4778
Merged
Merged
Conversation
…ake Projectile use StudioAnimation and StudioSpriteSheet instead of doing its own thing.
Levelbuilder to staging
CI cookbook-version sync via Berkshelf
fix syntax in #4713
Text changes for advocacy
Extract animation wrapper
0586f2b Merge pull request #4768 from code-dot-org/extract-animation-wrapper (Brad Buchanan) ae4393b Merge pull request #4771 from code-dot-org/promote-k12 (Caley Brock) f541f2b Merge pull request #4774 from code-dot-org/berks_update (Will Jordan) fabdbe6 fix syntax (Will Jordan) 1206fd4 Merge pull request #4713 from code-dot-org/berks_update (Will Jordan) a88e880 CI cookbook-version sync via Berkshelf (Will Jordan) b0d520d Merge pull request #4772 from code-dot-org/levelbuilder (Elijah Hamovitz) 08b74b3 levelbuilder changes (elijah) (Continuous Integration)
[Finishes #105433088] Changes to randomNumber
8228a7a Merge pull request #4695 from code-dot-org/randomNumber (Bjvanminnen) 4f48542 Automatically built. (Continuous Integration) 0586f2b Merge pull request #4768 from code-dot-org/extract-animation-wrapper (Brad Buchanan) ae4393b Merge pull request #4771 from code-dot-org/promote-k12 (Caley Brock) f541f2b Merge pull request #4774 from code-dot-org/berks_update (Will Jordan) fabdbe6 fix syntax (Will Jordan)
fix cdo-varnish ppa uri
Change to reporting the answer text rather than the answer index (per request).
In application controller, HintViewRequest was using script_level even though it was outside of the logical block checking for the existence of script_level. It's now in its own little logical block so that its requirements are quite a bit more clear.
…id, just a level_id
…ndefined HintViewRequest logic was in the wrong place
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
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.
No description provided.