Skip to content

Merge branch 'stable7.1'#8486

Merged
eanders-ms merged 54 commits intomasterfrom
eanders/master/merge-stable7.1
Sep 13, 2021
Merged

Merge branch 'stable7.1'#8486
eanders-ms merged 54 commits intomasterfrom
eanders/master/merge-stable7.1

Conversation

@eanders-ms
Copy link
Contributor

Merging stable7.1 to master.

shakao and others added 30 commits August 11, 2021 16:36
* Rest finishedActivityState when opening new activity (#8387)

* Null check for header when saving, posting tutorial progress (#8389)

* Don't unload/reload skillmap graph, reduces jittering (#8390)
* Don't write the contents of nonexistent files (#8392)

* Don't use telemetry item before it's declared (#8393)
… iframe (#8405)

* Don't run sim in background when no project is loaded in the skillmap iframe

* Don't reload header when exiting skillmp tutorial

* Remove post progress
Co-authored-by: Eric Anderson <eanders@microsoft.com>
* Fix hang in monaco by making regex more specific

* cleanup
* on signin, transfer local projects to cloud

* pr feedback and refinements
* cloud status wip

* reflect cloud status on info panel

* removed unneeded property

* show cloud status on skillmap view

* pr feedback and refinements
…ud (#8456)

* Make copies of local projects when importing skillmap progress to cloud

* cleanup

* PR feedback

* always request all header cloud status
@eanders-ms eanders-ms requested a review from abchatra September 10, 2021 15:34
@eanders-ms
Copy link
Contributor Author

I'll keep this open until we're done working in stable7.1.

@abchatra
Copy link
Collaborator

Merge to master & bump?

@eanders-ms
Copy link
Contributor Author

Sure, will do that shortly.

@eanders-ms
Copy link
Contributor Author

PR needs sign off.

@eanders-ms eanders-ms merged commit 685fdbd into master Sep 13, 2021
@eanders-ms eanders-ms deleted the eanders/master/merge-stable7.1 branch September 13, 2021 20:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants