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): f5111ebd #29400

Merged
merged 101 commits into from Jun 27, 2019
Merged

DTL (Test > Levelbuilder): f5111ebd #29400

merged 101 commits into from Jun 27, 2019

Conversation

deploy-code-org
Copy link
Contributor

No description provided.

Erin Peach and others added 30 commits June 18, 2019 10:51
Placeholder function to detect device type
427530d
@Hamms
Revert "Revert "Fix dsl i18n keys""
612844e
@Hamms
0 is not falsy, so use any? instead of count to check if an array is …
70471cc 
…populated
@Hamms
add UI tests for multi level variants
6918f0b
@Hamms
typo fix
d4ce2f6
Detect playground firmware
a147891
@hacodeorg
remove deprecated base classes
7eb3a45
@hacodeorg
Use worker base class and context object
85e7e71
@hacodeorg
add shared function to worker base class, add test. add comments to c…
4f6c412 
…ontrolelr
@hacodeorg
update comments and tests
ba5b56f
@hacodeorg
fix required parameter names
557b7e3
@cpirich
Add Restore Theme Defaults button
0b02f6e
@cpirich
merge staging and upstream branch
22f0340
Refactor detectBoardType and add tests
09699b3
Check firmware after playground is ready
961277b
Check firmware after playground is ready
ec7ae02
Merge branch 'detect-maker-type' of github.com:code-dot-org/code-dot-…
58d7c95 
…org into detect-maker-type
Fix merge error
2005fa3
@cpirich
Merge branch 'cpirich/applabThemes-experiment-only-hides-ui-to-switch…
0d85c98 
…-themes' into cpirich/applab-restore-theme-defaults-button
@cpirich
require applabThemes experiment, fix color bug, add unit tests
afc48f3
Remove duplicate definition from merge
89bf499
@hacodeorg
Fix typo
e8e126b
@Erin007
use VerifiedResourcesNotification in ScriptOverviewHeader
593795a
@deploy-code-org @Hamms
sync dsls in with new layout
b272228
@Hamms
Merge branch 'staging' into revert-29148-revert-28607-fix-dsl-i18n-keys
d0518c7
@Hamms
sync dsls in with new layout
ff37e63
@Erin007
fix a tiny typo in TextResponsesTable.story file name
01cea89
@Hamms
Update user.managing_own_credentials? to consider migrated users
4de5a68 
And therefore also update password_required? and the password validation
rules to do the same.

Fixes https://codedotorg.atlassian.net/browse/FND-366
@Hamms
add helper for checking if the user is a manual user
7877ce7
@cpirich
trigger CI to re-run UI tests
c7d0e21
jmkulwik and others added 28 commits June 27, 2019 09:15
@jmkulwik
Merge pull request #29381 from code-dot-org/revert-library-pilot
444267a 
Revert library prototype
@jmkulwik
Merge remote-tracking branch 'origin/staging' into revert-list-pilot
ab8209d
@jmkulwik
Revert "Merge pull request #28411 from code-dot-org/dataset-modal"
d16fc9a 
This reverts commit 9754108, reversing
changes made to c50a11d.
@jmkulwik
Revert "Merge pull request #28235 from code-dot-org/getList-block"
161c55a 
This reverts commit 1fed4db, reversing
changes made to 6e611cc.
@bethanyaconnor
Use multiple choice answer feedback translations
3873610
@deploy-code-org
Updated cookbook versions
82ecee4
@davidsbailey
Merge pull request #29383 from code-dot-org/weblab-level-thumbnail-url
46343a1 
show thumbnail url input on weblab level editor page
@Erin007
Merge pull request #29354 from code-dot-org/test-to-text-typo
acbef15 
Fix a tiny typo in TextResponsesTable.story file name
@ajpal
Merge pull request #29374 from code-dot-org/jun26-keyPressed
e32e442 
Check condition before adding event
@ajpal
Merge branch 'staging' into jun26-fix-test
2d262c2
@ajpal
update port
156392e
@deploy-code-org
Merge pull request #29388 from code-dot-org/staging
6312169 
DTT (Staging > Test) [robo-dtt]
@ajpal
Merge pull request #29364 from code-dot-org/jun26-preview
6b8f77a 
Remove preview options from level edit page
@ajpal
Merge pull request #29366 from code-dot-org/jun26-preview-code
d52cb80 
Always show preview in spritelab
Refactor CircuitPlaygroundBoard to use port rather than port name
07c9ce3
Refactor CircuitPlaygroundBoard to use port rather than port name
3eb88e6
Merge branch 'detect-maker-type-refactor' of github.com:code-dot-org/…
8159a64 
…code-dot-org into detect-maker-type-refactor
@bethanyaconnor
Move localized_answers definition up to the top of the file
bd71eb8
@deploy-code-org
staging content changes (-robo-commit)
cc2c81e
@deploy-code-org
Merge pull request #29390 from code-dot-org/levelbuilder
d4106f6 
DTS (Levelbuilder > Staging) [robo-dts]
Merge pull request #29389 from code-dot-org/detect-maker-type-refactor
5e9c7f5 
Detect Maker Type Refactor
@deploy-code-org
Merge pull request #29391 from code-dot-org/staging
2c43ce4 
DTT (Staging > Test) [robo-dtt]
@jmkulwik
Merge pull request #29379 from code-dot-org/revert-list-pilot
cc8e7b7 
Revert dataset prototype
@deploy-code-org
Updated cookbook versions
fbea9fd
@deploy-code-org
Merge pull request #29392 from code-dot-org/staging
f82e690 
DTT (Staging > Test) [robo-dtt]
@ajpal
Merge pull request #29368 from code-dot-org/jun26-fix-test
6870249 
Fix Spritelab integration test
@bethanyaconnor
Merge pull request #29387 from code-dot-org/multiple-choice-dialog
7f29614 
Use multiple choice answer feedback translations
@deploy-code-org
Merge pull request #29396 from code-dot-org/staging
f5111eb 
DTT (Staging > Test) [robo-dtt]
@deploy-code-org deploy-code-org merged commit fe4686a into levelbuilder Jun 27, 2019
@davidsbailey davidsbailey deleted the dtl_candidate_f5111ebd branch September 6, 2019 23:26
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
9 participants
@deploy-code-org @Hamms @hacodeorg @cpirich @Erin007 @ajpal @davidsbailey @jmkulwik @bethanyaconnor