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 upstream #2

Merged
merged 45 commits into from
Jun 20, 2020
Merged

Merge upstream #2

merged 45 commits into from
Jun 20, 2020

Conversation

hariszaman
Copy link
Owner

Thank you for submitting a pull request, your contributions are greatly appreciated!

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

Please make sure you've run the test scheme and all the tests pass. If your changes affect existing tests please make sure to update the tests as well.

isabelrios and others added 30 commits May 22, 2020 19:22
add screenshot tests and IDs for the new buttons

add comment and use ids

fix sync int tests
…6683)

* For  #6652 - Follow up fix XCUITests after FxA navigation bar change

* fix more tests

* more fixes
* Fix #6687: QR pairing in China uses different url
Part 1: cleanup getting the china setting

* Part 2: Fix actual bug

* swift lint fixup

* Use getPairingAuthorityURL
* Fix Screenshots tests

* remove print
* Set up Glean delete ping and build scripts
Adding waitForExistence(app.textFields[address])
…cy-safe (#6724)

* Fix #6721: FxAcountManger crash filling deferred 2x, make re-entrancy-safe

* Unrelated: fix warning about this unused code being unsafe
…iling to start Leanplum (#6727)

- Added option in debug menu to reset ETP Constants and show cover sheet
* Add docs for glean testing walkthrough

* reduce example tag character count
* Fix #6708 : [Today Widget] Update current widget strings/colours

* title of today widget changed
* Update buttons
* Update button colors and strings
* Update widget title string
* Ensure colors change correctly for dark mode
* edited gradient colors names + code styling fixes
* [nobug, cleanup] Rename blacklist to blocklist
* rename whitelist to safelist
@hariszaman hariszaman merged commit e02ab5a into hariszaman:master Jun 20, 2020
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.