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

DTP (Test > Production: b46fe9ef) #23676

Merged
merged 163 commits into from
Jul 12, 2018
Merged

DTP (Test > Production: b46fe9ef) #23676

Changes from all commits
Commits
Show all changes
163 commits
Select commit Hold shift + click to select a range
de55076
Sample data generation
Jul 6, 2018
2428893
Fix typo in comment
Jul 6, 2018
a637f50
Revert "Revert "Add 2018 courses to k5_course? helper""
Hamms Jul 4, 2018
f62990c
add congrats page test
Hamms Jul 4, 2018
2458a32
move has_congrats_page? helper to ScriptConstants so it's accessible …
Hamms Jul 4, 2018
6629634
enable congrats pages for express courses
Hamms Jul 5, 2018
0787923
typo fix
Hamms Jul 5, 2018
bf47903
express course should graduate to the same thing you get upon complet…
Hamms Jul 5, 2018
b2cdb77
dashboard i18n sync
deploy-code-org Jul 9, 2018
790f865
pegasus i18n sync
deploy-code-org Jul 9, 2018
7baf9fb
apps i18n sync
deploy-code-org Jul 9, 2018
4a34144
PR feedback
Jul 9, 2018
d7d5212
getting workshop date from teachers_trained_temp instead of csf_works…
marybarnes37 Jul 9, 2018
9d5c865
correct csf script ids
marybarnes37 Jul 9, 2018
b4206a9
merge staging
marybarnes37 Jul 9, 2018
4ce2874
Implement `setProcedureParameters` for behaviors
joshlory Jul 10, 2018
7070190
pegasus i18n updates
deploy-code-org Jul 10, 2018
897e0b4
dashboard i18n updates - Arabic
deploy-code-org Jul 10, 2018
b6c9b0c
dashboard i18n updates - Azerbaijani
deploy-code-org Jul 10, 2018
bf86981
dashboard i18n updates - Bulgarian
deploy-code-org Jul 10, 2018
d4e43c2
dashboard i18n updates - Bengali
deploy-code-org Jul 10, 2018
972d0f7
dashboard i18n updates - Bosnian
deploy-code-org Jul 10, 2018
00cfd77
dashboard i18n updates - Catalan
deploy-code-org Jul 10, 2018
8a3815c
dashboard i18n updates - Corsican
deploy-code-org Jul 10, 2018
cd27489
dashboard i18n updates - Czech
deploy-code-org Jul 10, 2018
4422d5e
dashboard i18n updates - Danish
deploy-code-org Jul 10, 2018
a8bab43
dashboard i18n updates - German
deploy-code-org Jul 10, 2018
5405645
dashboard i18n updates - Greek
deploy-code-org Jul 10, 2018
81bdca0
dashboard i18n updates - English, United Kingdom
deploy-code-org Jul 10, 2018
545bd10
dashboard i18n updates - Spanish
deploy-code-org Jul 10, 2018
3daf584
dashboard i18n updates - Spanish, Mexico
deploy-code-org Jul 10, 2018
887031d
dashboard i18n updates - Estonian
deploy-code-org Jul 10, 2018
6c038fd
dashboard i18n updates - Basque
deploy-code-org Jul 10, 2018
993ffcd
dashboard i18n updates - Dari
deploy-code-org Jul 10, 2018
11c086b
dashboard i18n updates - Persian
deploy-code-org Jul 10, 2018
ad4c4a9
dashboard i18n updates - Finnish
deploy-code-org Jul 10, 2018
2c28151
dashboard i18n updates - Filipino
deploy-code-org Jul 10, 2018
f32c426
dashboard i18n updates - French
deploy-code-org Jul 10, 2018
4ce7f84
dashboard i18n updates - Irish
deploy-code-org Jul 10, 2018
43241d1
dashboard i18n updates - Galician
deploy-code-org Jul 10, 2018
f8faf72
dashboard i18n updates - Hawaiian
deploy-code-org Jul 10, 2018
07870bf
dashboard i18n updates - Hebrew
deploy-code-org Jul 10, 2018
1c1bea5
dashboard i18n updates - Hindi
deploy-code-org Jul 10, 2018
2fc744e
dashboard i18n updates - Croatian
deploy-code-org Jul 10, 2018
a065f0b
dashboard i18n updates - Hungarian
deploy-code-org Jul 10, 2018
f279d7b
dashboard i18n updates - Armenian
deploy-code-org Jul 10, 2018
3ad6dc4
dashboard i18n updates - Indonesian
deploy-code-org Jul 10, 2018
bec476f
dashboard i18n updates - Icelandic
deploy-code-org Jul 10, 2018
59be4f6
dashboard i18n updates - Italian
deploy-code-org Jul 10, 2018
1c30a04
dashboard i18n updates - Japanese
deploy-code-org Jul 10, 2018
3fdda5d
dashboard i18n updates - Georgian
deploy-code-org Jul 10, 2018
9109ff1
dashboard i18n updates - Kazakh
deploy-code-org Jul 10, 2018
6a08607
dashboard i18n updates - Khmer
deploy-code-org Jul 10, 2018
8a80c12
dashboard i18n updates - Korean
deploy-code-org Jul 10, 2018
2f847f2
dashboard i18n updates - Kurdish
deploy-code-org Jul 10, 2018
5814635
dashboard i18n updates - Kyrgyz
deploy-code-org Jul 10, 2018
0a6849f
dashboard i18n updates - Lithuanian
deploy-code-org Jul 10, 2018
7608cb5
dashboard i18n updates - Latvian
deploy-code-org Jul 10, 2018
fc9f5a8
dashboard i18n updates - Maori
deploy-code-org Jul 10, 2018
defd69d
dashboard i18n updates - Macedonian (FYROM)
deploy-code-org Jul 10, 2018
e0843fa
dashboard i18n updates - Marathi
deploy-code-org Jul 10, 2018
4c02906
dashboard i18n updates - Malay
deploy-code-org Jul 10, 2018
e587e3c
dashboard i18n updates - Maltese
deploy-code-org Jul 10, 2018
a0277f0
dashboard i18n updates - Burmese
deploy-code-org Jul 10, 2018
b5fbce2
dashboard i18n updates - Nepali
deploy-code-org Jul 10, 2018
850d571
dashboard i18n updates - Dutch
deploy-code-org Jul 10, 2018
332dc41
dashboard i18n updates - Norwegian Nynorsk
deploy-code-org Jul 10, 2018
e352986
dashboard i18n updates - Norwegian
deploy-code-org Jul 10, 2018
e3cd02f
dashboard i18n updates - Polish
deploy-code-org Jul 10, 2018
9eaf8e4
dashboard i18n updates - Pashto
deploy-code-org Jul 10, 2018
47a2208
dashboard i18n updates - Portuguese, Brazilian
deploy-code-org Jul 10, 2018
d53276d
dashboard i18n updates - Portuguese
deploy-code-org Jul 10, 2018
48774af
dashboard i18n updates - Romanian
deploy-code-org Jul 10, 2018
776e878
dashboard i18n updates - Russian
deploy-code-org Jul 10, 2018
4f7af58
dashboard i18n updates - Northern Sami
deploy-code-org Jul 10, 2018
6a3278e
dashboard i18n updates - Sinhala
deploy-code-org Jul 10, 2018
b42d89d
dashboard i18n updates - Slovak
deploy-code-org Jul 10, 2018
1f4f159
dashboard i18n updates - Slovenian
deploy-code-org Jul 10, 2018
03584eb
dashboard i18n updates - Albanian
deploy-code-org Jul 10, 2018
8aa7021
dashboard i18n updates - Serbian (Cyrillic)
deploy-code-org Jul 10, 2018
24963d1
dashboard i18n updates - Swedish
deploy-code-org Jul 10, 2018
a73f13e
dashboard i18n updates - Tamil
deploy-code-org Jul 10, 2018
31efda6
dashboard i18n updates - Telugu
deploy-code-org Jul 10, 2018
602cb46
dashboard i18n updates - Tajik
deploy-code-org Jul 10, 2018
e9e2fa9
dashboard i18n updates - Thai
deploy-code-org Jul 10, 2018
9dd46a9
dashboard i18n updates - Turkish
deploy-code-org Jul 10, 2018
af0b027
dashboard i18n updates - Ukrainian
deploy-code-org Jul 10, 2018
813ad83
dashboard i18n updates - Urdu (Pakistan)
deploy-code-org Jul 10, 2018
eb61387
dashboard i18n updates - Uzbek
deploy-code-org Jul 10, 2018
86e9258
dashboard i18n updates - Vietnamese
deploy-code-org Jul 10, 2018
1b798cc
dashboard i18n updates - Chinese Simplified
deploy-code-org Jul 10, 2018
66c70c9
dashboard i18n updates - Chinese Traditional
deploy-code-org Jul 10, 2018
3ee9c4b
dashboard i18n updates - Zulu
deploy-code-org Jul 10, 2018
dd7146e
apps i18n updates
deploy-code-org Jul 10, 2018
db979b5
Fix violations of rubocop Rails/Presence.
asherkach Jul 10, 2018
833d89d
Reenable rubocop Rails/Presence.
asherkach Jul 10, 2018
604465c
escape uri for course names with spaces
Hamms Jul 10, 2018
6b00909
Add DeleteAccount placeholder component, replace rails content
maddiedierker Jul 10, 2018
25245e5
Add type prop to BootstrapButton to handle 'danger' buttons
maddiedierker Jul 10, 2018
5b28064
Add codegen for `gamelab_behavior_get` extra params
joshlory Jul 10, 2018
e316e01
Implement `mutationToDom` and `domToMutation` for behavior blocks
joshlory Jul 10, 2018
8913701
Add basic dialog with warning information
maddiedierker Jul 10, 2018
f8df2a3
Add dialog fields and style
maddiedierker Jul 11, 2018
62315e5
Add password/deleteVerification to state and validate
maddiedierker Jul 11, 2018
a733116
one of the course names in the hoc category is nil, for some reason, …
Hamms Jul 11, 2018
3a7df65
Fix type hints in IE & Safari
joshlory Jul 11, 2018
83072e5
Click the topmost element when opening Blockly dropdowns
joshlory Jul 11, 2018
885693c
Re-enable spritelab.feature for all browsers
joshlory Jul 11, 2018
dacaca5
Merge branch 'staging' into new-student-deletion-flow
maddiedierker Jul 11, 2018
90be7f9
Use absolute path because cron jobs execute as root.
sureshc Jul 11, 2018
747ab8c
Move state from DeleteAccountDialog to DeleteAccount component
maddiedierker Jul 11, 2018
2aeff75
Cookie banner: add a border to the top
breville Jul 11, 2018
eed4f4d
Refactor registrations#destroy to validate password if required
maddiedierker Jul 11, 2018
b4768fc
Update comment for clarity
maddiedierker Jul 11, 2018
87db2b6
Merge branch 'refactor-user-destroy' into new-student-deletion-flow
maddiedierker Jul 11, 2018
e6402c0
Remove temporary JotForm transition code, no longer needed
Jul 11, 2018
ccd0f74
Add password error to user and return model errors in destroy method
maddiedierker Jul 11, 2018
d095bbd
Merge branch 'refactor-user-destroy' into new-student-deletion-flow
maddiedierker Jul 11, 2018
5fc041e
ConfirmRemoveStudentDialog takes a studentName
islemaster Jul 11, 2018
43c0ebb
Add error handling
maddiedierker Jul 11, 2018
24447a2
Reset state to default state on modal open/close
maddiedierker Jul 11, 2018
1882c77
ManageStudentsTable.story.jsx uses withReduxStore addon
islemaster Jul 11, 2018
720f1de
Remove password field for users who don't have passwords
maddiedierker Jul 11, 2018
fce0fb0
levelbuilder content changes (-robo-commit)
deploy-code-org Jul 11, 2018
c66cdad
Pass student name down to ConfirmRemoveStudentDialog
islemaster Jul 11, 2018
b0f4ba2
Code review feedback
Jul 11, 2018
2fb2b53
Merge pull request #23648 from code-dot-org/dtl_candidate_daa41e9c
deploy-code-org Jul 11, 2018
6d5846d
Test DeleteAccount and DeleteAccountDialog integration
maddiedierker Jul 11, 2018
c12dc76
Simplify setState in onFailure
maddiedierker Jul 11, 2018
a1d97d1
Merge pull request #23636 from code-dot-org/refactor-user-destroy
Jul 11, 2018
c57c822
Merge pull request #23640 from code-dot-org/jotform-remove-transition…
aoby Jul 11, 2018
b88d570
Merge pull request #23646 from code-dot-org/withReduxStore
islemaster Jul 11, 2018
5ebbf5f
removed comment/notes to self
marybarnes37 Jul 11, 2018
1084eb3
Merge branch 'staging' into rp_redshift_updates
marybarnes37 Jul 11, 2018
ceec947
Merge pull request #23600 from code-dot-org/rp_redshift_updates
marybarnes37 Jul 11, 2018
2f947b5
Merge pull request #23622 from code-dot-org/behavior-params
joshlory Jul 11, 2018
da4d761
Add a prop for whether students depend on this section for login
islemaster Jul 11, 2018
7dceaff
Implement PR feedback
maddiedierker Jul 11, 2018
b883944
Merge pull request #23635 from code-dot-org/cookie-banner-top-border
breville Jul 11, 2018
221daf8
Merge pull request #23649 from code-dot-org/remove-student-with-name
islemaster Jul 11, 2018
a5cae9b
Merge pull request #23558 from code-dot-org/sample_data
Jul 11, 2018
8331cce
Merge pull request #23655 from code-dot-org/staging
deploy-code-org Jul 11, 2018
8c7fb73
Add depends_on_this_section_for_login to GET /sections/<id>/students
islemaster Jul 12, 2018
a2f7ef3
Pass dependency information down to dialog
islemaster Jul 12, 2018
def8a65
Merge pull request #23608 from asherkach/rubocop-rails-presence
balderdash Jul 12, 2018
b388e32
Merge pull request #23656 from code-dot-org/staging
deploy-code-org Jul 12, 2018
a5d2d4b
Merge pull request #23633 from code-dot-org/fix-restart-server-cron-job
sureshc Jul 12, 2018
c2dc110
Merge pull request #23658 from code-dot-org/staging
deploy-code-org Jul 12, 2018
9bd4709
Merge pull request #23652 from code-dot-org/remove-student-check-pers…
islemaster Jul 12, 2018
cff4406
Merge pull request #23627 from code-dot-org/fix-sprite-lab-ui-test
joshlory Jul 12, 2018
fff27de
Merge pull request #23651 from code-dot-org/new-student-deletion-flow
Jul 12, 2018
cc5908e
Merge pull request #23660 from code-dot-org/staging
deploy-code-org Jul 12, 2018
7b2080a
Merge pull request #23513 from code-dot-org/revert-23510-revert-23465…
Hamms Jul 12, 2018
ce164a7
Merge pull request #23602 from code-dot-org/i18n-sync-down-out-07-10
Hamms Jul 12, 2018
e53e375
Merge pull request #23588 from code-dot-org/i18n-sync-in-up-07-09
Hamms Jul 12, 2018
49c8a5e
levelbuilder content changes (-robo-commit)
deploy-code-org Jul 12, 2018
3447993
staging content changes (-robo-commit)
deploy-code-org Jul 12, 2018
f6603b3
Merge pull request #23662 from code-dot-org/levelbuilder
deploy-code-org Jul 12, 2018
80c3f17
Update dsls.en.yml
deploy-code-org Jul 12, 2018
5714002
Merge pull request #23664 from code-dot-org/staging
deploy-code-org Jul 12, 2018
c2efbfa
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into s…
deploy-code-org Jul 12, 2018
535f815
staging content changes (-)
deploy-code-org Jul 12, 2018
b46fe9e
Merge pull request #23669 from code-dot-org/staging
deploy-code-org Jul 12, 2018

Sorry, this diff is taking too long to generate.

It may be too large to display on GitHub.