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

DTT (Staging > Test) [robo-dtt] #37131

Merged
merged 101 commits into from Oct 8, 2020
Merged

DTT (Staging > Test) [robo-dtt] #37131

merged 101 commits into from Oct 8, 2020

Conversation

deploy-code-org
Copy link
Contributor

No description provided.

bethanyaconnor and others added 30 commits September 22, 2020 21:14
@bethanyaconnor
First step in moving the workshop map to mapbox
5fc87a6
@bethanyaconnor
Merge branch 'staging' into replace-workshop-map-with-mapbox
64678b6
@davidsbailey
add activity and activity section data to lesson edit response
a8e0e1a
@davidsbailey
display activities on lesson edit page
2c59498
@davidsbailey
display activity sections on lesson edit page
48ab4a7
@davidsbailey
include activities in form post data
29a290d
@davidsbailey
update lesson activity attributes
7e3a1f8
@davidsbailey
update activity section attributes
59c275b
@davidsbailey
delete any activities or activity sections which are removed from the…
725c5b2 
… list
@davidsbailey
add missing param to update_activity_sections comments
1e98412
@bethanyaconnor
Add popup functionality back
2ac8724
@davidsbailey
rename title to name in LessonActivity and ActivitySection edit/updat…
97526ca 
…e paths
@bethanyaconnor
Add popup functionality back
6f6b886
@bethanyaconnor
Merge branch 'staging' into replace-workshop-map-with-mapbox
8a38cfe
@bethanyaconnor
Add Mapbox geocoder
69579c1
@bethanyaconnor
Merge branch 'replace-workshop-map-with-mapbox' of github.com:code-do…
e75b4fe 
…t-org/code-dot-org into replace-workshop-map-with-mapbox
@davidsbailey
guard against missing activities on lesson update
d8cfa63
@davidsbailey
expand lesson integration tests to include activity data
e8ff803
@davidsbailey
fixup - change title to name in activity section model
f868928
@davidsbailey
make lesson integration tests include activity sections
afc8bfd
@davidsbailey
Lesson#summarize_editable_data
8b7c13d
@bethanyaconnor
Use google markers to denote places on the map
e69cab8
@bethanyaconnor
Code cleanup
f7c0719
@davidsbailey
move update_activity_sections into LessonActivity
76f86c9
@davidsbailey
move update_activities into Lesson
ab7ee8a
@bethanyaconnor
Add clusters
5e06192
@bethanyaconnor
Add map controls and don't zoom automatically
4523080
@davidsbailey
test creating an activity via lesson update
19d3400
@davidsbailey
test remove activity via lesson update
d869698
@davidsbailey
test that you can add an activity section via lesson update
d7e1ea2
deploy-code-org and others added 28 commits October 7, 2020 00:53
@deploy-code-org
blockly i18n updates
9e1fdea
@deploy-code-org
animation library i18n updates
661b344
@deploy-code-org
hoc i18n updates
0f8246e
@deploy-code-org
codeorg-markdown i18n updates
981dd01
@Hamms
Merge branch 'staging' into i18n-sync-down-out-10-07-2020
06b8a96
@hacodeorg
Fix bad translation
340e38f
@ajpal
Revert "Revert "[Google Blockly] Add context menu for levelbuilders""
de1e266
@ajpal
initialize canDisconnectFromParent_, don't empty contextMenu
82d1026
@Hamms
fix some more broken translations
9fe080a
@JillianK
moved things into React component
a7296f2
@JillianK
renamed variable
e3ba5d2
@JillianK
actually made props required
2c08a4c
@Hamms
re-sync unsynced translation
63e1c57
@davidsbailey
fix comment about real activity data
71c9f2e
@Hamms
Merge pull request #37105 from code-dot-org/i18n-sync-down-out-10-07-…
dce3c27 
…2020

I18n sync Down & Out 10/07
@molly-moen
fix up logic
0e1eb45
@molly-moen
Merge remote-tracking branch 'origin/staging' into teacher-homepage-e…
81fa831 
…ditable
@JillianK
split react component and moved file
10a7b3f
@dmcavoy
Look at response to make sure includes Any owner instead of only bein…
91b11a3 
…g Any owner
@breville
Volunteer: show the sidebar for local & remote volunteer pages
60f5ad5 
And a bunch of code to make the whole experience apparently work on both pages.
@molly-moen
Merge pull request #37128 from code-dot-org/teacher-homepage-editable
2fd2759 
Teacher Homepage: Clean up banner logic
@breville
Merge pull request #37081 from code-dot-org/use-mapbox-for-volunteer-…
c017857 
…maps

Maps: Use Mapbox for volunteer maps
@bethanyaconnor
Merge pull request #36936 from code-dot-org/replace-workshop-map-with…
6a94c71 
…-mapbox

Optionally view workshop map with Mapbox
@davidsbailey
Merge pull request #36935 from code-dot-org/edit-activity-data
3b506ba 
Add activities + sections to lesson edit and update APIs
@JillianK
Merge pull request #37073 from code-dot-org/jk-mapbox-local
93b1015 
Local CS Classes Map to Mapbox
@jmkulwik
Merge pull request #37068 from code-dot-org/fix-dotd-script
1e3ffe5 
Allow spaces and special characters in the DOTD name in the #developers channel
@ajpal
Merge pull request #37110 from code-dot-org/revert-37088-revert-37072…
54a2c58 
…-oct2-contextMenu

Revert "Revert "[Google Blockly] Add context menu for levelbuilders""
@dmcavoy
Merge pull request #37129 from code-dot-org/fitler-test-fix
dd18feb 
Fix test_should_get_filters in levels_controller_test
@deploy-code-org deploy-code-org requested a review from a team as a code owner October 8, 2020 18:14
@deploy-code-org deploy-code-org merged commit 9ad27e5 into test Oct 8, 2020
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