Better script asset loading by islemaster · Pull Request #4571 · code-dot-org/code-dot-org

islemaster · 2015-10-14T21:54:55Z

This is an early effort to reduce overall load times for Applab pages by moving dependency-loading tags into the initial DOM render instead of adding them dynamically at runtime during app initialization.

Overview

Before we loaded most of our apps dependencies in loadApp.js, which didn't run until the page load event, and which downloaded the dependencies in sequence (one at a time) to ensure load order. You can see the resulting "waterfall" of network activity:

By putting the tags for these CSS and JS dependencies in the initial DOM render (in _blockly.html.haml) we allow the browser to be in charge of loading these dependencies. It turns out browsers are really good at this, doing lots of parallel downloading but still executing the scripts in order. Doesn't that look better?

Benefits

This change has a large positive impact on page load times. In certain environments, Applab loads in less than half the time with prerendered script tags vs. the original time using dynamic serial loading. All of our Blockly, Droplet, and Netsim levels are improved by this change - I suspect we'll see a measurable drop in dashboard page load times on New Relic after releasing this change.

Page	Network	Baseline (s)	Improved (s)	Difference
Blockly (this level)	3G (1Mbps, 40ms RTT)	7.68	6.17	-19.64%
Netsim (this level)	3G (1Mbps, 40ms RTT)	6.84	5.51	-19.50%
Netsim (this level)	Unthrottled	3.19	2.10	-34.13%
Applab (new project)	3G (1Mbps, 40ms RTT)	10.05	7.70	-23.35%
Applab (new project)	Unthrottled	7.31	3.30	-54.83%

Measurements were taken in Chrome 45 with cache disabled. Given times (measured in seconds) are the duration from the beginning of page load to the "Load" event firing as recorded by the Network tab of the developer console (which corresponds to initialization scripts finishing). Each measurement represents the average of five trials. Baselines were taken against production on studio.code.org. Improved measurements were taken against profiling.code.org, an environment we set up to emulate production as closely as possible (a frontend behind a similar load balancer, using SSL, minified assets, etc.).

I suspect the dramatic improvements on an unthrottled network connection are because the browser can really take advantage of the parallel loading with more bandwidth.

As an added benefit, all of these pages now require less content than before. The 18KB manifest.js file is no longer needed because cachebusting is handled by Rails on the server. Netsim also now skips the 173KB blockly.js file and the 6KB blockly_locale.js file, which it didn't require but was loading anyway before.

Test Coverage

While running this change on my local machine, I ran the UI tests on Saucelabs for Chrome, Firefox, Safari and IE9. I also ran against local chromedriver. Tests are passing. In fact, I had to adjust a number of UI tests because the timing of page loads has changed dramatically - I did my best here to make them less fragile.

TODO

de-dupe dependency inclusion in embed_blocks.html.erb and _blockly.html.haml
Try loading jsapi with the async attribute
Extract as much logic as possible out of _blockly.html.haml into the controller.
Verify that use_my_apps option is still functional.

…hboard.

Get ace through public (static) folder with no cachebusting since we are including an external asset and are unlikely to update it very often, and because it's dumb and goes looking for its own dependencies in its own directory bypassing Rails' cachebusting. Include colpick.css as a directly included style dependency instead of using an @import directive so that it can take advantage of Rails cachebusting as well.

bcjordan · 2015-10-14T22:01:29Z

This is great! Did you notice any change in UI test performance/behavior?

islemaster · 2015-10-14T22:05:41Z

I haven't measured UI test run times (and I'm not sure such measurements against my local build would be valid) but their behavior did change somewhat - in fact, I think many of the UI test changes I had to make in this PR are because pages loading faster revealed some timing vulnerabilities in our tests.

joshlory · 2015-10-14T22:27:07Z

Looks like dashboard/app/views/levels/embed_blocks.html.erb may still be expecting loadApp.js to load script dependencies.

Bjvanminnen · 2015-10-14T22:28:33Z

any reason not to just remove this instead of setting to false?

I think we can go ahead and rip out all the Gruntfile digest code. It should mostly be an inverse of this change to Gruntfile.js: https://github.com/code-dot-org/code-dot-org/pull/2992/files

islemaster · 2015-10-14T23:43:59Z

@joshlory I'm having trouble tracing how embed_blocks.html.erb is used. Can you give me an example?

islemaster · 2015-10-15T00:09:14Z

This looks like the same thing as the surrounding lines, but while the rest of these cause a SASS inline include, this is left as a raw CSS @include directive in the final source, which we should avoid if we intend to use fingerprinted assets. Since this is an applab-only asset, I've moved it into _blockly.html.haml with the other applab style dependencies.

joshlory · 2015-10-15T00:10:53Z

https://studio.code.org/s/algebra/stage/5/puzzle/2

islemaster · 2015-10-15T00:12:43Z

Changes to this method are only trying to ensure that it always returns a Deferred that eventually resolves; before, there were several cases where it had no return value.

islemaster · 2015-10-15T00:29:54Z

Great catch @joshlory , I owe you one. I'll get that fixed up right away. Maybe we can can even cut down on the number of dependencies loaded for that case.

islemaster · 2015-10-15T01:10:51Z

Tracking the fact that UI tests didn't catch the embedded blocks case Josh pointed out, here: https://www.pivotaltracker.com/story/show/105726746

Use the partial from _blockly.html.haml and embed_blocks.html.erb. New partial is fully configurable by passing in locals, so that it adapts easily to unusual contexts like embed_blocks. Extracted some set-up logic around rendering the dependencies in a level context into the controller helper (not in template anymore). Had to make app_options safe to call multiple times.

islemaster · 2015-10-15T20:27:34Z

@joshlory please take a look at the last three commits here, which fix embed_blocks and extract the dependency rendering to a partial used in both places.

islemaster · 2015-10-15T20:51:53Z

I'm not going to do the async attribute on the jsapi library. It seems like it would be a good idea for the applab edit page, but for shared apps where we try to run the app immediately it could lead to things breaking when they should actually work.

islemaster · 2015-10-15T21:54:42Z

@trevorb Have you had a chance to review this?

islemaster · 2015-10-16T19:39:21Z

Note: We add /public/blockly as a new asset path, which is a symlink that changes depending on the use_my_apps option, so in development you can still use your own apps build.

trevorb · 2015-10-16T21:45:17Z

lgtm

islemaster · 2015-10-16T22:10:46Z

Note: Added UI test coverage for loading embedded blocks in #4621

…pt-loading

islemaster · 2015-10-16T23:58:22Z

Re-running UI tests after latest changes. Will update here as I go.

✅ Local chromedriver
✅ Chrome44XP
✅ ChromeLatestWin7
✅ Firefox38Yosemite
✅ Firefox39Win7
✅ iPhone
⚠️ iPad - hourOfCode_signedIn.feature is failing because of a pop-up trying to allow youtube.com?
⚠️ SafariYosemite - projects.feature fails, but I get the same failure against staging on my local machine
❌ IE10Win7 - Failing: bigGameRemix, hourOfCode, hourOfCode_signedIn, contractEditorSections, bigGameVersions. These same tests are failing on staging branch for me. Brent says there's a known issue with tests that need to sign in when running them locally.
❔ IE9Win7 - Not tested locally yet.

