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): e56c8ff5 #36929

Merged
merged 80 commits into from Sep 25, 2020
Merged

DTL (Test > Levelbuilder): e56c8ff5 #36929

merged 80 commits into from Sep 25, 2020

Conversation

deploy-code-org
Copy link
Contributor

No description provided.

JillianK and others added 30 commits September 2, 2020 22:01
@JillianK
background logic changes
a6089c4
@JillianK
updated animationPickerBodyTest default props to have new props
acec86d
@JillianK
added animation picker module tests
aafa5c0
@JillianK
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into j…
564b444 
…k-background-logic
@JillianK
added new fields
b19ae35
@JillianK
moved over to new props
7589c8a
@JillianK
updated test props fields
7b145bc
Merge branch 'i18n-maker-setup' into i18n-maker-setup-list
4fe2677
Make string a shared constant
441dffc
i18n Chrome specific setup
7d957da
i18n unsupported browser
0705b5f
i18n Validation step names
6be1a34
Merge branch 'staging' into i18n-maker-setup-list
a57df2c
Validation steps i18n
5ac1d4e
i18n install firmata step
80b697e
@JillianK
I think I resolved comments
924b9a1
@JillianK
fixed block
c858766
@jmkulwik
Prevent progress from leaking to a logged out user
de48235
@jmkulwik
Updated tests
8443f07
@jmkulwik
Updated ui tests.
c49b892
@JillianK
made changes
bb85709
@JillianK
moved string to i18n
f516408
i18n linux steps
e660863
import correct i18n
99ce8ed
Merge branch 'staging' into i18n-maker-setup-list
a4682cf
i18n port scanning error
12763bf
@JillianK
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into j…
d5ad2f1 
…k-background-logic
@jmkulwik
Updates from Code Review comments
d80bb3c
@JillianK
resolved comments and fixed costume library behavior
70b2e77
@JillianK
fix tests
b3cef7d
jmkulwik and others added 27 commits September 24, 2020 19:31
@jmkulwik
Merge pull request #36910 from code-dot-org/stop-auto-green
f84a3b3 
Removed feature that auto updates progress when the progress changes on the server
@deploy-code-org
Merge pull request #36911 from code-dot-org/staging
52affcb 
DTT (Staging > Test) [robo-dtt]
Revert "Merge pull request #36884 from code-dot-org/activerecord-impo…
bc629d5 
…rt-upgrade-2"

This reverts commit 75cc6ca, reversing
changes made to e4bb182.
Merge pull request #36912 from code-dot-org/seed-custom-levels-perfor…
fc60e21 
…mance

Revert activerecord-import upgrade
@deploy-code-org
Merge pull request #36913 from code-dot-org/staging
e7f9719 
DTT (Staging > Test) [robo-dtt]
@davidsbailey
remove redundant self.use_transactional_test_case
c4209c5
@davidsbailey
rename activity time to duration in js
c0c6b9a
@davidsbailey
fix ActivityCardTest syntax
19cc3d6
@davidsbailey
rename Time to Duration in the activity edit UI
077f448
@davidsbailey
Merge pull request #36875 from code-dot-org/lesson-api-camelCase
24a55ec 
use camel case in lesson edit and update APIs
@davidsbailey
Merge pull request #36908 from code-dot-org/check-activity-prop-type
a9fb312 
Check activities against activityShape in activity editor redux
@deploy-code-org
Merge pull request #36916 from code-dot-org/staging
b6f44b2 
DTT (Staging > Test) [robo-dtt]
@davidsbailey
Merge branch 'staging' into activity-time-duration
50ed1e0
Css syntax cleanup
47f7cc2
@davidsbailey
Merge pull request #36914 from code-dot-org/activity-time-duration
8591ec6 
rename activity time to duration
@deploy-code-org
Merge pull request #36917 from code-dot-org/staging
8ea5256 
DTT (Staging > Test) [robo-dtt]
@JillianK
Merge pull request #36578 from code-dot-org/jk-background-logic
ef875b6 
Spritelab/Gamelab Animation Library changes for backgrounds
@deploy-code-org
Merge pull request #36919 from code-dot-org/staging
0138920 
DTT (Staging > Test) [robo-dtt]
Merge pull request #36851 from code-dot-org/mb-description
bf7194f 
Add microbit description to the maker setup page
@deploy-code-org
Merge pull request #36921 from code-dot-org/staging
8b12dea 
DTT (Staging > Test) [robo-dtt]
@deploy-code-org
staging content changes (-robo-commit)
b3a810b
@deploy-code-org
Merge pull request #36922 from code-dot-org/staging
a763c3e 
DTT (Staging > Test) [robo-dtt]
@deploy-code-org
Merge pull request #36923 from code-dot-org/levelbuilder
92d2160 
DTS (Levelbuilder > Staging) [robo-dts]
@deploy-code-org
Merge pull request #36924 from code-dot-org/staging
db80eca 
DTT (Staging > Test) [robo-dtt]
@Hamms
Merge pull request #36899 from code-dot-org/remove-codemirror-rails
82dd05b 
remove unused codemirror-rails gem
Merge pull request #36787 from code-dot-org/i18n-maker-setup-list
1aa7bca 
I18n maker setup list
@deploy-code-org
Merge pull request #36925 from code-dot-org/staging
e56c8ff 
DTT (Staging > Test) [robo-dtt]
@deploy-code-org deploy-code-org requested a review from a team as a code owner September 25, 2020 22:20
@deploy-code-org deploy-code-org merged commit 634c3a0 into levelbuilder Sep 25, 2020
@deploy-code-org deploy-code-org deleted the dtl_candidate_e56c8ff5 branch September 25, 2020 22:25
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
5 participants
@deploy-code-org @JillianK @jmkulwik @davidsbailey @Hamms