Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Update circuit playground discount code applications for 2020 #32179

Merged
merged 35 commits into from Dec 21, 2019
Merged

Update circuit playground discount code applications for 2020 #32179

merged 35 commits into from Dec 21, 2019

Commits on Nov 12, 2019

  1. Set high needs bar to 50%

    @bencodeorg
    bencodeorg committed Nov 12, 2019
    Copy the full SHA
    b127918 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2019

  1. Merge branch 'staging' into update-circuit-playground-discount-codes

    @bencodeorg
    bencodeorg committed Nov 19, 2019
    Copy the full SHA
    8efab7e View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2019

  1. Non-i18n String changes for 19-20 Adafruit discount codes

    @bencodeorg
    bencodeorg committed Nov 25, 2019
    Copy the full SHA
    21413d9 View commit details
    Browse the repository at this point in the history

  2. More i18n updates for Adafruit discount codes

    @bencodeorg
    bencodeorg committed Nov 25, 2019
    Copy the full SHA
    4880ad5 View commit details
    Browse the repository at this point in the history

  3. Add option for discount code with shipping to Alaska and Hawaii

    @bencodeorg
    bencodeorg committed Nov 25, 2019
    Copy the full SHA
    310e549 View commit details
    Browse the repository at this point in the history

  4. Correct logic for discount codes with and without shipping

    @bencodeorg
    bencodeorg committed Nov 25, 2019
    Copy the full SHA
    3cc3cd3 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2019

  1. Check for teacher attendance at Q4 workshop

    @bencodeorg
    bencodeorg committed Nov 27, 2019
    Copy the full SHA
    8e8fdba View commit details
    Browse the repository at this point in the history

  2. Model changes to check for Q4 workshop attendance for discount code e… 

    …ligibility
    @bencodeorg
    bencodeorg committed Nov 27, 2019
    Copy the full SHA
    21e19ac View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2019

  1. Check Unit 6 intention appropriately

    @bencodeorg
    bencodeorg committed Dec 3, 2019
    Copy the full SHA
    26d49b4 View commit details
    Browse the repository at this point in the history

  2. Consistent variable naming in discount application model

    @bencodeorg
    bencodeorg committed Dec 3, 2019
    Copy the full SHA
    278ebd3 View commit details
    Browse the repository at this point in the history

  3. Make long string prettier

    @bencodeorg
    bencodeorg committed Dec 3, 2019
    Copy the full SHA
    0c9ea08 View commit details
    Browse the repository at this point in the history

  4. Update tests to cover 2020 discount code application requirements

    @bencodeorg
    bencodeorg committed Dec 3, 2019
    Copy the full SHA
    6c0535d View commit details
    Browse the repository at this point in the history

  5. Update storybook components for 2020 discount codes

    @bencodeorg
    bencodeorg committed Dec 3, 2019
    Copy the full SHA
    0402a4d View commit details
    Browse the repository at this point in the history

  6. Update apps tests

    @bencodeorg
    bencodeorg committed Dec 3, 2019
    Copy the full SHA
    8e8e0e2 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2019

  1. More apps test updates for 2020 discount codes

    @bencodeorg
    bencodeorg committed Dec 4, 2019
    Copy the full SHA
    411d349 View commit details
    Browse the repository at this point in the history

  2. Update discount logic apps test

    @bencodeorg
    bencodeorg committed Dec 4, 2019
    Copy the full SHA
    7d03566 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2019

  1. Fix more dashboard discount code tests

    @bencodeorg
    bencodeorg committed Dec 5, 2019
    Copy the full SHA
    a2b4791 View commit details
    Browse the repository at this point in the history

  2. Fix school tests to account for new high needs bar

    @bencodeorg
    bencodeorg committed Dec 5, 2019
    Copy the full SHA
    1d89206 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2019

  1. Fix enum in circuit playground discount application

    @bencodeorg
    bencodeorg committed Dec 6, 2019
    Copy the full SHA
    de64b40 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2019

  1. Attendance at virtual workshop 8 counts for discount eligibility

    @bencodeorg
    bencodeorg committed Dec 9, 2019
    Copy the full SHA
    c2d691d View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2019

  1. Add string to alert AK/HI teachers about shipping

    @bencodeorg
    bencodeorg committed Dec 11, 2019
    Copy the full SHA
    92d8727 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2019

  1. Separate discount code type from school eligibility

    @bencodeorg
    bencodeorg committed Dec 13, 2019
    Copy the full SHA
    3a8e9e6 View commit details
    Browse the repository at this point in the history

  2. Give full discount to teachers in Alaska and Hawaii

    @bencodeorg
    bencodeorg committed Dec 13, 2019
    Copy the full SHA
    2f858df View commit details
    Browse the repository at this point in the history

  3. Remove unnecessary new language about AK/HI

    @bencodeorg
    bencodeorg committed Dec 13, 2019
    Copy the full SHA
    e573d65 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2019

  1. Keep old options in enum for Unit 6 intention responses

    @bencodeorg
    bencodeorg committed Dec 14, 2019
    Copy the full SHA
    3568e5c View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2019

  1. Use refute instead of assert_equal for false test 

    Co-Authored-By: Brad Buchanan <brad@code.org>
    @bencodeorg @islemaster
    bencodeorg and islemaster committed Dec 17, 2019
    Copy the full SHA
    ef1c2ea View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2019

  1. Require workshop subject when checking PD eligibility

    @bencodeorg
    bencodeorg committed Dec 18, 2019
    Copy the full SHA
    b55117b View commit details
    Browse the repository at this point in the history

  2. String update for 2020

    @bencodeorg
    bencodeorg committed Dec 18, 2019
    Copy the full SHA
    58d0f22 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2019

  1. Merge branch 'staging' into update-circuit-playground-discount-codes

    @bencodeorg
    bencodeorg committed Dec 19, 2019
    Copy the full SHA
    68fbb17 View commit details
    Browse the repository at this point in the history

  2. Pull commit made via GitHub UI

    @bencodeorg
    bencodeorg committed Dec 19, 2019
    Copy the full SHA
    9a40301 View commit details
    Browse the repository at this point in the history

  3. Add documentation to check on PD attendance method

    @bencodeorg
    bencodeorg committed Dec 19, 2019
    Copy the full SHA
    a7d307b View commit details
    Browse the repository at this point in the history

  4. Update storybooks and JS unit tests

    @bencodeorg
    bencodeorg committed Dec 19, 2019
    Copy the full SHA
    0b53924 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2019

  1. Update factories and tests for maker controller updates

    @bencodeorg
    bencodeorg committed Dec 20, 2019
    Copy the full SHA
    1c4d7a5 View commit details
    Browse the repository at this point in the history

  2. Allow application status check for application with no school

    @bencodeorg
    bencodeorg committed Dec 20, 2019
    Copy the full SHA
    0098b70 View commit details
    Browse the repository at this point in the history

  3. Merge staging

    @bencodeorg
    bencodeorg committed Dec 20, 2019
    Copy the full SHA
    582465b View commit details
    Browse the repository at this point in the history