iPad failure in action:

joshlory · 2015-10-19T18:01:06Z

@mehalshah may know about the iPad server identity failure. I think he's seen this before when running the tests locally?

…pt-loading Conflicts: dashboard/app/helpers/levels_helper.rb dashboard/test/ui/features/farmer.feature

islemaster · 2015-10-19T23:21:31Z

At this point all of the UI test failures I was encountering also happen against a clean staging build, so I'm satisfied that they're not issues introduced by our changes. Brent and I have discussed some work we could do to help out the local UI tests - it's nontrivial, and Brent said he'll be looking at it later this sprint.

I'm inclined to say the PR is good to go, balancing the risk of of failing UI tests locally against the increasing risk of waiting too long to merge this sort of change.

Handing this PR off to @trevorb to merge and conclude, since I've been reassigned this week.

Better script asset loading

commit 8588dff Merge: a99c54e 0df43a8 Author: Trevor Berg <trevor@code.org> Date: Mon Oct 19 19:26:36 2015 -0700 Merge pull request #4571 from code-dot-org/applab-better-script-loading Better script asset loading commit a99c54e Merge: 2b56b18 0627d81 Author: Mehal Shah <mehal@code.org> Date: Mon Oct 19 18:19:53 2015 -0700 Merge pull request #4656 from code-dot-org/fix_ie_hoc_tests Fix element does not exist step defintion so it plays nicely with int… commit 0627d81 Author: Mehal Shah <mehal@code.org> Date: Mon Oct 19 17:59:45 2015 -0700 Forgot a file commit 2b56b18 Author: Josh Lory <josh.lory@code.org> Date: Mon Oct 19 17:39:04 2015 -0700 Fix rake lint commit 013cb5c Merge: e29b83a b7be0ea Author: Josh Lory <josh.lory@code.org> Date: Mon Oct 19 17:38:04 2015 -0700 Merge branch 'test' into staging commit b7be0ea Merge: dbf4e70 346c7b8 Author: Josh Lory <josh.lory@code.org> Date: Mon Oct 19 17:37:35 2015 -0700 Merge branch 'production' into test commit e29b83a Merge: d39ecad 3d0685c Author: Andrew Oberhardt <andrew.oberhardt@gmail.com> Date: Mon Oct 19 17:27:52 2015 -0700 Merge pull request #4653 from code-dot-org/skip-email-for-deleted-workshops Added abort functionality in email templates. commit d39ecad Merge: b893265 f0b7cc7 Author: ashercodeorg <asher@code.org> Date: Mon Oct 19 19:26:18 2015 -0500 Merge pull request #4658 from code-dot-org/fixWhitespaceLintAgain Remove more whitespace, fixing lint. commit f0b7cc7 Author: Asher Kach <asher@code.org> Date: Mon Oct 19 19:25:32 2015 -0500 Remove more whitespace, fixing lint. commit b893265 Merge: d3b5660 d98df6d Author: Caley Brock <caleybrock7@gmail.com> Date: Mon Oct 19 17:24:09 2015 -0700 Merge pull request #4619 from code-dot-org/download-button Css for download button commit d3b5660 Merge: e6c72c6 4e68182 Author: ashercodeorg <asher@code.org> Date: Mon Oct 19 19:23:10 2015 -0500 Merge pull request #4657 from code-dot-org/fixWhitespaceLint Remove trailing whitespace, fixing lint. commit 4e68182 Author: Asher Kach <asher@code.org> Date: Mon Oct 19 19:22:11 2015 -0500 Remove trailing whitespace, fixing lint. commit e6c72c6 Merge: 2094d80 2caa4b8 Author: ashercodeorg <asher@code.org> Date: Mon Oct 19 19:18:03 2015 -0500 Merge pull request #4632 from code-dot-org/addPdFilter Adds filtering by PD status to the Search for Teachers page. Also adds a link to the page amid the admin links. commit 3d0685c Author: Andrew Oberhardt <Andrew@Code.org> Date: Mon Oct 19 17:15:08 2015 -0700 Abandon emails on SMTP syntax and fatal errors commit 2094d80 Author: Continuous Integration <dev@code.org> Date: Mon Oct 19 23:57:45 2015 +0000 Automatically built. commit 9ee9c07 Merge: 5dcbd2f e519c2a Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:50:25 2015 -0700 Merge pull request #4639 from code-dot-org/ie9linting [Finishes #105262598] use main thread if we dont support workers commit 5dcbd2f Merge: a62e8f4 5105709 Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:48:05 2015 -0700 Merge pull request #4602 from code-dot-org/add2home [Finishes #105726826] make add2home work again commit 9ee9c07 Merge: 5dcbd2f e519c2a Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:50:25 2015 -0700 Merge pull request #4639 from code-dot-org/ie9linting [Finishes #105262598] use main thread if we dont support workers commit 5dcbd2f Merge: a62e8f4 5105709 Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:48:05 2015 -0700 Merge pull request #4602 from code-dot-org/add2home [Finishes #105726826] make add2home work again commit 346c7b8 Merge: 8f45769 99e0bb7 Author: Caley Brock <caleybrock7@gmail.com> Date: Mon Oct 19 16:47:14 2015 -0700 Merge pull request #4647 from code-dot-org/hotfix Hotfix - hourofcode.com prizes updates and poster opt in removal

