Skip to content

DTT#9700

Merged
islemaster merged 37 commits into
testfrom
staging
Jul 25, 2016
Merged

DTT#9700
islemaster merged 37 commits into
testfrom
staging

Conversation

@islemaster

Copy link
Copy Markdown
Contributor

No description provided.

Hamms and others added 30 commits June 20, 2016 13:06
The [`deep` argument of `_.clone` has been removed](https://lodash.com/docs#clone); use `_.cloneDeep` in these cases.
The boolean `immediate` option for `_.debounce` has been deprecated, so we should use the `leading` and `trailing` options explicitly.
Following the same pattern we did for global locale loading.  That was working for netsim tests when you ran the whole suite, but if you used the --entry option some tests would never try to load the global locales, only netsim locales, and it would break again.
Conflicts:
	apps/src/turtle/api.js
	apps/src/turtle/turtle.js
	apps/test/unit/turtle/turtleTest.js
Otherwise, the tip will be mostly hidden, but will still "break" the
border of the chat bubble.

Also teach ChatBubble how to get skinId and isMinecraft from redux
state, and remove the code formerly responsible for passing that state
all the way down from TopInstructionsCSF
Lodash's _.debounce no longer executes callbacks immediately for debounce durations of zero.  Updated tests to reflect this with delays of 0ms to yield and let the debounce fire.

I tried everything I could to get lolex (time simulation library) to work, but lodash stubbornly closes around window.Date so there's not much I can do.
…rtProgress"

This reverts commit e396780, reversing
changes made to dff47fa.
Previously, all our readonly Blockly BlockSpaces were being arbitrarily
sized to 100px tall. This meant that short blocks ended up taking up too
much space, and tall blocks needed to be scrolled.

No more!
…ogress_dots

Revert "Peer Review status should show up in puzzle dots"
…params

Update the pd-workshop join_section redirect to handle section_code a s a query param
Fix layout of FreeResponse levels inside a LevelGroup
…y-blocks

Dynamically resize ReadOnly Blockly
Hamms and others added 7 commits July 25, 2016 13:51
…tendance where at least one session has no attendees.

Rails converts empty param arrays to nil, which was causing the error.
This doesn't happen in the context of a controller unit test however,
so I added an integration test to expose and test it.
…-fix

Fixed NoMethodError for nil:NilClass error from attempting to save at…
@islemaster islemaster merged commit a8405e6 into test Jul 25, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants