Skip to content

[Finishes #105726826] make add2home work again - #4602

Merged
Bjvanminnen merged 1 commit into
stagingfrom
add2home
Oct 19, 2015
Merged

[Finishes #105726826] make add2home work again#4602
Bjvanminnen merged 1 commit into
stagingfrom
add2home

Conversation

@Bjvanminnen

@Bjvanminnen Bjvanminnen commented Oct 15, 2015

Copy link
Copy Markdown
Contributor

We have some JS code that gives you a little prompt to add to your home screen on mobile safari. There were two issues with this:
(1) it wasn't being called for project-based shares
(2) our user agent code wasnt considering mobile safari to be safari

@joshlory

joshlory commented Oct 19, 2015

Copy link
Copy Markdown
Contributor

Sorry for taking so long to get to this. LGTM 👍

As a nit, you could maybe find somewhere to dedup the JS snippet. But it's a small enough amount of code it's probably fine to duplicate.

Bjvanminnen added a commit that referenced this pull request Oct 19, 2015
@Bjvanminnen
Merge pull request #4602 from code-dot-org/add2home
5dcbd2f 
[Finishes #105726826] make add2home work again
@Bjvanminnen
Bjvanminnen merged commit 5dcbd2f into staging Oct 19, 2015
@Bjvanminnen
Bjvanminnen deleted the add2home branch October 19, 2015 23:48
deploy-code-org added a commit that referenced this pull request Oct 19, 2015
@deploy-code-org
Automatically built.
2094d80 
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
deploy-code-org added a commit that referenced this pull request Oct 20, 2015
@deploy-code-org
Automatically built.
2cd6ae9 
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
deploy-code-org added a commit that referenced this pull request Oct 20, 2015
@deploy-code-org
Automatically built.
1d46da8 
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
deploy-code-org added a commit that referenced this pull request Oct 20, 2015
@deploy-code-org
Automatically built.
525a55a 
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
deploy-code-org added a commit that referenced this pull request Oct 20, 2015
@deploy-code-org
Automatically built.
59a6d90 
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
deploy-code-org added a commit that referenced this pull request Oct 20, 2015
@deploy-code-org
Automatically built.
4c3c62b 
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
@Hamms Hamms mentioned this pull request Aug 13, 2026
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@joshlory joshlory

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Bjvanminnen @joshlory