commit 1568252 Merge: 1d46da8 bb87616 Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 19:54:40 2015 -0700 Merge pull request #4643 from code-dot-org/promptNum [Finishes #105888952] new promptNum block commit 1d46da8 Author: Continuous Integration <dev@code.org> Date: Tue Oct 20 02:30:47 2015 +0000 Automatically built. commit 8588dff Merge: a99c54e 0df43a8 Author: Trevor Berg <trevor@code.org> Date: Mon Oct 19 19:26:36 2015 -0700 Merge pull request #4571 from code-dot-org/applab-better-script-loading Better script asset loading commit a99c54e Merge: 2b56b18 0627d81 Author: Mehal Shah <mehal@code.org> Date: Mon Oct 19 18:19:53 2015 -0700 Merge pull request #4656 from code-dot-org/fix_ie_hoc_tests Fix element does not exist step defintion so it plays nicely with int… commit 0627d81 Author: Mehal Shah <mehal@code.org> Date: Mon Oct 19 17:59:45 2015 -0700 Forgot a file commit 2b56b18 Author: Josh Lory <josh.lory@code.org> Date: Mon Oct 19 17:39:04 2015 -0700 Fix rake lint commit 013cb5c Merge: e29b83a b7be0ea Author: Josh Lory <josh.lory@code.org> Date: Mon Oct 19 17:38:04 2015 -0700 Merge branch 'test' into staging commit b7be0ea Merge: dbf4e70 346c7b8 Author: Josh Lory <josh.lory@code.org> Date: Mon Oct 19 17:37:35 2015 -0700 Merge branch 'production' into test commit e29b83a Merge: d39ecad 3d0685c Author: Andrew Oberhardt <andrew.oberhardt@gmail.com> Date: Mon Oct 19 17:27:52 2015 -0700 Merge pull request #4653 from code-dot-org/skip-email-for-deleted-workshops Added abort functionality in email templates. commit d39ecad Merge: b893265 f0b7cc7 Author: ashercodeorg <asher@code.org> Date: Mon Oct 19 19:26:18 2015 -0500 Merge pull request #4658 from code-dot-org/fixWhitespaceLintAgain Remove more whitespace, fixing lint. commit f0b7cc7 Author: Asher Kach <asher@code.org> Date: Mon Oct 19 19:25:32 2015 -0500 Remove more whitespace, fixing lint. commit b893265 Merge: d3b5660 d98df6d Author: Caley Brock <caleybrock7@gmail.com> Date: Mon Oct 19 17:24:09 2015 -0700 Merge pull request #4619 from code-dot-org/download-button Css for download button commit d3b5660 Merge: e6c72c6 4e68182 Author: ashercodeorg <asher@code.org> Date: Mon Oct 19 19:23:10 2015 -0500 Merge pull request #4657 from code-dot-org/fixWhitespaceLint Remove trailing whitespace, fixing lint. commit 4e68182 Author: Asher Kach <asher@code.org> Date: Mon Oct 19 19:22:11 2015 -0500 Remove trailing whitespace, fixing lint. commit e6c72c6 Merge: 2094d80 2caa4b8 Author: ashercodeorg <asher@code.org> Date: Mon Oct 19 19:18:03 2015 -0500 Merge pull request #4632 from code-dot-org/addPdFilter Adds filtering by PD status to the Search for Teachers page. Also adds a link to the page amid the admin links. commit 3d0685c Author: Andrew Oberhardt <Andrew@Code.org> Date: Mon Oct 19 17:15:08 2015 -0700 Abandon emails on SMTP syntax and fatal errors commit 2094d80 Author: Continuous Integration <dev@code.org> Date: Mon Oct 19 23:57:45 2015 +0000 Automatically built. commit 9ee9c07 Merge: 5dcbd2f e519c2a Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:50:25 2015 -0700 Merge pull request #4639 from code-dot-org/ie9linting [Finishes #105262598] use main thread if we dont support workers commit 5dcbd2f Merge: a62e8f4 5105709 Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:48:05 2015 -0700 Merge pull request #4602 from code-dot-org/add2home [Finishes #105726826] make add2home work again commit 9ee9c07 Merge: 5dcbd2f e519c2a Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:50:25 2015 -0700 Merge pull request #4639 from code-dot-org/ie9linting [Finishes #105262598] use main thread if we dont support workers commit 5dcbd2f Merge: a62e8f4 5105709 Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:48:05 2015 -0700 Merge pull request #4602 from code-dot-org/add2home [Finishes #105726826] make add2home work again commit 346c7b8 Merge: 8f45769 99e0bb7 Author: Caley Brock <caleybrock7@gmail.com> Date: Mon Oct 19 16:47:14 2015 -0700 Merge pull request #4647 from code-dot-org/hotfix Hotfix - hourofcode.com prizes updates and poster opt in removal commit 2cd6ae9 Author: Continuous Integration <dev@code.org> Date: Tue Oct 20 02:26:44 2015 +0000 Automatically built. commit 8588dff Merge: a99c54e 0df43a8 Author: Trevor Berg <trevor@code.org> Date: Mon Oct 19 19:26:36 2015 -0700 Merge pull request #4571 from code-dot-org/applab-better-script-loading Better script asset loading commit a99c54e Merge: 2b56b18 0627d81 Author: Mehal Shah <mehal@code.org> Date: Mon Oct 19 18:19:53 2015 -0700 Merge pull request #4656 from code-dot-org/fix_ie_hoc_tests Fix element does not exist step defintion so it plays nicely with int… commit 0627d81 Author: Mehal Shah <mehal@code.org> Date: Mon Oct 19 17:59:45 2015 -0700 Forgot a file commit 2b56b18 Author: Josh Lory <josh.lory@code.org> Date: Mon Oct 19 17:39:04 2015 -0700 Fix rake lint commit 013cb5c Merge: e29b83a b7be0ea Author: Josh Lory <josh.lory@code.org> Date: Mon Oct 19 17:38:04 2015 -0700 Merge branch 'test' into staging commit b7be0ea Merge: dbf4e70 346c7b8 Author: Josh Lory <josh.lory@code.org> Date: Mon Oct 19 17:37:35 2015 -0700 Merge branch 'production' into test commit e29b83a Merge: d39ecad 3d0685c Author: Andrew Oberhardt <andrew.oberhardt@gmail.com> Date: Mon Oct 19 17:27:52 2015 -0700 Merge pull request #4653 from code-dot-org/skip-email-for-deleted-workshops Added abort functionality in email templates. commit d39ecad Merge: b893265 f0b7cc7 Author: ashercodeorg <asher@code.org> Date: Mon Oct 19 19:26:18 2015 -0500 Merge pull request #4658 from code-dot-org/fixWhitespaceLintAgain Remove more whitespace, fixing lint. commit f0b7cc7 Author: Asher Kach <asher@code.org> Date: Mon Oct 19 19:25:32 2015 -0500 Remove more whitespace, fixing lint. commit b893265 Merge: d3b5660 d98df6d Author: Caley Brock <caleybrock7@gmail.com> Date: Mon Oct 19 17:24:09 2015 -0700 Merge pull request #4619 from code-dot-org/download-button Css for download button commit d3b5660 Merge: e6c72c6 4e68182 Author: ashercodeorg <asher@code.org> Date: Mon Oct 19 19:23:10 2015 -0500 Merge pull request #4657 from code-dot-org/fixWhitespaceLint Remove trailing whitespace, fixing lint. commit 4e68182 Author: Asher Kach <asher@code.org> Date: Mon Oct 19 19:22:11 2015 -0500 Remove trailing whitespace, fixing lint. commit e6c72c6 Merge: 2094d80 2caa4b8 Author: ashercodeorg <asher@code.org> Date: Mon Oct 19 19:18:03 2015 -0500 Merge pull request #4632 from code-dot-org/addPdFilter Adds filtering by PD status to the Search for Teachers page. Also adds a link to the page amid the admin links. commit 3d0685c Author: Andrew Oberhardt <Andrew@Code.org> Date: Mon Oct 19 17:15:08 2015 -0700 Abandon emails on SMTP syntax and fatal errors commit 2094d80 Author: Continuous Integration <dev@code.org> Date: Mon Oct 19 23:57:45 2015 +0000 Automatically built. commit 9ee9c07 Merge: 5dcbd2f e519c2a Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:50:25 2015 -0700 Merge pull request #4639 from code-dot-org/ie9linting [Finishes #105262598] use main thread if we dont support workers commit 5dcbd2f Merge: a62e8f4 5105709 Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:48:05 2015 -0700 Merge pull request #4602 from code-dot-org/add2home [Finishes #105726826] make add2home work again commit 9ee9c07 Merge: 5dcbd2f e519c2a Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:50:25 2015 -0700 Merge pull request #4639 from code-dot-org/ie9linting [Finishes #105262598] use main thread if we dont support workers commit 5dcbd2f Merge: a62e8f4 5105709 Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:48:05 2015 -0700 Merge pull request #4602 from code-dot-org/add2home [Finishes #105726826] make add2home work again commit 346c7b8 Merge: 8f45769 99e0bb7 Author: Caley Brock <caleybrock7@gmail.com> Date: Mon Oct 19 16:47:14 2015 -0700 Merge pull request #4647 from code-dot-org/hotfix Hotfix - hourofcode.com prizes updates and poster opt in removal

commit c971985 Merge: 525a55a 026a2c7 Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 20:16:35 2015 -0700 Merge pull request #4646 from code-dot-org/setSizeBlock [Finishes #105889014] new setSize block for applab commit 525a55a Author: Continuous Integration <dev@code.org> Date: Tue Oct 20 02:59:49 2015 +0000 Automatically built. commit 1568252 Merge: 1d46da8 bb87616 Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 19:54:40 2015 -0700 Merge pull request #4643 from code-dot-org/promptNum [Finishes #105888952] new promptNum block commit 1d46da8 Author: Continuous Integration <dev@code.org> Date: Tue Oct 20 02:30:47 2015 +0000 Automatically built. commit 8588dff Merge: a99c54e 0df43a8 Author: Trevor Berg <trevor@code.org> Date: Mon Oct 19 19:26:36 2015 -0700 Merge pull request #4571 from code-dot-org/applab-better-script-loading Better script asset loading commit a99c54e Merge: 2b56b18 0627d81 Author: Mehal Shah <mehal@code.org> Date: Mon Oct 19 18:19:53 2015 -0700 Merge pull request #4656 from code-dot-org/fix_ie_hoc_tests Fix element does not exist step defintion so it plays nicely with int… commit 0627d81 Author: Mehal Shah <mehal@code.org> Date: Mon Oct 19 17:59:45 2015 -0700 Forgot a file commit 2b56b18 Author: Josh Lory <josh.lory@code.org> Date: Mon Oct 19 17:39:04 2015 -0700 Fix rake lint commit 013cb5c Merge: e29b83a b7be0ea Author: Josh Lory <josh.lory@code.org> Date: Mon Oct 19 17:38:04 2015 -0700 Merge branch 'test' into staging commit b7be0ea Merge: dbf4e70 346c7b8 Author: Josh Lory <josh.lory@code.org> Date: Mon Oct 19 17:37:35 2015 -0700 Merge branch 'production' into test commit e29b83a Merge: d39ecad 3d0685c Author: Andrew Oberhardt <andrew.oberhardt@gmail.com> Date: Mon Oct 19 17:27:52 2015 -0700 Merge pull request #4653 from code-dot-org/skip-email-for-deleted-workshops Added abort functionality in email templates. commit d39ecad Merge: b893265 f0b7cc7 Author: ashercodeorg <asher@code.org> Date: Mon Oct 19 19:26:18 2015 -0500 Merge pull request #4658 from code-dot-org/fixWhitespaceLintAgain Remove more whitespace, fixing lint. commit f0b7cc7 Author: Asher Kach <asher@code.org> Date: Mon Oct 19 19:25:32 2015 -0500 Remove more whitespace, fixing lint. commit b893265 Merge: d3b5660 d98df6d Author: Caley Brock <caleybrock7@gmail.com> Date: Mon Oct 19 17:24:09 2015 -0700 Merge pull request #4619 from code-dot-org/download-button Css for download button commit d3b5660 Merge: e6c72c6 4e68182 Author: ashercodeorg <asher@code.org> Date: Mon Oct 19 19:23:10 2015 -0500 Merge pull request #4657 from code-dot-org/fixWhitespaceLint Remove trailing whitespace, fixing lint. commit 4e68182 Author: Asher Kach <asher@code.org> Date: Mon Oct 19 19:22:11 2015 -0500 Remove trailing whitespace, fixing lint. commit e6c72c6 Merge: 2094d80 2caa4b8 Author: ashercodeorg <asher@code.org> Date: Mon Oct 19 19:18:03 2015 -0500 Merge pull request #4632 from code-dot-org/addPdFilter Adds filtering by PD status to the Search for Teachers page. Also adds a link to the page amid the admin links. commit 3d0685c Author: Andrew Oberhardt <Andrew@Code.org> Date: Mon Oct 19 17:15:08 2015 -0700 Abandon emails on SMTP syntax and fatal errors commit 2094d80 Author: Continuous Integration <dev@code.org> Date: Mon Oct 19 23:57:45 2015 +0000 Automatically built. commit 9ee9c07 Merge: 5dcbd2f e519c2a Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:50:25 2015 -0700 Merge pull request #4639 from code-dot-org/ie9linting [Finishes #105262598] use main thread if we dont support workers commit 5dcbd2f Merge: a62e8f4 5105709 Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:48:05 2015 -0700 Merge pull request #4602 from code-dot-org/add2home [Finishes #105726826] make add2home work again commit 9ee9c07 Merge: 5dcbd2f e519c2a Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:50:25 2015 -0700 Merge pull request #4639 from code-dot-org/ie9linting [Finishes #105262598] use main thread if we dont support workers commit 5dcbd2f Merge: a62e8f4 5105709 Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:48:05 2015 -0700 Merge pull request #4602 from code-dot-org/add2home [Finishes #105726826] make add2home work again commit 346c7b8 Merge: 8f45769 99e0bb7 Author: Caley Brock <caleybrock7@gmail.com> Date: Mon Oct 19 16:47:14 2015 -0700 Merge pull request #4647 from code-dot-org/hotfix Hotfix - hourofcode.com prizes updates and poster opt in removal commit 2cd6ae9 Author: Continuous Integration <dev@code.org> Date: Tue Oct 20 02:26:44 2015 +0000 Automatically built. commit 8588dff Merge: a99c54e 0df43a8 Author: Trevor Berg <trevor@code.org> Date: Mon Oct 19 19:26:36 2015 -0700 Merge pull request #4571 from code-dot-org/applab-better-script-loading Better script asset loading commit a99c54e Merge: 2b56b18 0627d81 Author: Mehal Shah <mehal@code.org> Date: Mon Oct 19 18:19:53 2015 -0700 Merge pull request #4656 from code-dot-org/fix_ie_hoc_tests Fix element does not exist step defintion so it plays nicely with int… commit 0627d81 Author: Mehal Shah <mehal@code.org> Date: Mon Oct 19 17:59:45 2015 -0700 Forgot a file commit 2b56b18 Author: Josh Lory <josh.lory@code.org> Date: Mon Oct 19 17:39:04 2015 -0700 Fix rake lint commit 013cb5c Merge: e29b83a b7be0ea Author: Josh Lory <josh.lory@code.org> Date: Mon Oct 19 17:38:04 2015 -0700 Merge branch 'test' into staging commit b7be0ea Merge: dbf4e70 346c7b8 Author: Josh Lory <josh.lory@code.org> Date: Mon Oct 19 17:37:35 2015 -0700 Merge branch 'production' into test commit e29b83a Merge: d39ecad 3d0685c Author: Andrew Oberhardt <andrew.oberhardt@gmail.com> Date: Mon Oct 19 17:27:52 2015 -0700 Merge pull request #4653 from code-dot-org/skip-email-for-deleted-workshops Added abort functionality in email templates. commit d39ecad Merge: b893265 f0b7cc7 Author: ashercodeorg <asher@code.org> Date: Mon Oct 19 19:26:18 2015 -0500 Merge pull request #4658 from code-dot-org/fixWhitespaceLintAgain Remove more whitespace, fixing lint. commit f0b7cc7 Author: Asher Kach <asher@code.org> Date: Mon Oct 19 19:25:32 2015 -0500 Remove more whitespace, fixing lint. commit b893265 Merge: d3b5660 d98df6d Author: Caley Brock <caleybrock7@gmail.com> Date: Mon Oct 19 17:24:09 2015 -0700 Merge pull request #4619 from code-dot-org/download-button Css for download button commit d3b5660 Merge: e6c72c6 4e68182 Author: ashercodeorg <asher@code.org> Date: Mon Oct 19 19:23:10 2015 -0500 Merge pull request #4657 from code-dot-org/fixWhitespaceLint Remove trailing whitespace, fixing lint. commit 4e68182 Author: Asher Kach <asher@code.org> Date: Mon Oct 19 19:22:11 2015 -0500 Remove trailing whitespace, fixing lint. commit e6c72c6 Merge: 2094d80 2caa4b8 Author: ashercodeorg <asher@code.org> Date: Mon Oct 19 19:18:03 2015 -0500 Merge pull request #4632 from code-dot-org/addPdFilter Adds filtering by PD status to the Search for Teachers page. Also adds a link to the page amid the admin links. commit 3d0685c Author: Andrew Oberhardt <Andrew@Code.org> Date: Mon Oct 19 17:15:08 2015 -0700 Abandon emails on SMTP syntax and fatal errors commit 2094d80 Author: Continuous Integration <dev@code.org> Date: Mon Oct 19 23:57:45 2015 +0000 Automatically built. commit 9ee9c07 Merge: 5dcbd2f e519c2a Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:50:25 2015 -0700 Merge pull request #4639 from code-dot-org/ie9linting [Finishes #105262598] use main thread if we dont support workers commit 5dcbd2f Merge: a62e8f4 5105709 Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:48:05 2015 -0700 Merge pull request #4602 from code-dot-org/add2home [Finishes #105726826] make add2home work again commit 9ee9c07 Merge: 5dcbd2f e519c2a Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:50:25 2015 -0700 Merge pull request #4639 from code-dot-org/ie9linting [Finishes #105262598] use main thread if we dont support workers commit 5dcbd2f Merge: a62e8f4 5105709 Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:48:05 2015 -0700 Merge pull request #4602 from code-dot-org/add2home [Finishes #105726826] make add2home work again commit 346c7b8 Merge: 8f45769 99e0bb7 Author: Caley Brock <caleybrock7@gmail.com> Date: Mon Oct 19 16:47:14 2015 -0700 Merge pull request #4647 from code-dot-org/hotfix Hotfix - hourofcode.com prizes updates and poster opt in removal

