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 tweetnacl #307

Merged
merged 1 commit into from
Aug 2, 2018
Merged

Update tweetnacl #307

merged 1 commit into from
Aug 2, 2018

Conversation

RyanJarv
Copy link
Contributor

@RyanJarv RyanJarv commented Aug 2, 2018

Fixes brave/brave-browser#673

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:

Testing build locally with

yarn run init --brave_core_ref=fix/build-tweetnacl
yarn run build Release --debug_build=false --official_build=true --channel=dev --mac_signing_identifier=<...>

Reviewer Checklist:

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

@RyanJarv
Copy link
Contributor Author

RyanJarv commented Aug 2, 2018

This isn't right, let me rebase off master

@RyanJarv RyanJarv force-pushed the fix/build-tweetnacl branch from faa85de to 271d4fd Compare August 2, 2018 00:33
@RyanJarv
Copy link
Contributor Author

RyanJarv commented Aug 2, 2018

Cherry picked this to the 53 branch and testing that currently

@bbondy bbondy merged commit 8d5ce2e into master Aug 2, 2018
@bbondy bbondy deleted the fix/build-tweetnacl branch August 23, 2018 13:39
petemill added a commit that referenced this pull request Dec 11, 2018
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
```
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.

Build fails building brave-intl/bat-native-tweetnacl
2 participants