Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DTL (Test > Levelbuilder): 771ffbdd #22994

Merged
merged 42 commits into from Jun 8, 2018

Conversation

deploy-code-org
Copy link
Contributor

No description provided.

joshlory and others added 30 commits June 4, 2018 10:00
DTT (Staging > Test) [robo-dtt]
In particular, don't capture the education|-nocookie group so that we can still extract the ID successfully.
This extracts some minimal logic from #22865 to redirect ar.code.org to an external site.

By removing it from the list of partner sites, the subdomain will be removed from the CloudFront distribution.  Before deploying, I will update the DNS entry for ar.code.org to send requests directly to our load balancer instead of CloudFront.  Then the redirect provided via chef to varnish will operate successfully after this change is deployed to production.
…g the JotForm API in some cases (confusingly depending on other params), but integer works fine [ci skip]
Remove to_s conversion because empirically string min ids are breakin…
DTT (Staging > Test) [robo-dtt]
Video: use youtube-nocookie.com for embedded videos
DTT (Staging > Test) [robo-dtt]
Conflicts:
	pegasus/sites.v3/ar.code.org/views/hocvideo.haml
…-powerschool-text-changes

Revert "Revert "Change text for Powerschool connect""
Pegasus: redirect ar.code.org to external site
…kie"

This reverts commit 10f642a, reversing
changes made to 59f9f66.

Conflicts:
	pegasus/sites.v3/ar.code.org/views/hocvideo.haml
add 2-day subjects and rename academic year subjects for consistency
remove the closed change.org campaign link and add a section for intl…
deploy-code-org and others added 12 commits June 8, 2018 14:41
Revert "Video: use youtube-nocookie.com for embedded videos"
The `first sprite touched` and `second sprite touched` blocks weren't working because we don't currently pass both sprites into the collision event. Tested with the library in Game Lab.
DTT (Staging > Test) [robo-dtt]
…ferings

Import Virginia state course offerings
Pass both sprites into collision events
DTT (Staging > Test) [robo-dtt]
DTT (Staging > Test) [robo-dtt]
@deploy-code-org deploy-code-org merged commit 2b91c15 into levelbuilder Jun 8, 2018
@balderdash balderdash deleted the dtl_candidate_771ffbdd branch September 18, 2018 05:54
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.

None yet

8 participants