commit 0be7400 Merge: 34f325d 31e7377 Author: Josh Lory <josh.lory@code.org> Date: Tue Oct 20 10:46:46 2015 -0700 Merge pull request #4594 from code-dot-org/server-generated-channels [Finishes #90626454] Server generated project channels commit 34f325d Merge: 067b728 c4aa30b Author: Will Jordan <wjordan@users.noreply.github.com> Date: Tue Oct 20 07:39:04 2015 -1000 Merge pull request #4655 from code-dot-org/bundle-exec-assets add bundle exec to rake assets:precompile commit c4aa30b Author: Will Jordan <will@code.org> Date: Mon Oct 19 16:09:46 2015 +0000 add bundle exec to rake assets:precompile commit 31e7377 Merge: aafaea0 067b728 Author: Josh Lory <josh.lory@code.org> Date: Tue Oct 20 10:01:01 2015 -0700 Merge branch 'staging' into server-generated-channels Conflicts: dashboard/test/ui/features/projects.feature commit 067b728 Author: Continuous Integration <dev@code.org> Date: Tue Oct 20 15:55:02 2015 +0000 Staging post-build content changes (bbuchanan) commit d0d2f7e Merge: 7088f68 179289a Author: Brad Buchanan <bradley.c.buchanan@gmail.com> Date: Tue Oct 20 08:44:31 2015 -0700 Merge pull request #4664 from code-dot-org/levelbuilder DTS (levelbuilder => staging) commit 179289a Author: Continuous Integration <dev@code.org> Date: Tue Oct 20 15:43:26 2015 +0000 Levelbuilder post-build content changes (bbuchanan) commit 53ad1cd Merge: 55faf4b 7088f68 Author: Brad Buchanan <bradley.c.buchanan@gmail.com> Date: Tue Oct 20 08:07:35 2015 -0700 Merge pull request #4663 from code-dot-org/staging DTL (staging => levelbuilder) commit 55faf4b Author: Continuous Integration <dev@code.org> Date: Tue Oct 20 15:04:01 2015 +0000 Levelbuilder content changes (bbuchanan) commit 7088f68 Author: Continuous Integration <dev@code.org> Date: Tue Oct 20 15:02:35 2015 +0000 Staging content changes (bbuchanan) commit 59a6d90 Author: Continuous Integration <dev@code.org> Date: Tue Oct 20 03:20:46 2015 +0000 Automatically built. commit c971985 Merge: 525a55a 026a2c7 Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 20:16:35 2015 -0700 Merge pull request #4646 from code-dot-org/setSizeBlock [Finishes #105889014] new setSize block for applab commit 525a55a Author: Continuous Integration <dev@code.org> Date: Tue Oct 20 02:59:49 2015 +0000 Automatically built. commit 1568252 Merge: 1d46da8 bb87616 Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 19:54:40 2015 -0700 Merge pull request #4643 from code-dot-org/promptNum [Finishes #105888952] new promptNum block commit 1d46da8 Author: Continuous Integration <dev@code.org> Date: Tue Oct 20 02:30:47 2015 +0000 Automatically built. commit 8588dff Merge: a99c54e 0df43a8 Author: Trevor Berg <trevor@code.org> Date: Mon Oct 19 19:26:36 2015 -0700 Merge pull request #4571 from code-dot-org/applab-better-script-loading Better script asset loading commit a99c54e Merge: 2b56b18 0627d81 Author: Mehal Shah <mehal@code.org> Date: Mon Oct 19 18:19:53 2015 -0700 Merge pull request #4656 from code-dot-org/fix_ie_hoc_tests Fix element does not exist step defintion so it plays nicely with int… commit 0627d81 Author: Mehal Shah <mehal@code.org> Date: Mon Oct 19 17:59:45 2015 -0700 Forgot a file commit 2b56b18 Author: Josh Lory <josh.lory@code.org> Date: Mon Oct 19 17:39:04 2015 -0700 Fix rake lint commit 013cb5c Merge: e29b83a b7be0ea Author: Josh Lory <josh.lory@code.org> Date: Mon Oct 19 17:38:04 2015 -0700 Merge branch 'test' into staging commit b7be0ea Merge: dbf4e70 346c7b8 Author: Josh Lory <josh.lory@code.org> Date: Mon Oct 19 17:37:35 2015 -0700 Merge branch 'production' into test commit e29b83a Merge: d39ecad 3d0685c Author: Andrew Oberhardt <andrew.oberhardt@gmail.com> Date: Mon Oct 19 17:27:52 2015 -0700 Merge pull request #4653 from code-dot-org/skip-email-for-deleted-workshops Added abort functionality in email templates. commit d39ecad Merge: b893265 f0b7cc7 Author: ashercodeorg <asher@code.org> Date: Mon Oct 19 19:26:18 2015 -0500 Merge pull request #4658 from code-dot-org/fixWhitespaceLintAgain Remove more whitespace, fixing lint. commit f0b7cc7 Author: Asher Kach <asher@code.org> Date: Mon Oct 19 19:25:32 2015 -0500 Remove more whitespace, fixing lint. commit b893265 Merge: d3b5660 d98df6d Author: Caley Brock <caleybrock7@gmail.com> Date: Mon Oct 19 17:24:09 2015 -0700 Merge pull request #4619 from code-dot-org/download-button Css for download button commit d3b5660 Merge: e6c72c6 4e68182 Author: ashercodeorg <asher@code.org> Date: Mon Oct 19 19:23:10 2015 -0500 Merge pull request #4657 from code-dot-org/fixWhitespaceLint Remove trailing whitespace, fixing lint. commit 4e68182 Author: Asher Kach <asher@code.org> Date: Mon Oct 19 19:22:11 2015 -0500 Remove trailing whitespace, fixing lint. commit e6c72c6 Merge: 2094d80 2caa4b8 Author: ashercodeorg <asher@code.org> Date: Mon Oct 19 19:18:03 2015 -0500 Merge pull request #4632 from code-dot-org/addPdFilter Adds filtering by PD status to the Search for Teachers page. Also adds a link to the page amid the admin links. commit 3d0685c Author: Andrew Oberhardt <Andrew@Code.org> Date: Mon Oct 19 17:15:08 2015 -0700 Abandon emails on SMTP syntax and fatal errors commit 2094d80 Author: Continuous Integration <dev@code.org> Date: Mon Oct 19 23:57:45 2015 +0000 Automatically built. commit 9ee9c07 Merge: 5dcbd2f e519c2a Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:50:25 2015 -0700 Merge pull request #4639 from code-dot-org/ie9linting [Finishes #105262598] use main thread if we dont support workers commit 5dcbd2f Merge: a62e8f4 5105709 Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:48:05 2015 -0700 Merge pull request #4602 from code-dot-org/add2home [Finishes #105726826] make add2home work again commit 9ee9c07 Merge: 5dcbd2f e519c2a Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:50:25 2015 -0700 Merge pull request #4639 from code-dot-org/ie9linting [Finishes #105262598] use main thread if we dont support workers commit 5dcbd2f Merge: a62e8f4 5105709 Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:48:05 2015 -0700 Merge pull request #4602 from code-dot-org/add2home [Finishes #105726826] make add2home work again commit 346c7b8 Merge: 8f45769 99e0bb7 Author: Caley Brock <caleybrock7@gmail.com> Date: Mon Oct 19 16:47:14 2015 -0700 Merge pull request #4647 from code-dot-org/hotfix Hotfix - hourofcode.com prizes updates and poster opt in removal commit 2cd6ae9 Author: Continuous Integration <dev@code.org> Date: Tue Oct 20 02:26:44 2015 +0000 Automatically built. commit 8588dff Merge: a99c54e 0df43a8 Author: Trevor Berg <trevor@code.org> Date: Mon Oct 19 19:26:36 2015 -0700 Merge pull request #4571 from code-dot-org/applab-better-script-loading Better script asset loading commit a99c54e Merge: 2b56b18 0627d81 Author: Mehal Shah <mehal@code.org> Date: Mon Oct 19 18:19:53 2015 -0700 Merge pull request #4656 from code-dot-org/fix_ie_hoc_tests Fix element does not exist step defintion so it plays nicely with int… commit 0627d81 Author: Mehal Shah <mehal@code.org> Date: Mon Oct 19 17:59:45 2015 -0700 Forgot a file commit 2b56b18 Author: Josh Lory <josh.lory@code.org> Date: Mon Oct 19 17:39:04 2015 -0700 Fix rake lint commit 013cb5c Merge: e29b83a b7be0ea Author: Josh Lory <josh.lory@code.org> Date: Mon Oct 19 17:38:04 2015 -0700 Merge branch 'test' into staging commit b7be0ea Merge: dbf4e70 346c7b8 Author: Josh Lory <josh.lory@code.org> Date: Mon Oct 19 17:37:35 2015 -0700 Merge branch 'production' into test commit e29b83a Merge: d39ecad 3d0685c Author: Andrew Oberhardt <andrew.oberhardt@gmail.com> Date: Mon Oct 19 17:27:52 2015 -0700 Merge pull request #4653 from code-dot-org/skip-email-for-deleted-workshops Added abort functionality in email templates. commit d39ecad Merge: b893265 f0b7cc7 Author: ashercodeorg <asher@code.org> Date: Mon Oct 19 19:26:18 2015 -0500 Merge pull request #4658 from code-dot-org/fixWhitespaceLintAgain Remove more whitespace, fixing lint. commit f0b7cc7 Author: Asher Kach <asher@code.org> Date: Mon Oct 19 19:25:32 2015 -0500 Remove more whitespace, fixing lint. commit b893265 Merge: d3b5660 d98df6d Author: Caley Brock <caleybrock7@gmail.com> Date: Mon Oct 19 17:24:09 2015 -0700 Merge pull request #4619 from code-dot-org/download-button Css for download button commit d3b5660 Merge: e6c72c6 4e68182 Author: ashercodeorg <asher@code.org> Date: Mon Oct 19 19:23:10 2015 -0500 Merge pull request #4657 from code-dot-org/fixWhitespaceLint Remove trailing whitespace, fixing lint. commit 4e68182 Author: Asher Kach <asher@code.org> Date: Mon Oct 19 19:22:11 2015 -0500 Remove trailing whitespace, fixing lint. commit e6c72c6 Merge: 2094d80 2caa4b8 Author: ashercodeorg <asher@code.org> Date: Mon Oct 19 19:18:03 2015 -0500 Merge pull request #4632 from code-dot-org/addPdFilter Adds filtering by PD status to the Search for Teachers page. Also adds a link to the page amid the admin links. commit 3d0685c Author: Andrew Oberhardt <Andrew@Code.org> Date: Mon Oct 19 17:15:08 2015 -0700 Abandon emails on SMTP syntax and fatal errors commit 2094d80 Author: Continuous Integration <dev@code.org> Date: Mon Oct 19 23:57:45 2015 +0000 Automatically built. commit 9ee9c07 Merge: 5dcbd2f e519c2a Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:50:25 2015 -0700 Merge pull request #4639 from code-dot-org/ie9linting [Finishes #105262598] use main thread if we dont support workers commit 5dcbd2f Merge: a62e8f4 5105709 Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:48:05 2015 -0700 Merge pull request #4602 from code-dot-org/add2home [Finishes #105726826] make add2home work again commit 9ee9c07 Merge: 5dcbd2f e519c2a Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:50:25 2015 -0700 Merge pull request #4639 from code-dot-org/ie9linting [Finishes #105262598] use main thread if we dont support workers commit 5dcbd2f Merge: a62e8f4 5105709 Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:48:05 2015 -0700 Merge pull request #4602 from code-dot-org/add2home [Finishes #105726826] make add2home work again commit 346c7b8 Merge: 8f45769 99e0bb7 Author: Caley Brock <caleybrock7@gmail.com> Date: Mon Oct 19 16:47:14 2015 -0700 Merge pull request #4647 from code-dot-org/hotfix Hotfix - hourofcode.com prizes updates and poster opt in removal commit c971985 Merge: 525a55a 026a2c7 Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 20:16:35 2015 -0700 Merge pull request #4646 from code-dot-org/setSizeBlock [Finishes #105889014] new setSize block for applab commit 525a55a Author: Continuous Integration <dev@code.org> Date: Tue Oct 20 02:59:49 2015 +0000 Automatically built. commit 1568252 Merge: 1d46da8 bb87616 Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 19:54:40 2015 -0700 Merge pull request #4643 from code-dot-org/promptNum [Finishes #105888952] new promptNum block commit 1d46da8 Author: Continuous Integration <dev@code.org> Date: Tue Oct 20 02:30:47 2015 +0000 Automatically built. commit 8588dff Merge: a99c54e 0df43a8 Author: Trevor Berg <trevor@code.org> Date: Mon Oct 19 19:26:36 2015 -0700 Merge pull request #4571 from code-dot-org/applab-better-script-loading Better script asset loading commit a99c54e Merge: 2b56b18 0627d81 Author: Mehal Shah <mehal@code.org> Date: Mon Oct 19 18:19:53 2015 -0700 Merge pull request #4656 from code-dot-org/fix_ie_hoc_tests Fix element does not exist step defintion so it plays nicely with int… commit 0627d81 Author: Mehal Shah <mehal@code.org> Date: Mon Oct 19 17:59:45 2015 -0700 Forgot a file commit 2b56b18 Author: Josh Lory <josh.lory@code.org> Date: Mon Oct 19 17:39:04 2015 -0700 Fix rake lint commit 013cb5c Merge: e29b83a b7be0ea Author: Josh Lory <josh.lory@code.org> Date: Mon Oct 19 17:38:04 2015 -0700 Merge branch 'test' into staging commit b7be0ea Merge: dbf4e70 346c7b8 Author: Josh Lory <josh.lory@code.org> Date: Mon Oct 19 17:37:35 2015 -0700 Merge branch 'production' into test commit e29b83a Merge: d39ecad 3d0685c Author: Andrew Oberhardt <andrew.oberhardt@gmail.com> Date: Mon Oct 19 17:27:52 2015 -0700 Merge pull request #4653 from code-dot-org/skip-email-for-deleted-workshops Added abort functionality in email templates. commit d39ecad Merge: b893265 f0b7cc7 Author: ashercodeorg <asher@code.org> Date: Mon Oct 19 19:26:18 2015 -0500 Merge pull request #4658 from code-dot-org/fixWhitespaceLintAgain Remove more whitespace, fixing lint. commit f0b7cc7 Author: Asher Kach <asher@code.org> Date: Mon Oct 19 19:25:32 2015 -0500 Remove more whitespace, fixing lint. commit b893265 Merge: d3b5660 d98df6d Author: Caley Brock <caleybrock7@gmail.com> Date: Mon Oct 19 17:24:09 2015 -0700 Merge pull request #4619 from code-dot-org/download-button Css for download button commit d3b5660 Merge: e6c72c6 4e68182 Author: ashercodeorg <asher@code.org> Date: Mon Oct 19 19:23:10 2015 -0500 Merge pull request #4657 from code-dot-org/fixWhitespaceLint Remove trailing whitespace, fixing lint. commit 4e68182 Author: Asher Kach <asher@code.org> Date: Mon Oct 19 19:22:11 2015 -0500 Remove trailing whitespace, fixing lint. commit e6c72c6 Merge: 2094d80 2caa4b8 Author: ashercodeorg <asher@code.org> Date: Mon Oct 19 19:18:03 2015 -0500 Merge pull request #4632 from code-dot-org/addPdFilter Adds filtering by PD status to the Search for Teachers page. Also adds a link to the page amid the admin links. commit 3d0685c Author: Andrew Oberhardt <Andrew@Code.org> Date: Mon Oct 19 17:15:08 2015 -0700 Abandon emails on SMTP syntax and fatal errors commit 2094d80 Author: Continuous Integration <dev@code.org> Date: Mon Oct 19 23:57:45 2015 +0000 Automatically built. commit 9ee9c07 Merge: 5dcbd2f e519c2a Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:50:25 2015 -0700 Merge pull request #4639 from code-dot-org/ie9linting [Finishes #105262598] use main thread if we dont support workers commit 5dcbd2f Merge: a62e8f4 5105709 Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:48:05 2015 -0700 Merge pull request #4602 from code-dot-org/add2home [Finishes #105726826] make add2home work again commit 9ee9c07 Merge: 5dcbd2f e519c2a Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:50:25 2015 -0700 Merge pull request #4639 from code-dot-org/ie9linting [Finishes #105262598] use main thread if we dont support workers commit 5dcbd2f Merge: a62e8f4 5105709 Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:48:05 2015 -0700 Merge pull request #4602 from code-dot-org/add2home [Finishes #105726826] make add2home work again commit 346c7b8 Merge: 8f45769 99e0bb7 Author: Caley Brock <caleybrock7@gmail.com> Date: Mon Oct 19 16:47:14 2015 -0700 Merge pull request #4647 from code-dot-org/hotfix Hotfix - hourofcode.com prizes updates and poster opt in removal commit 2cd6ae9 Author: Continuous Integration <dev@code.org> Date: Tue Oct 20 02:26:44 2015 +0000 Automatically built. commit 8588dff Merge: a99c54e 0df43a8 Author: Trevor Berg <trevor@code.org> Date: Mon Oct 19 19:26:36 2015 -0700 Merge pull request #4571 from code-dot-org/applab-better-script-loading Better script asset loading commit a99c54e Merge: 2b56b18 0627d81 Author: Mehal Shah <mehal@code.org> Date: Mon Oct 19 18:19:53 2015 -0700 Merge pull request #4656 from code-dot-org/fix_ie_hoc_tests Fix element does not exist step defintion so it plays nicely with int… commit 0627d81 Author: Mehal Shah <mehal@code.org> Date: Mon Oct 19 17:59:45 2015 -0700 Forgot a file commit 2b56b18 Author: Josh Lory <josh.lory@code.org> Date: Mon Oct 19 17:39:04 2015 -0700 Fix rake lint commit 013cb5c Merge: e29b83a b7be0ea Author: Josh Lory <josh.lory@code.org> Date: Mon Oct 19 17:38:04 2015 -0700 Merge branch 'test' into staging commit b7be0ea Merge: dbf4e70 346c7b8 Author: Josh Lory <josh.lory@code.org> Date: Mon Oct 19 17:37:35 2015 -0700 Merge branch 'production' into test commit e29b83a Merge: d39ecad 3d0685c Author: Andrew Oberhardt <andrew.oberhardt@gmail.com> Date: Mon Oct 19 17:27:52 2015 -0700 Merge pull request #4653 from code-dot-org/skip-email-for-deleted-workshops Added abort functionality in email templates. commit d39ecad Merge: b893265 f0b7cc7 Author: ashercodeorg <asher@code.org> Date: Mon Oct 19 19:26:18 2015 -0500 Merge pull request #4658 from code-dot-org/fixWhitespaceLintAgain Remove more whitespace, fixing lint. commit f0b7cc7 Author: Asher Kach <asher@code.org> Date: Mon Oct 19 19:25:32 2015 -0500 Remove more whitespace, fixing lint. commit b893265 Merge: d3b5660 d98df6d Author: Caley Brock <caleybrock7@gmail.com> Date: Mon Oct 19 17:24:09 2015 -0700 Merge pull request #4619 from code-dot-org/download-button Css for download button commit d3b5660 Merge: e6c72c6 4e68182 Author: ashercodeorg <asher@code.org> Date: Mon Oct 19 19:23:10 2015 -0500 Merge pull request #4657 from code-dot-org/fixWhitespaceLint Remove trailing whitespace, fixing lint. commit 4e68182 Author: Asher Kach <asher@code.org> Date: Mon Oct 19 19:22:11 2015 -0500 Remove trailing whitespace, fixing lint. commit e6c72c6 Merge: 2094d80 2caa4b8 Author: ashercodeorg <asher@code.org> Date: Mon Oct 19 19:18:03 2015 -0500 Merge pull request #4632 from code-dot-org/addPdFilter Adds filtering by PD status to the Search for Teachers page. Also adds a link to the page amid the admin links. commit 3d0685c Author: Andrew Oberhardt <Andrew@Code.org> Date: Mon Oct 19 17:15:08 2015 -0700 Abandon emails on SMTP syntax and fatal errors commit 2094d80 Author: Continuous Integration <dev@code.org> Date: Mon Oct 19 23:57:45 2015 +0000 Automatically built. commit 9ee9c07 Merge: 5dcbd2f e519c2a Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:50:25 2015 -0700 Merge pull request #4639 from code-dot-org/ie9linting [Finishes #105262598] use main thread if we dont support workers commit 5dcbd2f Merge: a62e8f4 5105709 Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:48:05 2015 -0700 Merge pull request #4602 from code-dot-org/add2home [Finishes #105726826] make add2home work again commit 9ee9c07 Merge: 5dcbd2f e519c2a Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:50:25 2015 -0700 Merge pull request #4639 from code-dot-org/ie9linting [Finishes #105262598] use main thread if we dont support workers commit 5dcbd2f Merge: a62e8f4 5105709 Author: Bjvanminnen <Bjvanminnen@gmail.com> Date: Mon Oct 19 16:48:05 2015 -0700 Merge pull request #4602 from code-dot-org/add2home [Finishes #105726826] make add2home work again commit 346c7b8 Merge: 8f45769 99e0bb7 Author: Caley Brock <caleybrock7@gmail.com> Date: Mon Oct 19 16:47:14 2015 -0700 Merge pull request #4647 from code-dot-org/hotfix Hotfix - hourofcode.com prizes updates and poster opt in removal

