Skip to content

DTP#9555

Merged
islemaster merged 76 commits into
productionfrom
test
Jul 18, 2016
Merged

DTP#9555
islemaster merged 76 commits into
productionfrom
test

Conversation

@islemaster

Copy link
Copy Markdown
Contributor

No description provided.

larrypo and others added 30 commits July 1, 2016 15:34
Conflicts:
	dashboard/app/helpers/levels_helper.rb
This required a dashboard change so that we pass the is13Plus flag in the app config to all level views, not just to project views.  I'm a little worried about the implications of this, but by passing it to project pages we weren't protecting it particularly well before, and at the very least it does appear to be available on all share pages.

I ran all the apps tests and projects.feature, and everything passed, so I expect the existing behavior is preserved.
Add lesson plan links to algebraa and csd3 scripts
…udioRedux"

This reverts commit ae86cf1, reversing
changes made to b5f4dc3.
Defines hashed_email (fixing bug) and uses contact_email (fixing bug).
add redirects for deprecated CSP pages
…new applab projects created via 'Create New'
Make the sourceSize animation property ephemeral, not part of the SerializedAnimationProps type, because we can always infer it once the asset is loaded.  Instead we add a step to our loadfromsource process to determine the dimensions of the asset right before we are done loading.
islemaster and others added 29 commits July 15, 2016 12:39
levelbuilder -> staging (brendan)
…arning

Game Lab: Animation picker warning
Change property of image object from picture to image in design view
Remove documentation of removed sourceSize property
Revert: Revert: "Remove abilities from admins."
Wipes plaintext email for students from Poste2.
Today Brooke and Mehal reported the following uncaught exception in the NetSimRouterLogModal:

> Uncaught ReferenceError: localAddress is not defined

There's a reference to `localAddress` when it should be `locals.localAddress`.  Here we cover that behavior with a _very_ dumb test, and fix it.
@islemaster islemaster merged commit 93e02ba into production Jul 18, 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.