IA Play Lab - V1#4919
Merged
Merged
Conversation
Contributor
Author
There was a problem hiding this comment.
yep, along with the placeholder images
Member
|
lgtm. |
Member
There was a problem hiding this comment.
good call making extraEmotions an integer and putting it here in the skin.
deploy-code-org
added a commit
that referenced
this pull request
Oct 29, 2015
debbe71 Merge pull request #4919 from code-dot-org/ia-round2 (Caley Brock) 22108b6 Automatically built. (Continuous Integration) 224dc67 Merge pull request #4786 from code-dot-org/pulse-item (Brad Buchanan) 34e9f9e Merge branch 'staging' into ia-round2 (caleybrock) d619792 Automatically built. (Continuous Integration) 8403a32 Merge pull request #4920 from code-dot-org/testfixes (Elijah Hamovitz) 0ff348c Temporarily removing funOMeter test (Elijah Hamovitz) b457e24 Merge pull request #4916 from code-dot-org/ie10tests (Bjvanminnen) 5b89e35 more IE10 (Brent Van Minnen) 1876a7f o Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging (Trevor Berg) 541fdc5 Fix issues with JSONFileDataAdapter (Trevor Berg)
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
2 participants
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.
fyi, since I'm editing studio.js - @islemaster @breville @cpirich
@breville please review :)