islemaster added 10 commits October 14, 2015 14:15

Initial move of dependency selection/adding script tags back into Das…

31da1a3

…hboard.

Make farmer.feature more reliable.

752f2a3

Make 'I close the dialog' safer, and use it in contractExamples.feature

873fbf8

Disable digest for built apps, let rails handle them as assets instead.

e903874

Add needed wait on artist project share test.

00be415

Add public/blockly to the Rails asset paths.

01001e2

Use is_droplet helper variable.

e2421a7

Make code that modifies stylesheet accept fingerprinted version.

ebb1001

Remove dead code in Gruntfile.

10fb7ea

islemaster assigned trevorb Oct 14, 2015

Bjvanminnen reviewed Oct 14, 2015
View reviewed changes

islemaster added 2 commits October 14, 2015 16:45

Remove unused functions in loadApp.

c749776

Remove digest steps from Gruntfile

09e676d

islemaster reviewed Oct 15, 2015
View reviewed changes

Restore embed_blocks functionality, remove dependency on loadApp.

38dbdfa

islemaster added 2 commits October 15, 2015 13:04

Missed rename

6cdf1da

islemaster reviewed Oct 16, 2015
View reviewed changes

Merge remote-tracking branch 'origin/staging' into applab-better-scri…

3399420

…pt-loading

Merge remote-tracking branch 'origin/staging' into applab-better-scri…

0df43a8

…pt-loading Conflicts: dashboard/app/helpers/levels_helper.rb dashboard/test/ui/features/farmer.feature

trevorb pushed a commit that referenced this pull request Oct 20, 2015

Merge pull request #4571 from code-dot-org/applab-better-script-loading

8588dff

Better script asset loading

trevorb merged commit 8588dff into staging Oct 20, 2015

islemaster deleted the applab-better-script-loading branch November 3, 2015 20:55

islemaster mentioned this pull request Sep 1, 2016

Unify webpack bundles #10404

Merged

6 tasks

Uh oh!

Conversation

islemaster commented Oct 14, 2015

Overview

Benefits

Test Coverage

TODO

Uh oh!

bcjordan commented Oct 14, 2015

Uh oh!

islemaster commented Oct 14, 2015

Uh oh!

joshlory commented Oct 14, 2015

Uh oh!

Bjvanminnen Oct 14, 2015

Choose a reason for hiding this comment

Uh oh!

joshlory Oct 14, 2015

Choose a reason for hiding this comment

Uh oh!

islemaster commented Oct 14, 2015

Uh oh!

islemaster Oct 15, 2015

Choose a reason for hiding this comment

Uh oh!

joshlory commented Oct 15, 2015

Uh oh!

islemaster Oct 15, 2015

Choose a reason for hiding this comment

Uh oh!

islemaster commented Oct 15, 2015

Uh oh!

islemaster commented Oct 15, 2015

Uh oh!

islemaster commented Oct 15, 2015

Uh oh!

islemaster commented Oct 15, 2015

Uh oh!

islemaster commented Oct 15, 2015

Uh oh!

islemaster Oct 16, 2015

Choose a reason for hiding this comment

Uh oh!

trevorb commented Oct 16, 2015

Uh oh!

islemaster commented Oct 16, 2015

Uh oh!

islemaster commented Oct 16, 2015

Uh oh!

joshlory commented Oct 19, 2015

Uh oh!

islemaster commented Oct 19, 2015

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants