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.

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

Merge Release/1.10.0 into develop #1689

Merged
merged 5 commits into from
Nov 4, 2019
Merged

Merge Release/1.10.0 into develop #1689

merged 5 commits into from
Nov 4, 2019

Conversation

loremattei
Copy link
Contributor

Merge Release/1.10.0 into develop

belcherj and others added 5 commits October 28, 2019 11:04
Added the beta version for 1.10.0-beta1 release
* Only run notesLoaded when notes are indeed loaded

After querying the noteBucket we run notes loaded with an empty notes array. This causes havoc because we rely on notes being null until notes are loaded. This commit adds a check to ensure there is at least one note before running notesLoaded

* Add release notes

* Update RELEASE-NOTES.txt
Props to @loremattei for creating these changes
@loremattei loremattei requested a review from belcherj November 4, 2019 16:23
Copy link
Member

@dmsnell dmsnell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please squash-and-merge if you are willing!

If you require that #1680 appear separate in the develop history then go ahead and regular-merge it.

@belcherj belcherj merged commit a52ad14 into develop Nov 4, 2019
@belcherj belcherj deleted the release/1.10.0 branch November 4, 2019 18:44
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.

3 participants