Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

DTP (Test > Production: b46fe9ef) #23676

Merged
merged 163 commits into from
Jul 12, 2018
Merged

DTP (Test > Production: b46fe9ef) #23676

merged 163 commits into from
Jul 12, 2018

Commits on Jul 6, 2018

  1. Sample data generation

    Jeremy Stone committed Jul 6, 2018
    Configuration menu
    Copy the full SHA
    de55076 View commit details
    Browse the repository at this point in the history
  2. Fix typo in comment

    Jeremy Stone committed Jul 6, 2018
    Configuration menu
    Copy the full SHA
    2428893 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2018

  1. Configuration menu
    Copy the full SHA
    a637f50 View commit details
    Browse the repository at this point in the history
  2. add congrats page test

    Hamms committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    f62990c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2458a32 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6629634 View commit details
    Browse the repository at this point in the history
  5. typo fix

    Hamms committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    0787923 View commit details
    Browse the repository at this point in the history
  6. express course should graduate to the same thing you get upon complet…

    …ion of course F, and pre-express to the same thing you get upon completion of course B
    Hamms committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    bf47903 View commit details
    Browse the repository at this point in the history
  7. dashboard i18n sync

    deploy-code-org committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    b2cdb77 View commit details
    Browse the repository at this point in the history
  8. pegasus i18n sync

    deploy-code-org committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    790f865 View commit details
    Browse the repository at this point in the history
  9. apps i18n sync

    deploy-code-org committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    7baf9fb View commit details
    Browse the repository at this point in the history
  10. PR feedback

    Jeremy Stone committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    4a34144 View commit details
    Browse the repository at this point in the history
  11. getting workshop date from teachers_trained_temp instead of csf_works…

    …hop_attedance table and distinguishing between trained_at as original training and workshop_date as any workshop attended
    marybarnes37 committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    d7d5212 View commit details
    Browse the repository at this point in the history
  12. correct csf script ids

    marybarnes37 committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    9d5c865 View commit details
    Browse the repository at this point in the history
  13. merge staging

    marybarnes37 committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    b4206a9 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2018

  1. Configuration menu
    Copy the full SHA
    4ce2874 View commit details
    Browse the repository at this point in the history
  2. pegasus i18n updates

    deploy-code-org committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    7070190 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    897e0b4 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b6c9b0c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    bf86981 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    d4e43c2 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    972d0f7 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    00cfd77 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    8a3815c View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    cd27489 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    4422d5e View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    a8bab43 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    5405645 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    81bdca0 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    545bd10 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    3daf584 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    887031d View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    6c038fd View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    993ffcd View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    11c086b View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    ad4c4a9 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    2c28151 View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    f32c426 View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    4ce7f84 View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    43241d1 View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    f8faf72 View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    07870bf View commit details
    Browse the repository at this point in the history
  28. Configuration menu
    Copy the full SHA
    1c1bea5 View commit details
    Browse the repository at this point in the history
  29. Configuration menu
    Copy the full SHA
    2fc744e View commit details
    Browse the repository at this point in the history
  30. Configuration menu
    Copy the full SHA
    a065f0b View commit details
    Browse the repository at this point in the history
  31. Configuration menu
    Copy the full SHA
    f279d7b View commit details
    Browse the repository at this point in the history
  32. Configuration menu
    Copy the full SHA
    3ad6dc4 View commit details
    Browse the repository at this point in the history
  33. Configuration menu
    Copy the full SHA
    bec476f View commit details
    Browse the repository at this point in the history
  34. Configuration menu
    Copy the full SHA
    59be4f6 View commit details
    Browse the repository at this point in the history
  35. Configuration menu
    Copy the full SHA
    1c30a04 View commit details
    Browse the repository at this point in the history
  36. Configuration menu
    Copy the full SHA
    3fdda5d View commit details
    Browse the repository at this point in the history
  37. Configuration menu
    Copy the full SHA
    9109ff1 View commit details
    Browse the repository at this point in the history
  38. Configuration menu
    Copy the full SHA
    6a08607 View commit details
    Browse the repository at this point in the history
  39. Configuration menu
    Copy the full SHA
    8a80c12 View commit details
    Browse the repository at this point in the history
  40. Configuration menu
    Copy the full SHA
    2f847f2 View commit details
    Browse the repository at this point in the history
  41. Configuration menu
    Copy the full SHA
    5814635 View commit details
    Browse the repository at this point in the history
  42. Configuration menu
    Copy the full SHA
    0a6849f View commit details
    Browse the repository at this point in the history
  43. Configuration menu
    Copy the full SHA
    7608cb5 View commit details
    Browse the repository at this point in the history
  44. Configuration menu
    Copy the full SHA
    fc9f5a8 View commit details
    Browse the repository at this point in the history
  45. Configuration menu
    Copy the full SHA
    defd69d View commit details
    Browse the repository at this point in the history
  46. Configuration menu
    Copy the full SHA
    e0843fa View commit details
    Browse the repository at this point in the history
  47. Configuration menu
    Copy the full SHA
    4c02906 View commit details
    Browse the repository at this point in the history
  48. Configuration menu
    Copy the full SHA
    e587e3c View commit details
    Browse the repository at this point in the history
  49. 1 Configuration menu
    Copy the full SHA
    a0277f0 View commit details
    Browse the repository at this point in the history
  50. Configuration menu
    Copy the full SHA
    b5fbce2 View commit details
    Browse the repository at this point in the history
  51. Configuration menu
    Copy the full SHA
    850d571 View commit details
    Browse the repository at this point in the history
  52. Configuration menu
    Copy the full SHA
    332dc41 View commit details
    Browse the repository at this point in the history
  53. Configuration menu
    Copy the full SHA
    e352986 View commit details
    Browse the repository at this point in the history
  54. Configuration menu
    Copy the full SHA
    e3cd02f View commit details
    Browse the repository at this point in the history
  55. Configuration menu
    Copy the full SHA
    9eaf8e4 View commit details
    Browse the repository at this point in the history
  56. Configuration menu
    Copy the full SHA
    47a2208 View commit details
    Browse the repository at this point in the history
  57. Configuration menu
    Copy the full SHA
    d53276d View commit details
    Browse the repository at this point in the history
  58. Configuration menu
    Copy the full SHA
    48774af View commit details
    Browse the repository at this point in the history
  59. Configuration menu
    Copy the full SHA
    776e878 View commit details
    Browse the repository at this point in the history
  60. Configuration menu
    Copy the full SHA
    4f7af58 View commit details
    Browse the repository at this point in the history
  61. Configuration menu
    Copy the full SHA
    6a3278e View commit details
    Browse the repository at this point in the history
  62. Configuration menu
    Copy the full SHA
    b42d89d View commit details
    Browse the repository at this point in the history
  63. Configuration menu
    Copy the full SHA
    1f4f159 View commit details
    Browse the repository at this point in the history
  64. Configuration menu
    Copy the full SHA
    03584eb View commit details
    Browse the repository at this point in the history
  65. Configuration menu
    Copy the full SHA
    8aa7021 View commit details
    Browse the repository at this point in the history
  66. Configuration menu
    Copy the full SHA
    24963d1 View commit details
    Browse the repository at this point in the history
  67. Configuration menu
    Copy the full SHA
    a73f13e View commit details
    Browse the repository at this point in the history
  68. Configuration menu
    Copy the full SHA
    31efda6 View commit details
    Browse the repository at this point in the history
  69. Configuration menu
    Copy the full SHA
    602cb46 View commit details
    Browse the repository at this point in the history
  70. Configuration menu
    Copy the full SHA
    e9e2fa9 View commit details
    Browse the repository at this point in the history
  71. Configuration menu
    Copy the full SHA
    9dd46a9 View commit details
    Browse the repository at this point in the history
  72. Configuration menu
    Copy the full SHA
    af0b027 View commit details
    Browse the repository at this point in the history
  73. Configuration menu
    Copy the full SHA
    813ad83 View commit details
    Browse the repository at this point in the history
  74. Configuration menu
    Copy the full SHA
    eb61387 View commit details
    Browse the repository at this point in the history
  75. Configuration menu
    Copy the full SHA
    86e9258 View commit details
    Browse the repository at this point in the history
  76. Configuration menu
    Copy the full SHA
    1b798cc View commit details
    Browse the repository at this point in the history
  77. Configuration menu
    Copy the full SHA
    66c70c9 View commit details
    Browse the repository at this point in the history
  78. Configuration menu
    Copy the full SHA
    3ee9c4b View commit details
    Browse the repository at this point in the history
  79. apps i18n updates

    deploy-code-org committed Jul 10, 2018
    Configuration menu
    Copy the full SHA
    dd7146e View commit details
    Browse the repository at this point in the history
  80. Configuration menu
    Copy the full SHA
    db979b5 View commit details
    Browse the repository at this point in the history
  81. Configuration menu
    Copy the full SHA
    833d89d View commit details
    Browse the repository at this point in the history
  82. Configuration menu
    Copy the full SHA
    604465c View commit details
    Browse the repository at this point in the history
  83. Configuration menu
    Copy the full SHA
    6b00909 View commit details
    Browse the repository at this point in the history
  84. Configuration menu
    Copy the full SHA
    25245e5 View commit details
    Browse the repository at this point in the history
  85. Configuration menu
    Copy the full SHA
    5b28064 View commit details
    Browse the repository at this point in the history
  86. Configuration menu
    Copy the full SHA
    e316e01 View commit details
    Browse the repository at this point in the history
  87. Configuration menu
    Copy the full SHA
    8913701 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2018

  1. Configuration menu
    Copy the full SHA
    f8df2a3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    62315e5 View commit details
    Browse the repository at this point in the history
  3. one of the course names in the hoc category is nil, for some reason, …

    …so skip that one in the test
    Hamms committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    a733116 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    3a7df65 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    83072e5 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    885693c View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    dacaca5 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    90be7f9 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    747ab8c View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    2aeff75 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    eed4f4d View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    b4768fc View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    87db2b6 View commit details
    Browse the repository at this point in the history
  14. Remove temporary JotForm transition code, no longer needed

    Andrew Oberhardt authored and Andrew Oberhardt committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    e6402c0 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    ccd0f74 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    d095bbd View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    5fc041e View commit details
    Browse the repository at this point in the history
  18. Add error handling

    maddiedierker committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    43c0ebb View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    24447a2 View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    1882c77 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    720f1de View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    fce0fb0 View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    c66cdad View commit details
    Browse the repository at this point in the history
  24. Code review feedback

    Jeremy Stone committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    b0f4ba2 View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    2fb2b53 View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    6d5846d View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    c12dc76 View commit details
    Browse the repository at this point in the history
  28. Merge pull request #23636 from code-dot-org/refactor-user-destroy

    Refactor registrations#destroy to validate password if required
    Madelyn Kasula committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    a1d97d1 View commit details
    Browse the repository at this point in the history
  29. Merge pull request #23640 from code-dot-org/jotform-remove-transition…

    …-code
    
    Remove temporary JotForm transition code, no longer needed
    aoby committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    c57c822 View commit details
    Browse the repository at this point in the history
  30. Merge pull request #23646 from code-dot-org/withReduxStore

    ManageStudentsTable.story.jsx uses withReduxStore addon
    islemaster committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    b88d570 View commit details
    Browse the repository at this point in the history
  31. Configuration menu
    Copy the full SHA
    5ebbf5f View commit details
    Browse the repository at this point in the history
  32. Configuration menu
    Copy the full SHA
    1084eb3 View commit details
    Browse the repository at this point in the history
  33. Merge pull request #23600 from code-dot-org/rp_redshift_updates

    Rp redshift updates
    marybarnes37 committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    ceec947 View commit details
    Browse the repository at this point in the history
  34. Merge pull request #23622 from code-dot-org/behavior-params

    Parameterized behaviors
    joshlory committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    2f947b5 View commit details
    Browse the repository at this point in the history
  35. Configuration menu
    Copy the full SHA
    da4d761 View commit details
    Browse the repository at this point in the history
  36. Implement PR feedback

    maddiedierker committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    7dceaff View commit details
    Browse the repository at this point in the history
  37. Merge pull request #23635 from code-dot-org/cookie-banner-top-border

    Cookie banner: add a border to the top
    breville committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    b883944 View commit details
    Browse the repository at this point in the history
  38. Merge pull request #23649 from code-dot-org/remove-student-with-name

    Include student's name in remove student dialog
    islemaster committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    221daf8 View commit details
    Browse the repository at this point in the history
  39. Merge pull request #23558 from code-dot-org/sample_data

    Sample data generation
    jeremydstone committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    a5cae9b View commit details
    Browse the repository at this point in the history
  40. Merge pull request #23655 from code-dot-org/staging

    DTT (Staging > Test) [robo-dtt]
    deploy-code-org committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    8331cce View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2018

  1. Configuration menu
    Copy the full SHA
    8c7fb73 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a2f7ef3 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #23608 from asherkach/rubocop-rails-presence

    Fix violations of and reenable rubocop Rails/Presence.
    balderdash committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    def8a65 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #23656 from code-dot-org/staging

    DTT (Staging > Test) [robo-dtt]
    deploy-code-org committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    b388e32 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #23633 from code-dot-org/fix-restart-server-cron-job

    Fix path in restart server cron job
    sureshc committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    a5d2d4b View commit details
    Browse the repository at this point in the history
  6. Merge pull request #23658 from code-dot-org/staging

    DTT (Staging > Test) [robo-dtt]
    deploy-code-org committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    c2dc110 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #23652 from code-dot-org/remove-student-check-pers…

    …onal-login
    
    Remove student: Customize when to show personal login help
    islemaster committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    9bd4709 View commit details
    Browse the repository at this point in the history
  8. Merge pull request #23627 from code-dot-org/fix-sprite-lab-ui-test

    Fix sprite lab UI test
    joshlory committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    cff4406 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #23651 from code-dot-org/new-student-deletion-flow

    New student deletion flow
    Madelyn Kasula committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    fff27de View commit details
    Browse the repository at this point in the history
  10. Merge pull request #23660 from code-dot-org/staging

    DTT (Staging > Test) [robo-dtt]
    deploy-code-org committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    cc5908e View commit details
    Browse the repository at this point in the history
  11. Merge pull request #23513 from code-dot-org/revert-23510-revert-23465…

    …-enable-tts-2018
    
    Revert "Revert "Add 2018 courses to k5_course? helper""
    Hamms committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    7b2080a View commit details
    Browse the repository at this point in the history
  12. Merge pull request #23602 from code-dot-org/i18n-sync-down-out-07-10

    I18n sync Down & Out 07/10
    Hamms committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    ce164a7 View commit details
    Browse the repository at this point in the history
  13. Merge pull request #23588 from code-dot-org/i18n-sync-in-up-07-09

    I18n sync In & Up 07/09
    Hamms committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    e53e375 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    49c8a5e View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    3447993 View commit details
    Browse the repository at this point in the history
  16. Merge pull request #23662 from code-dot-org/levelbuilder

    DTS (Levelbuilder > Staging) [robo-dts]
    deploy-code-org committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    f6603b3 View commit details
    Browse the repository at this point in the history
  17. Update dsls.en.yml

    deploy-code-org committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    80c3f17 View commit details
    Browse the repository at this point in the history
  18. Merge pull request #23664 from code-dot-org/staging

    DTT (Staging > Test) [robo-dtt]
    deploy-code-org committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    5714002 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    c2efbfa View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    535f815 View commit details
    Browse the repository at this point in the history
  21. Merge pull request #23669 from code-dot-org/staging

    DTT (Staging > Test) [robo-dtt]
    deploy-code-org committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    b46fe9e View commit details
    Browse the repository at this point in the history