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

latest edits #660

Merged
merged 1 commit into from
Oct 17, 2018
Merged

latest edits #660

merged 1 commit into from
Oct 17, 2018

Conversation

bradleyrichter
Copy link
Contributor

@bradleyrichter bradleyrichter commented Oct 17, 2018

Partial for brave/brave-browser#1578

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:

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

@@ -217,7 +217,7 @@
<message name="IDS_BRAVE_WELCOME_PAGE_NEXT_BUTTON" desc="Button to move to the next slide of the welcome tour">Next</message>
<message name="IDS_BRAVE_WELCOME_PAGE_DONE_BUTTON" desc="Button that ends the welcome tour and moves the user to the new tab page">Done</message>

<!-- WebUI rewards resources -->
<!-- WebUI rewards resources -->
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you revert this line

@@ -425,6 +423,7 @@
<message name="IDS_BRAVE_UI_WELCOME_HEADER_ONE" desc="">We’ve given Brave Payments a big upgrade.</message>
<message name="IDS_BRAVE_UI_WELCOME_HEADER_TWO" desc="">Get ready to experience the next Internet.</message>
<message name="IDS_BRAVE_UI_WHY_BRAVE_REWARDS" desc="">Why Brave Rewards?</message>
<message name="IDS_BRAVE_UI_WHY_BRAVE_REWARDS_DESC" desc=""> </message>
Copy link
Contributor

Choose a reason for hiding this comment

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

This needs to be removed

@NejcZdovc NejcZdovc force-pushed the bradleyrichter-patch-1 branch from b20418f to 5b9c32f Compare October 17, 2018 07:56
@NejcZdovc NejcZdovc merged commit 63475a7 into master Oct 17, 2018
@NejcZdovc NejcZdovc deleted the bradleyrichter-patch-1 branch October 17, 2018 07:59
NejcZdovc added a commit that referenced this pull request Oct 17, 2018
NejcZdovc added a commit that referenced this pull request Oct 17, 2018
NejcZdovc added a commit that referenced this pull request Oct 17, 2018
@NejcZdovc
Copy link
Contributor

master 63475a7
0.57.x a8514b2
0.56.x 6c491fc
0.55.x 3061826

@bbondy bbondy removed the 0.55.x label Jan 14, 2019
@bbondy bbondy added this to the 0.55.x - Release milestone Jan 14, 2019
fmarier pushed a commit that referenced this pull request Oct 29, 2019
New apply_patches command is more memorable than sync --run_hooks.
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.

3 participants