Skip to content

/ ghostery-extension

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

Jump to bottom

rewards prompt styles #58

Closed
wants to merge 233 commits into from
Closed

rewards prompt styles #58

wants to merge 233 commits into from
+17,942 −9,163

Commits on Mar 8, 2018

  1. Fix for GH-859

    Serge Zarembsky committed Mar 8, 2018
    262ca37

  2. Linting.

    Serge Zarembsky committed Mar 8, 2018
    504680e

  3. Change to be able to run unit tests on Windows.

    Serge Zarembsky committed Mar 8, 2018
    b16336d

  4. add CODEOWNERS file

    @christophertino
    christophertino committed Mar 8, 2018
    181ebd8

  5. Merge branch 'develop' into feature/gh-859

    @christophertino
    christophertino committed Mar 8, 2018
    a22b090

Commits on Mar 9, 2018

  1. Merge pull request ghostery#1 from ghostery/feature/gh-859 

    Feature/gh 859
    @christophertino
    christophertino committed Mar 9, 2018
    4bcdb53

Commits on Mar 12, 2018

  1. Fixes for GH-869, GH-870.

    Serge Zarembsky committed Mar 12, 2018
    8318f2c

  2. Merge remote-tracking branch 'upstream/develop' into develop

    Serge Zarembsky committed Mar 12, 2018
    c3fb116

Commits on Mar 13, 2018

  1. Fix for GH-872

    Serge Zarembsky committed Mar 13, 2018
    eb3baea

  2. Fixing lint errors.

    Serge Zarembsky committed Mar 13, 2018
    9680394

Commits on Mar 14, 2018

  1. Adding callouts for tooltips.

    Serge Zarembsky committed Mar 14, 2018
    2de44bb

Commits on Mar 15, 2018

  1. Merge pull request ghostery#5 from zarembsky/develop 

    Fixes for UI bugs in Ghostery panel related to longer strings in German language (GH-869, GH-870, GH-872)
    @christophertino
    christophertino committed Mar 15, 2018
    e6b768e

  2. Merge branch 'master' into develop

    @christophertino
    christophertino committed Mar 15, 2018
    1a22cd7

Commits on Mar 16, 2018

  1. Refactoring loading cliqz modules. Fixing ghosteryGH-476.

    Serge Zarembsky committed Mar 16, 2018
    21c1015

  2. Merge remote-tracking branch 'upstream/develop' into develop

    Serge Zarembsky committed Mar 16, 2018
    94a85b7

Commits on Mar 19, 2018

  1. Removing old code.

    Serge Zarembsky committed Mar 19, 2018
    715aa62

  2. Removing isReady.

    Serge Zarembsky committed Mar 19, 2018
    3297c98

  3. Merge pull request ghostery#8 from zarembsky/develop 

    Refactoring load/unload of Cliqz modules, fix for ghosteryGH-476.
    @jsignanini
    jsignanini committed Mar 19, 2018
    d848377

Commits on Mar 20, 2018

  1. removing background log that broke extension loading

    @christophertino
    christophertino committed Mar 20, 2018
    b800e72

  2. First pass at the updated simple view

    @IAmThePan
    IAmThePan committed Mar 20, 2018
    135777a

  3. Fix for GH-877, GH-886, GH-872.

    Serge Zarembsky committed Mar 20, 2018
    bdcba81

  4. Merge remote-tracking branch 'upstream/develop' into develop

    Serge Zarembsky committed Mar 20, 2018
    765f56d

  5. Removing log from manifest

    Serge Zarembsky committed Mar 20, 2018
    95b400f

  6. Added return after reject.

    Serge Zarembsky committed Mar 20, 2018
    636c05c

  7. Merge pull request ghostery#9 from zarembsky/develop 

    Fixes for GH-877, GH-872, GH-886, missing translations added.
    @jsignanini
    jsignanini committed Mar 20, 2018
    9f88345

  8. Adding return after rejects in a few places.

    Serge Zarembsky committed Mar 20, 2018
    54b5286

Commits on Mar 22, 2018

  1. Implementing flag for site-specific unblocks.

    Serge Zarembsky committed Mar 22, 2018
    6078357

  2. Using abbreviations for seconds, removing unnecessary comment.

    Serge Zarembsky committed Mar 22, 2018
    c81bd41

Commits on Mar 23, 2018

  1. Requested changes.

    Serge Zarembsky committed Mar 23, 2018
    0745205

  2. Implementing suggested changes.

    Serge Zarembsky committed Mar 23, 2018
    61a1e5c

  3. Update policy block reason name.

    @jsignanini
    jsignanini committed Mar 23, 2018
    40c1d48

  4. Update block reason names. Call allowedOnce check only when needed.

    @jsignanini
    jsignanini committed Mar 23, 2018
    6bf01a9

  5. Update JSDocs and add missing block reason.

    @jsignanini
    jsignanini committed Mar 23, 2018
    6ee32ae

  6. Update JSDocs and update block reason c2p names.

    @jsignanini
    jsignanini committed Mar 23, 2018
    b523b46

  7. Fix typo.

    @jsignanini
    jsignanini committed Mar 23, 2018
    73cc0eb

  8. Merge pull request ghostery#10 from zarembsky/develop 

    Adding return after rejects in a few places. Implementing Ghostery side of GH-885. Fix for GH-871.
    @jsignanini
    jsignanini committed Mar 23, 2018
    3db6b2b

Commits on Mar 26, 2018

  1. Added checks for non-null message

    Serge Zarembsky committed Mar 26, 2018
    587568e

Commits on Mar 27, 2018

  1. add NO_LINT env option 

    readme add disable lint
    @trickpattyFH20
    trickpattyFH20 committed Mar 27, 2018
    adfb1e4

  2. use npm ci(continuous integration) install command per npm 5.7.1

    @trickpattyFH20
    trickpattyFH20 committed Mar 27, 2018
    6164935

  3. Merge pull request ghostery#14 from trickpattyFH20/develop 

    Add option to disable ESLint
    @christophertino
    christophertino committed Mar 27, 2018
    cf201b5

Commits on Mar 28, 2018

  1. Fixing GH-872

    Serge Zarembsky committed Mar 28, 2018
    dde6adb

  2. Updated simple view and detailed expert and condensed views.

    @IAmThePan
    IAmThePan committed Mar 28, 2018
    1805ed0

  3. initial webpack 4 build 

    migrate to mini css plugin

webpack 4 mode option

fix eval err
    @trickpattyFH20
    trickpattyFH20 committed Mar 28, 2018
    9748fa9

Commits on Mar 29, 2018

  1. Merge branch 'develop' into feature/webpack-4-upgrade

    @christophertino
    christophertino committed Mar 29, 2018
    37e6e2e

  2. Merge pull request ghostery#16 from trickpattyFH20/feature/webpack-4-… 

    …upgrade

webpack 4 upgrade
    @christophertino
    christophertino committed Mar 29, 2018
    ce103eb

  3. make pattern matcher case insensitive + unit test

    @christophertino
    christophertino committed Mar 29, 2018
    09e4d41

  4. fix redux actions with missing returns in setup app

    @christophertino
    christophertino committed Mar 29, 2018
    e81002e

  5. remove verbose webpack output

    @trickpattyFH20
    trickpattyFH20 committed Mar 29, 2018
    7e6a6a4

  6. add verbose to build.watch

    @trickpattyFH20
    trickpattyFH20 committed Mar 29, 2018
    189fa1d

  7. Merge branch 'develop' into feature/webpack-4-upgrade

    @christophertino
    christophertino committed Mar 29, 2018
    d39176f

  8. Optimize tooltips and notifications

    @IAmThePan
    IAmThePan committed Mar 29, 2018
    af508ce

  9. Merge pull request ghostery#18 from trickpattyFH20/feature/webpack-4-… 

    …upgrade

remove verbose webpack output
    @jsignanini
    jsignanini committed Mar 29, 2018
    ad33142

  10. update CONTRIBUTING to allow patches via email. Fixes ghostery#6

    @christophertino
    christophertino committed Mar 29, 2018
    4aa116b

  11. Fix linting errors

    @IAmThePan
    IAmThePan committed Mar 29, 2018
    e4887b4

  12. fix lint on change regression

    @trickpattyFH20
    trickpattyFH20 committed Mar 29, 2018
    3bbdfe5

Commits on Mar 30, 2018

  1. output lint after webpack output

    @trickpattyFH20
    trickpattyFH20 committed Mar 30, 2018
    a5dfd69

  2. done rr

    @trickpattyFH20
    trickpattyFH20 committed Mar 30, 2018
    c13afec

  3. Add jest tests for PauseButton.jxs

    @IAmThePan
    IAmThePan committed Mar 30, 2018
    d686bae

  4. Changes in response to PR requested changes.

    Serge Zarembsky committed Mar 30, 2018
    355487e

Commits on Apr 2, 2018

  1. GH-863 update tooltip and notification logic

    @IAmThePan
    IAmThePan committed Apr 2, 2018
    9f76c0c

  2. GH-876 updated header tabs

    @IAmThePan
    IAmThePan committed Apr 2, 2018
    9036eaf

  3. GH-867 update alternate POC

    @IAmThePan
    IAmThePan committed Apr 2, 2018
    b896758

Commits on Apr 3, 2018

  1. Merge pull request ghostery#20 from trickpattyFH20/feature/fix-lint-o… 

    …n-change

Feature/fix lint on change
    @jsignanini
    jsignanini committed Apr 3, 2018
    523cbcb

  2. Requested changes.

    Serge Zarembsky committed Apr 3, 2018
    6e62d5f

  3. Merge remote-tracking branch 'upstream/develop' into develop

    Serge Zarembsky committed Apr 3, 2018
    795a120

  4. Merge pull request ghostery#15 from zarembsky/develop 

    Fix for GH-872, "Not Scanned" case.
    @jsignanini
    jsignanini committed Apr 3, 2018
    2c66dfc

  5. GH-888 updated pause button location and tooltips

    @IAmThePan
    IAmThePan committed Apr 3, 2018
    865bc1f

  6. upgrade webpack and fix watch scss bug

    @trickpattyFH20
    trickpattyFH20 committed Apr 3, 2018
    c7ccfac

  7. GH-908 Un-swapped text on cliqz-features page on setup flow

    @IAmThePan
    IAmThePan committed Apr 3, 2018
    3d09a37

  8. fix watch lint scss

    @trickpattyFH20
    trickpattyFH20 committed Apr 3, 2018
    df32e54

Commits on Apr 4, 2018

  1. Merge pull request ghostery#26 from trickpattyFH20/develop 

    upgrade webpack and fix watch scss bug
    @jsignanini
    jsignanini committed Apr 4, 2018
    03a6be5

  2. Merge branch 'develop' into gh-908

    @jsignanini
    jsignanini committed Apr 4, 2018
    8474938

  3. Merge pull request ghostery#27 from IAmThePan/gh-908 

    GH-908 Un-swapped text on cliqz-features page on setup flow
    @jsignanini
    jsignanini committed Apr 4, 2018
    7c4d58f

  4. Set default Summary to new Pause Button position

    @IAmThePan
    IAmThePan committed Apr 4, 2018
    9824b00

  5. update package-lock file

    @IAmThePan
    IAmThePan committed Apr 4, 2018
    7553c2a

  6. Merge Simple View changes into Develop

    @IAmThePan
    IAmThePan committed Apr 4, 2018
    fb078cd

  7. Fix linting errors

    @IAmThePan
    IAmThePan committed Apr 4, 2018
    c30cef1

  8. Fix error where panel wasn't displaying

    @IAmThePan
    IAmThePan committed Apr 4, 2018
    ab78614

  9. Fix jsdoc issues

    @IAmThePan
    IAmThePan committed Apr 4, 2018
    78f04ae

  10. check for chrome newtab before calling injectScript

    @christophertino
    christophertino committed Apr 4, 2018
    61ce7be

  11. Merge pull request ghostery#25 from IAmThePan/simple-view-merge 

    Updated summary view.
    @jsignanini
    jsignanini committed Apr 4, 2018
    b9cdcd3

  12. cleanup extraneous object property checks

    @christophertino
    christophertino committed Apr 4, 2018
    9b2ed2e

  13. Merge branch 'feature/newtab_check' into develop

    @christophertino
    christophertino committed Apr 4, 2018
    cada891

  14. udpate docs

    @christophertino
    christophertino committed Apr 4, 2018
    3f48081

Commits on Apr 5, 2018

  1. Create pipeline steps to control whitelisting of antitracking and adb… 

    …locker from Ghostery side
    @sammacbeth
    sammacbeth committed Apr 5, 2018
    2b12a89

  2. Update Cliqz bundle to 1.26.1

    @sammacbeth
    sammacbeth committed Apr 5, 2018
    05ceff9

  3. WIP nightly builds on jenkins

    @sammacbeth
    sammacbeth committed Apr 5, 2018
    82d8b4b

  4. Merge pull request ghostery#23 from sammacbeth/cliqz-whitelisting-act… 

    …ions

Refactor integration ghostery whitelisting with Cliqz modules
    @jsignanini
    jsignanini committed Apr 5, 2018
    c431b0e

Commits on Apr 6, 2018

  1. Publish with build number.

    @sammacbeth
    sammacbeth committed Apr 6, 2018
    ebdfaa0

  2. Use package-lock.json in docker.

    @sammacbeth
    sammacbeth committed Apr 6, 2018
    7718afe

  3. Test moab makezip

    @sammacbeth
    sammacbeth committed Apr 6, 2018
    924458a

  4. WIP fetch up-to-date libraries for build.

    @sammacbeth
    sammacbeth committed Apr 6, 2018
    cfc2f0f

  5. Add option to build with browser-core master

    @sammacbeth
    sammacbeth committed Apr 6, 2018
    6db0d29

  6. Add signing step.

    @sammacbeth
    sammacbeth committed Apr 6, 2018
    15e9f78

  7. Panel Fixes: Fix CSS SVG encoding for FF

    @IAmThePan
    IAmThePan committed Apr 6, 2018
    9697aae

  8. Panel Fixes: HTML encode inline SVGs

    @IAmThePan
    IAmThePan committed Apr 6, 2018
    58e8816

  9. Panel Fixes: Edge bug fixes (GH-911)

    @IAmThePan
    IAmThePan committed Apr 6, 2018
    bf28571

Commits on Apr 9, 2018

  1. GH-867 Alternate Summary View AB Test

    @IAmThePan
    IAmThePan committed Apr 9, 2018
    08fc2da

  2. Fix overflow scroll issue

    @IAmThePan
    IAmThePan committed Apr 9, 2018
    0266a29

  3. Toggle Summary AB test off

    @IAmThePan
    IAmThePan committed Apr 9, 2018
    d30db63

  4. Merge pull request ghostery#28 from IAmThePan/develop 

    Panel Bug Fixes
    @jsignanini
    jsignanini committed Apr 9, 2018
    99d9bec

  5. Fix tooltip scroll issue

    @IAmThePan
    IAmThePan committed Apr 9, 2018
    f1b7132

  6. Merge remote-tracking branch 'upstream/develop' into develop

    @IAmThePan
    IAmThePan committed Apr 9, 2018
    66426bd

  7. Make browser-core log.

    @sammacbeth
    sammacbeth committed Apr 9, 2018
    24d8cbc

  8. Merge pull request ghostery#29 from IAmThePan/develop 

    Fix scroll issue with tooltip
    @jsignanini
    jsignanini committed Apr 9, 2018
    bfb625f

  9. adding utm check to ghostery.com

    @christophertino
    christophertino committed Apr 9, 2018
    ed78465

Commits on Apr 10, 2018

  1. Load github credentials to enable moab checkout of ghostery-libraries.

    @sammacbeth
    sammacbeth committed Apr 10, 2018
    07a7569

  2. Tidy deployment.

    @sammacbeth
    sammacbeth committed Apr 10, 2018
    af79226

  3. Add Chrome packaging step.

    @sammacbeth
    sammacbeth committed Apr 10, 2018
    e071f77

  4. Merge branch 'develop' into nightly

    @christophertino
    christophertino committed Apr 10, 2018
    e8c74b9

  5. Merge pull request ghostery#32 from sammacbeth/nightly 

    Automated extension builds
    @christophertino
    christophertino committed Apr 10, 2018
    1836775

Commits on Apr 12, 2018

  1. GH-862: Unit tests for the Panel (ghostery#31) 

    * GH-862 Add unit tests for the Panel: Pause Button Snapshot, Summary Actions & Reducers

* Update reducers to test for immutable state
    @IAmThePan @christophertino
    IAmThePan authored and christophertino committed Apr 12, 2018
    48b74b0

  2. Publish beta builds for cliqz and chrome. (ghostery#33)

    @sammacbeth @christophertino
    sammacbeth authored and christophertino committed Apr 12, 2018
    f559662

Commits on Apr 13, 2018

  1. Fix for Ghostery in Cliqz issues (ghostery#37)

    @christophertino
    Serge Zarembsky authored and christophertino committed Apr 13, 2018
    a901ce8

Commits on Apr 18, 2018

  1. update changelog and bump version

    @christophertino
    christophertino committed Apr 18, 2018
    3585107

  2. GH-955: Update Smart Blocking icon on Tracker List

    @IAmThePan @christophertino
    IAmThePan authored and christophertino committed Apr 18, 2018
    09b9cd1

  3. GH-954: Fix spelling error for Anti-Tracking ON notification

    @IAmThePan @christophertino
    IAmThePan authored and christophertino committed Apr 18, 2018
    6f64bc1

  4. GH-953 fix bug where pause button is off by 1px

    @IAmThePan @christophertino
    IAmThePan authored and christophertino committed Apr 18, 2018
    f810d7d

Commits on Apr 19, 2018

  1. bump browser-core version

    @christophertino
    christophertino committed Apr 19, 2018
    5fc5e22

  2. add minimum_opera_version to manifest

    @christophertino
    christophertino committed Apr 19, 2018
    46f7ce1

Commits on Apr 23, 2018

  1. integrity check browser-core workaround (ghostery#45)

    @trickpattyFH20 @jsignanini
    trickpattyFH20 authored and jsignanini committed Apr 23, 2018
    5fa827f

  2. Fix for GH-952 (ghostery#40)

    @jsignanini
    Serge Zarembsky authored and jsignanini committed Apr 23, 2018
    f9f2680

Commits on Apr 24, 2018

  1. omit firefox about:pages from content script injection

    @christophertino
    christophertino committed Apr 24, 2018
    83003f5

  2. Smart Block: Don't block mixed content from localhost. Fixes ghostery#44 

     and GH-875
    @christophertino
    christophertino committed Apr 24, 2018
    5323f08

Commits on Apr 25, 2018

  1. GH-1021 Add browser version to metrics

    @christophertino
    christophertino committed Apr 25, 2018
    84cf489

  2. GH-889 limit send of utm_source and utm_campaign metrics

    @christophertino
    christophertino committed Apr 25, 2018
    f00e1f9

Commits on Apr 30, 2018

  1. Updated webpack

    @jsignanini
    Serge Zarembsky authored and jsignanini committed Apr 30, 2018
    7093781

  2. Fixes for GH-1001 and GH-1022

    @jsignanini
    Serge Zarembsky authored and jsignanini committed Apr 30, 2018
    c96cc0a

  3. Used sendMessageInPromise to ensure that ping goes out after data is … 

    …set in the background.
    @jsignanini
    Serge Zarembsky authored and jsignanini committed Apr 30, 2018
    6825a35

  4. adding uninstall ping to campaign metrics

    @christophertino
    christophertino committed Apr 30, 2018
    158c77e

Commits on May 3, 2018

  1. update tab query url for website utms

    @christophertino
    christophertino committed May 3, 2018
    fb1a038

Commits on May 4, 2018

  1. txgh config added

    Serge Zarembsky committed May 4, 2018
    83254d2

Commits on May 7, 2018

  1. parse browser version UA string for chrome

    @christophertino
    christophertino committed May 7, 2018
    89c982a

  2. Adding Edge files to support building Edge package with MOAB on Windo… 

    …ws (ghostery#48)

* Adding Edge files to support building Edge by MOAB

* Refreshed package.json and package.lock

* Moving edge under tools

* Removed Version and Publisher attributes

* Adjusting package files

* Updated package files

* Adjusting package files
    @christophertino
    Serge Zarembsky authored and christophertino committed May 7, 2018
    b462c4c

Commits on May 8, 2018

  1. Updates to the Setup flow: added Rewards

    @IAmThePan @christophertino
    IAmThePan authored and christophertino committed May 8, 2018
    e2d8d1c

  2. # Please include a useful commit message!

    Serge Zarembsky committed May 8, 2018
    fa9ea49

  3. Fixing typos.

    Serge Zarembsky committed May 8, 2018
    9ad1fb5

Commits on May 9, 2018

  1. Refreshed lock file

    Serge Zarembsky committed May 9, 2018
    5d9e316

  2. Adjusting package-lock

    Serge Zarembsky committed May 9, 2018
    7a5c75d

Commits on May 10, 2018

  1. Adding explanations for initialization of Transifex client

    Serge Zarembsky committed May 10, 2018
    3e54265

  2. Editing README format

    Serge Zarembsky committed May 10, 2018
    e55e0b2

  3. Update README.md

    @zarembsky
    zarembsky committed May 10, 2018
    b3375da

  4. Update README.md

    @zarembsky
    zarembsky committed May 10, 2018
    83312e8

  5. Merge branch 'develop' into feature/txgh

    @jsignanini
    jsignanini committed May 10, 2018
    a8560d7

  6. Update README.md

    @jsignanini
    jsignanini committed May 10, 2018
    6046e98

  7. Merge branch 'feature/txgh' into develop

    @jsignanini
    jsignanini committed May 10, 2018
    0bc9670

  8. Initial commit. Code works on staging with some temp workarounds

    @christophertino
    Serge Zarembsky authored and christophertino committed May 10, 2018
    5b16ca7

  9. Removing temporary code.

    @christophertino
    Serge Zarembsky authored and christophertino committed May 10, 2018
    5dda2a4

  10. hot dog

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    d4df1b8

  11. init circle

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    9ea3c4e

  12. react hot dog

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    303b89e

  13. rewards hot dog ui

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    f1c77fe

  14. close circle

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    08c833e

  15. routing and offer card

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    ab852a9

  16. reward card layout

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    be47a87

  17. more offer card styles

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    97f2bef

  18. card footer + copy feedback + styling

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    b8a22eb

  19. more styles

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    b1ef228

  20. remove purple test style

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    1075712

  21. test rewards postmessage

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    0114f6f

  22. one reward at a time for hot dog and offer card

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    76a1fe0

  23. header + footer + styles

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    6af9e07

  24. react shadow

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    a96c524

  25. define MainView first

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    d02868c

  26. lint

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    6b88750

  27. add onmessage

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    d488cd3

  28. fix selector and close button

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    631576c

  29. iframe fallback

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    ef4601e

  30. fix ff beta logo

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    82d7769

  31. data csp compatible images + class for index + text styles

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    99f487c

  32. disable rewards notification

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    6e25b4e

  33. fix shadow FOUC

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    3461316

  34. click outside settings

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    7b51e51

  35. settings styles

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    9a366c5

  36. settings actions

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    16a1c01

  37. show ghostery pizza offer

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    ae08e09

  38. fix event listener reward reference

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    9069ee9

  39. setConfiguration - for DEBUG only

    @christophertino
    Serge Zarembsky authored and christophertino committed May 10, 2018
    d0de858

  40. Changing the way browser-core is loaded.

    @christophertino
    Serge Zarembsky authored and christophertino committed May 10, 2018
    5c6557a

  41. handle signal 

    offer shown signal

squash this
    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    7fae46b

  42. mark offer read + delete offer

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    e4a79b8

  43. new signals

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    b05bc30

  44. refactor to sendSignal

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    5e4539b

  45. Create ToggleSlider component. Use it in Setup flow.

    @IAmThePan @christophertino
    IAmThePan authored and christophertino committed May 10, 2018
    9cf292e

  46. ghosteryGH-409 Update Rewards view: rewards list, toggle on/off, redu… 

    …cers, fake actions.
    @IAmThePan @christophertino
    IAmThePan authored and christophertino committed May 10, 2018
    ee8814f

  47. ghosteryGH-409 Update Rewards view: reward details.

    @IAmThePan @christophertino
    IAmThePan authored and christophertino committed May 10, 2018
    bd250d7

  48. hot dog

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    9329c34

  49. Integrate panel rewards with background I

    @IAmThePan @christophertino
    IAmThePan authored and christophertino committed May 10, 2018
    f800504

  50. Integrate panel rewards with background II. Fix linting errors

    @IAmThePan @christophertino
    IAmThePan authored and christophertino committed May 10, 2018
    3b8e20c

  51. Integrate panel rewards with Background III. Messages for read, remov… 

    …e reward
    @IAmThePan @christophertino
    IAmThePan authored and christophertino committed May 10, 2018
    eeaa21e

  52. Fix signal bug for content-script rewards

    @IAmThePan @christophertino
    IAmThePan authored and christophertino committed May 10, 2018
    5831a78

  53. panel reward signals

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    c0db7b9

  54. reward prompt flow

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    06e1d0f

  55. Finalize design for Rewards Panel

    @IAmThePan @christophertino
    IAmThePan authored and christophertino committed May 10, 2018
    8ae4cf6

  56. clean rewards

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    adb116a

  57. rewards conf handling

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    fde6d20

  58. update browser-core package and lock

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    5630671

  59. Add translations to Rewards Panel

    @IAmThePan @christophertino
    IAmThePan authored and christophertino committed May 10, 2018
    91217bb

  60. Fix for Ghostery side enabling of offers

    @christophertino
    Serge Zarembsky authored and christophertino committed May 10, 2018
    0a20c64

  61. styles. expiration. terms tt

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    cbe1bf2

  62. enable offers by default

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    2ff69fe

  63. start button styles

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    7762416

  64. Begin tests for the rewards panel

    @IAmThePan @christophertino
    IAmThePan authored and christophertino committed May 10, 2018
    7692d05

  65. More and updated tests for Rewards Panel

    @IAmThePan @christophertino
    IAmThePan authored and christophertino committed May 10, 2018
    623b81d

  66. Fix linting errors

    @IAmThePan @christophertino
    IAmThePan authored and christophertino committed May 10, 2018
    c52ee6b

  67. signals

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    9f742b8

  68. Add more signals, fix linting errors, fix bug

    @IAmThePan @christophertino
    IAmThePan authored and christophertino committed May 10, 2018
    410f3ff

  69. Removing offers from ABTest

    @christophertino
    Serge Zarembsky authored and christophertino committed May 10, 2018
    f623311

  70. style adjustments

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    4045cf2

  71. GH-1051 fix null reward check

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    eb0ab03

  72. GH-1055 fix - define onload evt first

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    687602f

  73. button singleton + seen reward on offer card shown

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    a806f4b

  74. typo

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 10, 2018
    d347d2f

  75. Removing enable_offers_abtest.

    @christophertino
    Serge Zarembsky authored and christophertino committed May 10, 2018
    6727872

  76. Extra blanks

    @christophertino
    Serge Zarembsky authored and christophertino committed May 10, 2018
    732bb25

  77. Removing checkbox for EDGE and CLIQZ unconditionally.

    @christophertino
    Serge Zarembsky authored and christophertino committed May 10, 2018
    b1f937d

  78. Restore default manifest state.

    @christophertino
    Serge Zarembsky authored and christophertino committed May 10, 2018
    c6e5360

  79. Update Rewards copy and add styling to non-happy-path Rewards panel

    @IAmThePan @christophertino
    IAmThePan authored and christophertino committed May 10, 2018
    b301fba

  80. Update test snapshots

    @IAmThePan @christophertino
    IAmThePan authored and christophertino committed May 10, 2018
    e60a3d7

  81. Update package-lock file

    @IAmThePan @christophertino
    IAmThePan authored and christophertino committed May 10, 2018
    acab22c

  82. Minor copy change

    @IAmThePan @christophertino
    IAmThePan authored and christophertino committed May 10, 2018
    b77d0de

  83. GH-1066 Fix text overflow on rewards panel

    @IAmThePan @christophertino
    IAmThePan authored and christophertino committed May 10, 2018
    ac5184c

  84. Update snapshots for Reward Detail unit tests

    @IAmThePan @christophertino
    IAmThePan authored and christophertino committed May 10, 2018
    ba5bf99

  85. documentation and svg cleanup

    @christophertino
    christophertino committed May 10, 2018
    f5e409b

  86. translations

    @trickpattyFH20
    trickpattyFH20 committed May 10, 2018
    f133eb1

  87. rewards overlay

    @trickpattyFH20
    trickpattyFH20 committed May 10, 2018
    80e7a08

Commits on May 11, 2018

  1. translations

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 11, 2018
    7dc9cf5

  2. rewards overlay

    @trickpattyFH20 @christophertino
    trickpattyFH20 authored and christophertino committed May 11, 2018
    f5d3548

  3. Removing extra strings from non-English language files (ghostery#55) 

    * Removing extra tokens from non-English language files.

* Removing console.log from OfferCard.jsx (lint complain)
    @zarembsky @christophertino
    zarembsky authored and christophertino committed May 11, 2018
    75bdc9e

  4. Merge branch 'develop' of github.com:ghostery/ghostery-extension into… 

    … develop
    @trickpattyFH20
    trickpattyFH20 committed May 11, 2018
    e6bedba

  5. GH-1072: fix bug where Email Verification banner wasn't showing

    @IAmThePan @christophertino
    IAmThePan authored and christophertino committed May 11, 2018
    988d8a5

  6. Merge branch 'develop' of github.com:ghostery/ghostery-extension into… 

    … develop
    @trickpattyFH20
    trickpattyFH20 committed May 11, 2018
    4367a10

  7. prompt button styles

    @trickpattyFH20
    trickpattyFH20 committed May 11, 2018
    249e6f8