Skip to content

Update 0.58.x to brave-ui for 0.58.x #1065

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

Merged
merged 1 commit into from
Dec 11, 2018
Merged

Update 0.58.x to brave-ui for 0.58.x #1065

merged 1 commit into from
Dec 11, 2018

Conversation

petemill
Copy link
Member

@petemill petemill commented Dec 11, 2018

Does not require uplift approval since all these PRs had uplift approval in brave-ui (probably, this new process was introduced mid-way)

Fix brave/brave-browser#2439 - Clock AM / PM font size
Use brave-ui welcome images instead of brave-core

Changes: https://github.com/brave/brave-ui/compare/5c2d8a0f669af2e9a68ce0fe38d49a116bc52315..861153d09e025ca98d6fae11bb51aa458c4d8519

* 861153d - (21 hours ago) Merge pull request #247 from brave/c71-clock-period — Pete Miller (HEAD -> brave-core-0.58.x, origin/brave-core-0.58.x)
*   4195647 - (2 hours ago) Merge pull request #316 from brave/sync-revert-58 — Pete Miller
|\
| * cad6678 - (2 hours ago) Revert "sync v2" — Cezar Augusto
| * d134401 - (2 hours ago) Revert "Merge pull request #308 from brave/sync_img" — Cezar Augusto
| * 52aef38 - (2 hours ago) Revert "allow string type for some siteBanner props" — Cezar Augusto
|/
* 5f4a8b1 - (3 hours ago) allow string type for some siteBanner props auditor: @ryanml - currentAmout, onAmountSelection and onDonate accept strings as well this is a temp fix only included in 0.58.x — Cezar Augusto
* f0569c8 - (4 days ago) do not count first letter if space in textareaclipboard — Cezar Augusto
* 69ef8be - (5 days ago) Merge pull request #308 from brave/sync_img — Cezar Augusto
* 854d181 - (3 weeks ago) sync v2 — Cezar Augusto
* b35662c - (4 days ago) update snapshot for walletSummary — Cezar Augusto
* a85206d - (5 days ago) Merge pull request #309 from brave/welcome_img — Pete Miller

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Verified that these changes build without errors on
    • Windows
    • macOS
    • Linux
  • Verified that these changes pass automated tests (npm test brave_unit_tests && npm test brave_browser_tests) on
    • Windows
    • macOS
    • Linux
  • Ran git rebase master (if needed).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Request a security/privacy review as needed.
  • Add appropriate QA labels (QA/Yes or QA/No) to include the closed issue in milestone

Test Plan:

Run web-uis

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

@petemill petemill self-assigned this Dec 11, 2018
@petemill petemill changed the title Update brave-ui for 0.58.x Update 0.58.x to brave-ui for 0.58.x Dec 11, 2018
Changes: https://github.com/brave/brave-ui/compare/5c2d8a0f669af2e9a68ce0fe38d49a116bc52315..861153d09e025ca98d6fae11bb51aa458c4d8519

```
* 861153d - (21 hours ago) Merge pull request #247 from brave/c71-clock-period — Pete Miller (HEAD -> brave-core-0.58.x, origin/brave-core-0.58.x)
*   4195647 - (2 hours ago) Merge pull request #316 from brave/sync-revert-58 — Pete Miller
|\
| * cad6678 - (2 hours ago) Revert "sync v2" — Cezar Augusto
| * d134401 - (2 hours ago) Revert "Merge pull request #308 from brave/sync_img" — Cezar Augusto
| * 52aef38 - (2 hours ago) Revert "allow string type for some siteBanner props" — Cezar Augusto
|/
* 5f4a8b1 - (3 hours ago) allow string type for some siteBanner props auditor: @ryanml - currentAmout, onAmountSelection and onDonate accept strings as well this is a temp fix only included in 0.58.x — Cezar Augusto
* f0569c8 - (4 days ago) do not count first letter if space in textareaclipboard — Cezar Augusto
* 69ef8be - (5 days ago) Merge pull request #308 from brave/sync_img — Cezar Augusto
* 854d181 - (3 weeks ago) sync v2 — Cezar Augusto
* b35662c - (4 days ago) update snapshot for walletSummary — Cezar Augusto
* a85206d - (5 days ago) Merge pull request #309 from brave/welcome_img — Pete Miller
```
@cezaraugusto cezaraugusto merged commit 72f91af into 0.58.x Dec 11, 2018
@cezaraugusto cezaraugusto deleted the 0.58.x-brave-ui branch December 11, 2018 21:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants