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

Feature/rewards integration #52

Closed
wants to merge 76 commits into from
Closed

Feature/rewards integration #52

wants to merge 76 commits into from
+8,656 −5,208

Commits on Apr 23, 2018

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

    Serge Zarembsky committed Apr 23, 2018
    3a01479

  2. Removing temporary code.

    Serge Zarembsky committed Apr 23, 2018
    68e3b76

  3. hot dog

    @trickpattyFH20
    trickpattyFH20 committed Apr 23, 2018
    4959ee1

  4. init circle

    @trickpattyFH20
    trickpattyFH20 committed Apr 23, 2018
    0b7aba9

  5. react hot dog

    @trickpattyFH20
    trickpattyFH20 committed Apr 23, 2018
    6d40c48

  6. rewards hot dog ui

    @trickpattyFH20
    trickpattyFH20 committed Apr 23, 2018
    993133d

  7. close circle

    @trickpattyFH20
    trickpattyFH20 committed Apr 23, 2018
    a5d0b51

  8. routing and offer card

    @trickpattyFH20
    trickpattyFH20 committed Apr 23, 2018
    9565d2f

  9. reward card layout

    @trickpattyFH20
    trickpattyFH20 committed Apr 23, 2018
    a1c0870

  10. more offer card styles

    @trickpattyFH20
    trickpattyFH20 committed Apr 23, 2018
    234e52d

  11. card footer + copy feedback + styling

    @trickpattyFH20
    trickpattyFH20 committed Apr 23, 2018
    5d68ff1

  12. more styles

    @trickpattyFH20
    trickpattyFH20 committed Apr 23, 2018
    6ad8684

  13. remove purple test style

    @trickpattyFH20
    trickpattyFH20 committed Apr 23, 2018
    bc6d97f

  14. test rewards postmessage

    @trickpattyFH20
    trickpattyFH20 committed Apr 23, 2018
    4a25316

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

    @trickpattyFH20
    trickpattyFH20 committed Apr 23, 2018
    dded606

  16. header + footer + styles

    @trickpattyFH20
    trickpattyFH20 committed Apr 23, 2018
    1560e23

  17. react shadow

    @trickpattyFH20
    trickpattyFH20 committed Apr 23, 2018
    da5ee6b

  18. define MainView first

    @trickpattyFH20
    trickpattyFH20 committed Apr 23, 2018
    ea7eae0

  19. lint

    @trickpattyFH20
    trickpattyFH20 committed Apr 23, 2018
    1c00a47

  20. add onmessage

    @trickpattyFH20
    trickpattyFH20 committed Apr 23, 2018
    d38fad7

  21. fix selector and close button

    @trickpattyFH20
    trickpattyFH20 committed Apr 23, 2018
    935aa87

  22. iframe fallback

    @trickpattyFH20
    trickpattyFH20 committed Apr 23, 2018
    200feb3

  23. fix ff beta logo

    @trickpattyFH20
    trickpattyFH20 committed Apr 23, 2018
    a5ce6f3

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

    @trickpattyFH20
    trickpattyFH20 committed Apr 23, 2018
    b8b7cc0

  25. disable rewards notification

    @trickpattyFH20
    trickpattyFH20 committed Apr 23, 2018
    50fba55

  26. fix shadow FOUC

    @trickpattyFH20
    trickpattyFH20 committed Apr 23, 2018
    4b5ddf4

  27. click outside settings

    @trickpattyFH20
    trickpattyFH20 committed Apr 23, 2018
    84e2ec7

  28. settings styles

    @trickpattyFH20
    trickpattyFH20 committed Apr 23, 2018
    a32a213

  29. settings actions

    @trickpattyFH20
    trickpattyFH20 committed Apr 23, 2018
    a127e39

Commits on Apr 24, 2018

  1. show ghostery pizza offer

    @trickpattyFH20
    trickpattyFH20 committed Apr 24, 2018
    7531d1a

Commits on Apr 26, 2018

  1. fix event listener reward reference

    @trickpattyFH20
    trickpattyFH20 committed Apr 26, 2018
    f951291

Commits on Apr 27, 2018

  1. setConfiguration - for DEBUG only

    Serge Zarembsky committed Apr 27, 2018
    9f41082

  2. Changing the way browser-core is loaded.

    Serge Zarembsky committed Apr 27, 2018
    f61089b

  3. Merge remote-tracking branch 'upstream/feature/GH-732-hot-dog' into f… 

    …eature/GH-732-hot-dog
    @trickpattyFH20
    trickpattyFH20 committed Apr 27, 2018
    5a0d612

Commits on Apr 30, 2018

  1. handle signal 

    offer shown signal

squash this
    @trickpattyFH20
    trickpattyFH20 committed Apr 30, 2018
    66b339f

  2. mark offer read + delete offer

    @trickpattyFH20
    trickpattyFH20 committed Apr 30, 2018
    8582711

  3. new signals

    @trickpattyFH20
    trickpattyFH20 committed Apr 30, 2018
    78b1203

Commits on May 1, 2018

  1. refactor to sendSignal

    @trickpattyFH20
    trickpattyFH20 committed May 1, 2018
    5a59a39

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

    @IAmThePan
    IAmThePan committed May 1, 2018
    ce1b2a3

  3. GH-409 Update Rewards view: rewards list, toggle on/off, reducers, fa… 

    …ke actions.
    @IAmThePan
    IAmThePan committed May 1, 2018
    f7a3b16

  4. GH-409 Update Rewards view: reward details.

    @IAmThePan
    IAmThePan committed May 1, 2018
    c6f4403

  5. hot dog

    @trickpattyFH20 @IAmThePan
    trickpattyFH20 authored and IAmThePan committed May 1, 2018
    5d8819a

  6. Integrate panel rewards with background I

    @IAmThePan
    IAmThePan committed May 1, 2018
    84bc961

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

    @IAmThePan
    IAmThePan committed May 1, 2018
    924241e

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

    …e reward
    @IAmThePan
    IAmThePan committed May 1, 2018
    768988a

  9. Fix signal bug for content-script rewards

    @IAmThePan
    IAmThePan committed May 1, 2018
    11af136

  10. panel reward signals

    @trickpattyFH20
    trickpattyFH20 committed May 1, 2018
    0a6e2bc

  11. reward prompt flow

    @trickpattyFH20
    trickpattyFH20 committed May 1, 2018
    3526eed

Commits on May 2, 2018

  1. Finalize design for Rewards Panel

    @IAmThePan
    IAmThePan committed May 2, 2018
    24b82ad

  2. clean rewards

    @trickpattyFH20
    trickpattyFH20 committed May 2, 2018
    09fad40

Commits on May 3, 2018

  1. rewards conf handling

    @trickpattyFH20
    trickpattyFH20 committed May 3, 2018
    0fb4fd8

  2. update browser-core package and lock

    @trickpattyFH20
    trickpattyFH20 committed May 3, 2018
    ba44a18

  3. Add translations to Rewards Panel

    @IAmThePan
    IAmThePan committed May 3, 2018
    7e6c673

  4. Fix for Ghostery side enabling of offers

    Serge Zarembsky committed May 3, 2018
    21a6b40

  5. Merge branch 'feature/rewards-integration' of https://github.com/ghos… 

    …tery/ghostery-extension into feature/rewards-integration
    Serge Zarembsky committed May 3, 2018
    58e3707

  6. styles. expiration. terms tt

    @trickpattyFH20
    trickpattyFH20 committed May 3, 2018
    f92706f

  7. enable offers by default

    @trickpattyFH20
    trickpattyFH20 committed May 3, 2018
    98f166d

  8. start button styles

    @trickpattyFH20
    trickpattyFH20 committed May 3, 2018
    9a4469c

  9. Begin tests for the rewards panel

    @IAmThePan
    IAmThePan committed May 3, 2018
    e2fe731

  10. More and updated tests for Rewards Panel

    @IAmThePan
    IAmThePan committed May 3, 2018
    d11bfba

  11. Fix linting errors

    @IAmThePan
    IAmThePan committed May 3, 2018
    0319a9c

Commits on May 4, 2018

  1. signals

    @trickpattyFH20
    trickpattyFH20 committed May 4, 2018
    089746d

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

    @IAmThePan
    IAmThePan committed May 4, 2018
    f06a248

Commits on May 7, 2018

  1. Removing offers from ABTest

    Serge Zarembsky committed May 7, 2018
    e4ec6c6

  2. style adjustments

    @trickpattyFH20
    trickpattyFH20 committed May 7, 2018
    5b43408

Commits on May 8, 2018

  1. GH-1051 fix null reward check

    @trickpattyFH20
    trickpattyFH20 committed May 8, 2018
    e1f5105

  2. merge

    @trickpattyFH20
    trickpattyFH20 committed May 8, 2018
    03eee09

  3. GH-1055 fix - define onload evt first

    @trickpattyFH20
    trickpattyFH20 committed May 8, 2018
    cb6aa87

Commits on May 9, 2018

  1. button singleton + seen reward on offer card shown

    @trickpattyFH20
    trickpattyFH20 committed May 9, 2018
    d51f739

  2. typo

    @trickpattyFH20
    trickpattyFH20 committed May 9, 2018
    7a3e09e

  3. Removing enable_offers_abtest.

    Serge Zarembsky committed May 9, 2018
    55462b1

  4. Extra blanks

    Serge Zarembsky committed May 9, 2018
    a9bc71e

  5. Removing checkbox for EDGE and CLIQZ unconditionally.

    Serge Zarembsky committed May 9, 2018
    08fe23d

  6. Restore default manifest state.

    Serge Zarembsky committed May 9, 2018
    87caf7b

Commits on May 10, 2018

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

    @IAmThePan
    IAmThePan committed May 10, 2018
    0957ffd

  2. Update test snapshots

    @IAmThePan
    IAmThePan committed May 10, 2018
    f9cd25c