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

Update to latest brave-ui master #1062

Merged
merged 2 commits into from
Dec 11, 2018
Merged

Update to latest brave-ui master #1062

merged 2 commits into from
Dec 11, 2018

Conversation

petemill
Copy link
Member

@petemill petemill commented Dec 11, 2018

Fix brave/brave-browser#2439
Fixes: brave/brave-browser#2381
Partially address brave/brave-browser#1164
Many rewards on android fixes (no issues in brave-browser)

Changes: brave/brave-ui@9be9bee...cee363d

*   cee363d - (44 minutes ago) Merge pull request #314 from brave/revert-sync-master — Pete Miller (HEAD -> master, origin/master, origin/HEAD)
|\
| * 0ca4b73 - (56 minutes ago) Revert "sync v2" — Cezar Augusto
| * a479cea - (56 minutes ago) Revert "Merge pull request #308 from brave/sync_img" — Cezar Augusto
|/
*   dd46eab - (19 hours ago) Merge pull request #247 from brave/c71-clock-period — Pete Miller
|\
| * 20d2a61 - (7 weeks ago) Fix NTP clock for c71 — petemill (origin/c71-clock-period, c71-clock-period)
* |   69a3399 - (19 hours ago) Merge pull request #305 from ryanml/android-rewards-title-fix — Pete Miller
|\ \
| |/
|/|
| * d92ce8f - (7 days ago) Fixing rewards toggle for long translations — ryanml (ryanml/android-rewards-title-fix, android-rewards-title-fix)
|/
* 4692dfd - (25 hours ago) readme typos — Ross Moody
*   ca3e285 - (29 hours ago) Merge pull request #312 from emerick/rewards-backup-wallet-notification — Nejc Zdovc
|\
| * 4dda1bc - (4 days ago) Add support for backupWallet notification — Emerick Rogul
* | 0a5f56e - (4 days ago) Emoji Life — Ross Moody
* | be16816 - (4 days ago) Readme formatting — Ross Moody
* | 35b166d - (4 days ago) Brave UI Logo — Ross Moody
* |   fddeb8a - (4 days ago) Merge pull request #311 from brave/now-deploy-static — Cezar Augusto
|\ \
| * | 6685301 - (5 days ago) Use new static deploy config for now instead of docker — petemill (origin/now-deploy-static, now-deploy-static)
* | | eb49e8b - (4 days ago) remove list from README file — Cezar Augusto
* | | 59eae8d - (4 days ago) remove outdated docs — Cezar Augusto
* | | f04fecc - (4 days ago) do not count first letter if space in textareaclipboard — Cezar Augusto
| |/
|/|
* |   7ea9178 - (5 days ago) Merge pull request #308 from brave/sync_img — Cezar Augusto
|\ \
| * | 470233f - (6 days ago) make sync images exportable — Cezar Augusto
| |/
* |   aa520cf - (5 days ago) Merge pull request #309 from brave/welcome_img — Pete Miller
|\ \
| * | 870d3ba - (6 days ago) animation dial in — Ross Moody (origin/welcome_img, welcome_img)
| * | 1c2525b - (6 days ago) make welcome page images exportable — Cezar Augusto
| |/
* |   96ccb12 - (6 days ago) Merge pull request #307 from kirkins/patch-1 — Ryan Lanese
|\ \
| * | f98a665 - (6 days ago) small typo — Philip Kirkbride
* | | f3c38e1 - (6 days ago) v0.36.0 — ryanml (tag: v0.36.0)
|/ /
* |   46b3501 - (6 days ago) Merge pull request #304 from ryanml/disabled-panel — Nejc Zdovc
|\ \
| * | 6be56a3 - (7 days ago) Adding disabledPanel component — ryanml (ryanml/disabled-panel)
|/ /
* |   79b16fb - (6 days ago) Merge pull request #299 from ryanml/fix-298 — Nejc Zdovc
|\ \
| |/
|/|
| * c79530c - (12 days ago) Fixes #298, uses string type for amount/tokens — ryanml (ryanml/fix-298, fix-298)
* 6bf8054 - (8 days ago) v0.35.0 — Cezar Augusto (tag: v0.35.0, now-deploy-reliable)
* 3535427 - (3 weeks ago) sync v2 — Cezar Augusto
*   10f07c0 - (9 days ago) Merge pull request #300 from brave/site-banner-icon — Ryan Lanese
|\
| * da3cc4b - (11 days ago) Site banner icon update — Ross Moody
* 9064f12 - (9 days ago) Merge pull request #301 from emerick/rewards-insufficient-funds-notification — Ryan Lanese
* 5300262 - (11 days ago) Add support for insufficientFunds notification — Emerick Rogul

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:

All webuis

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

ryanml and others added 2 commits December 11, 2018 11:37
- Changing amount -> string on siteBanner
Changes:
```
*   cee363d - (44 minutes ago) Merge pull request #314 from brave/revert-sync-master — Pete Miller (HEAD -> master, origin/master, origin/HEAD)
|\
| * 0ca4b73 - (56 minutes ago) Revert "sync v2" — Cezar Augusto
| * a479cea - (56 minutes ago) Revert "Merge pull request #308 from brave/sync_img" — Cezar Augusto
|/
*   dd46eab - (19 hours ago) Merge pull request #247 from brave/c71-clock-period — Pete Miller
|\
| * 20d2a61 - (7 weeks ago) Fix NTP clock for c71 — petemill (origin/c71-clock-period, c71-clock-period)
* |   69a3399 - (19 hours ago) Merge pull request #305 from ryanml/android-rewards-title-fix — Pete Miller
|\ \
| |/
|/|
| * d92ce8f - (7 days ago) Fixing rewards toggle for long translations — ryanml (ryanml/android-rewards-title-fix, android-rewards-title-fix)
|/
* 4692dfd - (25 hours ago) readme typos — Ross Moody
*   ca3e285 - (29 hours ago) Merge pull request #312 from emerick/rewards-backup-wallet-notification — Nejc Zdovc
|\
| * 4dda1bc - (4 days ago) Add support for backupWallet notification — Emerick Rogul
* | 0a5f56e - (4 days ago) Emoji Life — Ross Moody
* | be16816 - (4 days ago) Readme formatting — Ross Moody
* | 35b166d - (4 days ago) Brave UI Logo — Ross Moody
* |   fddeb8a - (4 days ago) Merge pull request #311 from brave/now-deploy-static — Cezar Augusto
|\ \
| * | 6685301 - (5 days ago) Use new static deploy config for now instead of docker — petemill (origin/now-deploy-static, now-deploy-static)
* | | eb49e8b - (4 days ago) remove list from README file — Cezar Augusto
* | | 59eae8d - (4 days ago) remove outdated docs — Cezar Augusto
* | | f04fecc - (4 days ago) do not count first letter if space in textareaclipboard — Cezar Augusto
| |/
|/|
* |   7ea9178 - (5 days ago) Merge pull request #308 from brave/sync_img — Cezar Augusto
|\ \
| * | 470233f - (6 days ago) make sync images exportable — Cezar Augusto
| |/
* |   aa520cf - (5 days ago) Merge pull request #309 from brave/welcome_img — Pete Miller
|\ \
| * | 870d3ba - (6 days ago) animation dial in — Ross Moody (origin/welcome_img, welcome_img)
| * | 1c2525b - (6 days ago) make welcome page images exportable — Cezar Augusto
| |/
* |   96ccb12 - (6 days ago) Merge pull request #307 from kirkins/patch-1 — Ryan Lanese
|\ \
| * | f98a665 - (6 days ago) small typo — Philip Kirkbride
* | | f3c38e1 - (6 days ago) v0.36.0 — ryanml (tag: v0.36.0)
|/ /
* |   46b3501 - (6 days ago) Merge pull request #304 from ryanml/disabled-panel — Nejc Zdovc
|\ \
| * | 6be56a3 - (7 days ago) Adding disabledPanel component — ryanml (ryanml/disabled-panel)
|/ /
* |   79b16fb - (6 days ago) Merge pull request #299 from ryanml/fix-298 — Nejc Zdovc
|\ \
| |/
|/|
| * c79530c - (12 days ago) Fixes #298, uses string type for amount/tokens — ryanml (ryanml/fix-298, fix-298)
* 6bf8054 - (8 days ago) v0.35.0 — Cezar Augusto (tag: v0.35.0, now-deploy-reliable)
* 3535427 - (3 weeks ago) sync v2 — Cezar Augusto
*   10f07c0 - (9 days ago) Merge pull request #300 from brave/site-banner-icon — Ryan Lanese
|\
| * da3cc4b - (11 days ago) Site banner icon update — Ross Moody
* 9064f12 - (9 days ago) Merge pull request #301 from emerick/rewards-insufficient-funds-notification — Ryan Lanese
* 5300262 - (11 days ago) Add support for insufficientFunds notification — Emerick Rogul
```
@petemill
Copy link
Member Author

petemill commented Dec 11, 2018

0.59.x #1063

Copy link
Contributor

@ryanml ryanml left a comment

Choose a reason for hiding this comment

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

++ lgtm. Additional issue that this closes added to description.

Let's get @cezaraugusto's stamp for certainty

@petemill petemill merged commit 219f5c0 into master Dec 11, 2018
@petemill petemill deleted the dep-brave-ui-master branch December 11, 2018 20:59
@petemill petemill mentioned this pull request Dec 11, 2018
18 tasks
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.

NTP clock day period component (AM / PM) is huge Brave-ui: consistent variable types for token amounts
2 participants