Skip to content

update levelbuilder#4813

Merged
laurelfan merged 83 commits into
levelbuilderfrom
staging
Oct 26, 2015
Merged

update levelbuilder#4813
laurelfan merged 83 commits into
levelbuilderfrom
staging

Conversation

@laurelfan

Copy link
Copy Markdown
Contributor

No description provided.

davidsbailey and others added 30 commits October 23, 2015 11:01
Add HTTP cache configuration shared by Varnish and CloudFront.
Varnish refactoring:
- Upgrade varnish, libvmod-cookie and libvmod-header to 4.0.3 packages.
- Refactor VCL to normalize/remove unused config and upgrade to Varnish 4 syntax.
- Use test-kitchen for chef integration testing cdo-varnish cookbook.
- Add Chef integration tests for cdo-varnish using WireMock.
- Run Chef integration tests on CircleCI.
- Bump `cdo-varnish` cookbook version for controlled deployment.
Adjust `Rack::SslEnforcer` configuration.
- Only Rack::SslEnforcer to redirect to HTTPS in development environment (otherwise, the HTTP-cache layer will handle it).
- HSTS header is still added to all HTTPS responses in all environments.
Cookie whitelist rack middleware.
…ate dashboard.projects.getChannelId() calls from applab.
Pass channel id to applab in appOptions
eacad10 fix applab tests (David Bailey)
CloudFront CDN configuration and Varnish refactor
Levels may now specify both success and fail conditions that force the level to finish immediately, with an optional message to be displayed.
Each level has been updated to use these, per the spec.
[Finishes #105728360, #105695514, #105697038]
allow i18n teachers to ask for volunteers
[finishes #104128976] When dragging an element, do not autosave. Auto…
6760b91 Merge pull request #4789 from code-dot-org/no_autosave_when_dragging (Mehal Shah)
6d1c7ab Merge pull request #4792 from code-dot-org/i18nvolunteers (Tanya Parker)
7574aac Merge pull request #4787 from code-dot-org/progressconditions (Brendan Reville)
599e097 One more piece of code review feedback. (Brendan Reville)
fba0789 Code review feedback. (Brendan Reville)
fdd405e Merge pull request #4793 from code-dot-org/announce (Caley Brock)
deploy-code-org and others added 27 commits October 25, 2015 19:02
93399e3 Merge pull request #4805 from code-dot-org/generalize-hazard-failure (Brad Buchanan)
dbadfe7 Remove unnecessary quotes (Brad Buchanan)
4cc6cb3 Fix level reference in blockly hoc2015 level 3 (Brad Buchanan)
fc1ec2d Hazards use progressConditions to fail level. (Brad Buchanan)
f2e49e9 Merge pull request #4806 from code-dot-org/hoc2015newsounds (Brendan Reville)
7d32e2d hoc2015: new sounds. (Brendan Reville)
Use require_relative to load cookbooks
Turn off request forgery protection for milestone action to permit public caching of level pages
a2c918c Merge pull request #4804 from code-dot-org/no_request_forgery (philbogle)
711da5b Merge commit 'a1a312f' into no_request_forgery (Phil Bogle)
cddfa8e Merge pull request #4802 from code-dot-org/require_relative (philbogle)
a1a312f Increase app JS test timeout to reduce flakes (Phil Bogle)
4aae596 Automatically built. (Continuous Integration)
f2e49e9 Merge pull request #4806 from code-dot-org/hoc2015newsounds (Brendan Reville)
Revert "Use require_relative to load cookbooks"
Require cookbooks relatively (take 2)
[Finishes #106352136] String contains
684613a Merge pull request #4790 from code-dot-org/droplet-update-20151023 (Josh Lory)
23d377c Merge branch 'staging' into droplet-update-20151023 (Josh Lory)
e2a75a9 Merge pull request #4784 from code-dot-org/stringContains (Bjvanminnen)
script to automate dev of the day content pushes
laurelfan added a commit that referenced this pull request Oct 26, 2015
@laurelfan laurelfan merged commit 8083ad5 into levelbuilder Oct 26, 2015
deploy-code-org added a commit that referenced this pull request Oct 26, 2015
0578c5c Merge pull request #4742 from code-dot-org/configCleanup (Bjvanminnen)
75af0cc Merge pull request #4815 from code-dot-org/levelbuilder (Laurel)
dfe9ba3 Merge pull request #4814 from code-dot-org/fix-applab-most-recent (Josh Lory)
ff5f925 content changes (-laurel) (Continuous Integration)
e3cd8cf When logging in, auth before `most_recent` to get the correct project (Josh Lory)
8083ad5 Merge pull request #4813 from code-dot-org/staging (Laurel)
b5fa69b Merge pull request #4811 from code-dot-org/script-admin_required2 (Laurel)
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.