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.

Sign up for GitHub

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

Jump to bottom

Updates brave-ui to 0.20.x #299

Merged
merged 1 commit into from
Aug 1, 2018
Merged

Updates brave-ui to 0.20.x #299

merged 1 commit into from
Aug 1, 2018

Conversation

NejcZdovc
Copy link
Contributor

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).
  • 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.

Test Plan:

make sure that things are not broken

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions

@NejcZdovc NejcZdovc self-assigned this Jul 31, 2018
@NejcZdovc NejcZdovc requested a review from cezaraugusto July 31, 2018 08:14
@NejcZdovc NejcZdovc force-pushed the ui-0.20.0 branch 2 times, most recently from 504d2ee to e9b6331 Compare July 31, 2018 17:15
cezaraugusto
cezaraugusto previously approved these changes Jul 31, 2018
View reviewed changes
Copy link
Contributor

@cezaraugusto cezaraugusto left a comment •
edited
Loading

Choose a reason for hiding this comment

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

lgtm but needs resolution regarding jsdom/jsdom#2304

@NejcZdovc NejcZdovc force-pushed the ui-0.20.0 branch 2 times, most recently from 1b9cbb3 to b4e10f4 Compare July 31, 2018 17:31
@NejcZdovc
Copy link
Contributor Author

tests fixed, travis is passing again

@NejcZdovc NejcZdovc merged commit 3b07e86 into master Aug 1, 2018
petemill added a commit that referenced this pull request Dec 11, 2018
@petemill
Update to latest brave-ui master
f1413cf 
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
```
fmarier pushed a commit that referenced this pull request Oct 29, 2019
@RyanJarv
Fix yarn run sync --<project>_ref= command
889b15e 
Was supposed to be fixed in #229 but lost a few commits. We fix
the snakecasing done by commander.js there but don't set
the ref correctly because the name differs from what is set
by lib/config.js. This adds a parameter to the projects
config to specify what should be used for the command line
arg (defaults to name.replace('-', '_').

Fixes #299
petemill pushed a commit that referenced this pull request Jul 27, 2020
@RyanJarv
Fix yarn run sync --<project>_ref= command
bebedae 
Was supposed to be fixed in #229 but lost a few commits. We fix
the snakecasing done by commander.js there but don't set
the ref correctly because the name differs from what is set
by lib/config.js. This adds a parameter to the projects
config to specify what should be used for the command line
arg (defaults to name.replace('-', '_').

Fixes #299
petemill pushed a commit that referenced this pull request Jul 28, 2020
@RyanJarv
Fix yarn run sync --<project>_ref= command
3c199ef 
Was supposed to be fixed in #229 but lost a few commits. We fix
the snakecasing done by commander.js there but don't set
the ref correctly because the name differs from what is set
by lib/config.js. This adds a parameter to the projects
config to specify what should be used for the command line
arg (defaults to name.replace('-', '_').

Fixes #299
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bbondy bbondy bbondy approved these changes

@cezaraugusto cezaraugusto Awaiting requested review from cezaraugusto

@ryanml ryanml Awaiting requested review from ryanml

Assignees

@NejcZdovc NejcZdovc

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@NejcZdovc @bbondy @cezaraugusto