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

DTL (Test > Levelbuilder): d81da2be #23871

Merged
merged 142 commits into from Jul 23, 2018
Merged

DTL (Test > Levelbuilder): d81da2be #23871

merged 142 commits into from Jul 23, 2018

Conversation

deploy-code-org
Copy link
Contributor

No description provided.

maddiedierker and others added 30 commits July 13, 2018 10:17
@maddiedierker
Treat teacher with no students as student in DeleteAccountDialog
8d7e396
@maddiedierker
Merge branch 'p2-account-deletion' into hide-warnings-with-no-students
e5b7ddb
@maddiedierker
Rename isTeacher prop to warnAboutDeletingStudents for clarity
c23ca45
@mehalshah
Add regional_partner_filter to workshops. This was done by combining …
76e8d7e 
…reducers
@mehalshah
Fix broken test
d9c17f1
@mehalshah
Remove console.log
a648944
@joshlory
Allow the default block pool to be overriden
5d29aa2
@joshlory
Allow custom sub-types to be specified
fc4d3c9
Move displayed date. Set textarea value to be latest.
41e5a23
Fix bug editing feedback. Update button text.
2a174fe
Fix bug editing feedback. Update button text.
5e04405
Merge branch 'feedback-tab-teacher-update-behavior' of github.com:cod…
85591f1 
…e-dot-org/code-dot-org into feedback-tab-teacher-update-behavior
@caleybrock
Refactor getCurrentQuestion to return an object
ba0c572
@caleybrock
Send answer data to the detail view
8d3c120
Es6-ify component and remove unused prop
19e7a62
@joshlory
Rename level_type -> pool on Block, allow multiple pools per level
971817e
@joshlory
Merge branch 'staging' into override-default-block-pool
2c02b2b
Updated set style syntax
96aea67
@caleybrock
Show answers in dialog without any styling
4fffdc8
Merge branch 'pane-header-es6' into feedback-tab-teacher-update-behavior
6cbcc7e
Fix style warnings
ea8cdf2
@joshlory
Select custom pool option by default, for new blocks
053cde5
@joshlory
Pool should be specified for each block, not for whole block creator
081dcd2
@caleybrock
Style multiple choice dialog
1ccfba6
@caleybrock
Prevent errors and filter by multi
03e6383
@caleybrock
Update tests with answers
434239e
@caleybrock
Update names to make them more clear
df741ff
@joshlory
Generalize custom block install for any pool
bba6b7b
@joshlory
When editing a block, changing the pool should update the block name
5eed576
@joshlory
Add Library model and migration for app-specific helper libraries
bdcc899
joshlory and others added 28 commits July 21, 2018 15:24
@joshlory
No-op migration
8fe5409
@deploy-code-org
Update schema cache dump after schema changes.
8cdf257
@deploy-code-org
Update schema cache round-trip task
d890528
@joshlory
Merge pull request #23852 from code-dot-org/staging
abf26cf 
DTT
@deploy-code-org
Move schema cache round-trip earlier, before git add
dafccf9
@deploy-code-org
New schema version from no-op migration
acb3efe
@joshlory
Merge pull request #23853 from code-dot-org/staging
db9715d 
DTT
@joshlory
Merge pull request #23816 from code-dot-org/sprite-lab-editable-helpe…
61eaa58 
…r-libraries

Add Library model and migration for app-specific helper libraries
@joshlory
Merge branch 'staging' into libraries-controller
9210506
@deploy-code-org
Update schema cache dump after schema changes.
b4154eb
@joshlory
Add a dropdown w/ Helper Library options on GameLab level edit pages
ce3f296
@joshlory
Make helper library list editable in Level Builder
df67f6c
@joshlory
Fix column name (:contents -> :content on libraries table)
2458d3b
@joshlory
Show current helper libraries as an option, even if they don't exist
7fa8afa 
Need this to be able to round-trip levels before the corresponding Library objects are seeded.
@deploy-code-org
Merge pull request #23855 from code-dot-org/staging
db0fb0b 
DTT (Staging > Test) [robo-dtt]
Fix cronjob to run actually once on Monday instead of every minute. A…
c2934d3 
…lso exit early from only_one_running [ci skip]
@aoby
Merge pull request #23856 from code-dot-org/fix-cron-schedule
d96fe6c 
Fix cronjob to run actually once on Monday instead of every minute. A…
@deploy-code-org
Updated cookbook versions
5611805
@deploy-code-org
Merge pull request #23857 from code-dot-org/staging
49d2787 
DTT (Staging > Test) [robo-dtt]
@joshlory
Merge pull request #23854 from code-dot-org/helper-library-dropdown-o…
b573042 
…n-level-edit-page

Helper library dropdown on level edit page
@joshlory
Merge pull request #23821 from code-dot-org/libraries-controller
a7e9382 
Add Library controller, views, and seed
@deploy-code-org
Update schema cache dump after schema changes.
0548ebe
Merge pull request #23841 from code-dot-org/es6-collapser-with-teache…
cf3900a 
…r-style

ES6 collapserIcon and teacher-blue style
@deploy-code-org
Merge pull request #23858 from code-dot-org/staging
0653eb0 
DTT (Staging > Test) [robo-dtt]
@aoby
Merge pull request #23844 from code-dot-org/fix-post-course-survey-error
9b7122f 
Fix missing form_id error on post course surveys
Merge pull request #23859 from code-dot-org/hide-warnings-with-no-stu…
0a7e6ff 
…dents

Hide warnings with no students
@aoby
Merge pull request #23843 from code-dot-org/jotform-question-sync-fix
0cce38d 
Force sync JotForm questions once per form when filling placeholders fails
@deploy-code-org
Merge pull request #23865 from code-dot-org/staging
d81da2b 
DTT (Staging > Test) [robo-dtt]
@deploy-code-org deploy-code-org merged commit 2a24a56 into levelbuilder Jul 23, 2018
@balderdash balderdash deleted the dtl_candidate_d81da2be branch September 18, 2018 06:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@deploy-code-org @maddiedierker @mehalshah @joshlory @caleybrock @davidsbailey @wjordan @balderdash @islemaster @aoby