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): 164a617a #37405

Merged
merged 77 commits into from
Oct 22, 2020
Merged

DTL (Test > Levelbuilder): 164a617a #37405

merged 77 commits into from
Oct 22, 2020

Conversation

deploy-code-org
Copy link
Contributor

No description provided.

Erin Peach and others added 30 commits September 23, 2020 15:34
Include microbit in portScanning
da7ec6b
Add microbit to detectCorrectFirmware
ea8b688
Add microbit to detecting board type
b1cdace
Merge branch 'staging' into mb-setup-page
5eebd0a
Update text for board plug in warning
24fd2f1
Update installFirmware with MB option
bb1f1cb
Specify CP boards in experiment condition
faa755c
Add check for correct microbit firmware
651ab27
Clean up unused event forwarding function
49dbbe6
@bethanyaconnor
Add more fields and add storybook to AddResourceDialog
4f80550
@bethanyaconnor
Add checkboxes
51f2e1e
@bethanyaconnor
Merge branch 'staging' into hookup-add-resource-dialog
0c0e1c5
@bethanyaconnor
Hook fields in with the state, add close/save handlers
a327b18
@bethanyaconnor
Merge branch 'staging' into hookup-add-resource-dialog
f9e0636
@bethanyaconnor
Add route to create a resource
334973c
@bethanyaconnor
Connect front end and back end
7ec2853
@bethanyaconnor
Add/fix apps tests
944a294
@bethanyaconnor
Merge branch 'staging' into hookup-add-resource-dialog
f920460
@bethanyaconnor
Fix resource model
f31fe0e
@bethanyaconnor
Fix ActivitySectionCardButtons
780f16e
@bethanyaconnor
Add AddResourceDialogTest
f4b8a27
@bethanyaconnor
Merge branch 'staging' into hookup-add-resource-dialog
87a6c5c
@bethanyaconnor
Fix storybook
775f6da
@bethanyaconnor
Consolidate AddResourceDialogTest
969b5c2
@bethanyaconnor
Fix typo
84ce089
@bethanyaconnor
Fix styling and clear error
8875dcc
@molly-moen
add per workshop csv export
4d84eb7
@daynew
Updating the Geocoder gem
6088e0f
@molly-moen
Merge remote-tracking branch 'origin/staging' into foorm-csv
c85d1fb
@molly-moen
style button
ffc1a56
dmcavoy and others added 27 commits October 21, 2020 21:08
@dmcavoy
Fix spacing around link in supported locales
d8005ea
@daynew
Merge pull request #37380 from code-dot-org/fnd-1325-fix-blank-volunt…
255ee8b 
…eer-name

Fixing blank volunteer name
@deploy-code-org
Merge pull request #37389 from code-dot-org/staging
efbe65d 
DTT (Staging > Test) [robo-dtt]
@daynew
Adding more of the mock FreeGeoIP behavior
b0a859b
@dmcavoy
Merge pull request #37386 from code-dot-org/lesson-edit-easy-wins
2c6390a 
Lesson Edit Page Clean Up
@dmcavoy
Merge pull request #37387 from code-dot-org/script-edit-easy-wins
df64fe4 
Script Edit Page Clean Up
@deploy-code-org
Merge pull request #37390 from code-dot-org/staging
8696d9a 
DTT (Staging > Test) [robo-dtt]
@molly-moen
Merge pull request #37368 from code-dot-org/foorm-csv
98dd2ca 
Foorm: Add export button for individual workshops
@deploy-code-org
Merge pull request #37391 from code-dot-org/staging
c35829f 
DTT (Staging > Test) [robo-dtt]
@daynew
Merge pull request #37192 from code-dot-org/update-geocoder-gem
a172c46 
Updating the Geocoder gem in order to pickup bug fixes
@deploy-code-org
Merge pull request #37393 from code-dot-org/staging
3238f1c 
DTT (Staging > Test) [robo-dtt]
Merge branch 'staging' into mb-setup-page
36da760
@daynew
Revert "Merge pull request #37192 from code-dot-org/update-geocoder-gem"
a4fbf71 
This reverts commit a172c46, reversing
changes made to 98dd2ca.
@daynew
Merge pull request #37394 from code-dot-org/revert-update-geocoder-gem
e625bf6 
Revert "Merge pull request #37192 from code-dot-org/update-geocoder-gem"
@deploy-code-org
Merge pull request #37395 from code-dot-org/staging
1ce9e12 
DTT (Staging > Test) [robo-dtt]
@jamescodeorg
Merge pull request #37377 from code-dot-org/jamescodeorg/fix-project-…
54fa932 
…rename-3

Add check to send only strings with more than 2 words to the geocoder
@davidsbailey
Merge pull request #37396 from code-dot-org/staging
95f5c9e 
DTT (Staging > Test) [dave]
@ajpal
add support for animation json formatting outside gamelab
ace81a2
Merge pull request #36905 from code-dot-org/mb-setup-page
47059c4 
Mb setup page
@deploy-code-org
Merge pull request #37397 from code-dot-org/staging
6979ceb 
DTT (Staging > Test) [robo-dtt]
@deploy-code-org
staging content changes (-robo-commit)
a99fffa
@deploy-code-org
Merge pull request #37399 from code-dot-org/staging
4d405a3 
DTT (Staging > Test) [robo-dtt]
@deploy-code-org
Merge pull request #37400 from code-dot-org/levelbuilder
67898e3 
DTS (Levelbuilder > Staging) [robo-dts]
@ajpal
Merge pull request #37381 from code-dot-org/oct21-spritelab-levelbuilder
1eb1927 
[Levelbuilder] Fix JS errors on level edit page
@deploy-code-org
Merge pull request #37401 from code-dot-org/staging
02ac2e7 
DTT (Staging > Test) [robo-dtt]
@bethanyaconnor
Merge pull request #37280 from code-dot-org/hookup-add-resource-dialog
72c73fc 
Add the ability to create new resources
@deploy-code-org
Merge pull request #37402 from code-dot-org/staging
164a617 
DTT (Staging > Test) [robo-dtt]
@deploy-code-org deploy-code-org requested a review from a team as a code owner October 22, 2020 22:20
@deploy-code-org deploy-code-org merged commit 109db85 into levelbuilder Oct 22, 2020
@deploy-code-org deploy-code-org deleted the dtl_candidate_164a617a branch October 22, 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
8 participants
@deploy-code-org @bethanyaconnor @molly-moen @daynew @jamescodeorg @ajpal @dmcavoy @davidsbailey