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/edge offers #352

Closed
wants to merge 51 commits into from
Closed

Feature/edge offers #352

wants to merge 51 commits into from

Conversation

@zarembsky
Copy link
Contributor

@zarembsky zarembsky commented Mar 7, 2019

  • Have you followed the guidelines in CONTRIBUTING.md?
  • Have you checked to ensure there aren't other open Pull Requests for the same update/change?
  • Have you added an explanation of what your changes do?
  • Does your submission pass tests?
  • Did you lint your code prior to submission?
jsignanini and others added 30 commits Nov 19, 2018
@jsignanini
Bump hotfix version.
3e28a5b
@jsignanini
Upgrade browser-core.
322a49e
@jsignanini
Update yarn lockfile.
34ac849
@zarembsky @jsignanini
GH-971: Update copy (#163)
3ca8049
@zarembsky @jsignanini
Fix bugs (#168)
77ba7f0
@jsignanini
Upgrade browser-core.
81d9e7a
@trickpattyFH20 @jsignanini
Fix transparent background for reward logos (#169)
42a655d
@jsignanini
Fix confirm email validation not checking for email, confirmEmail equ…
2970c3e 
…ality.
@sammacbeth @jsignanini
Pass ghostery pause and whitelisted sites to content scripts. (#175)
b46da56 
* Pass ghostery pause and whitelisted sites to content scripts.

Allows content scripts to stop processing when the user pauses ghostery

* Use dispatcher to listen to paused status.
@sammacbeth @jsignanini
Update browser-core to 7.29.2
1faf48a
Khaled @jsignanini
Upgrade whatwg-fetch library to fix import webextension fetch (#200)
c8bba95
@trickpattyFH20 @jsignanini
GH-1334 GH-1339 optional rewards code (#201)
3438b37
@trickpattyFH20 @jsignanini
GH-1404 move offer logo to header (#205)
3ce7384
@trickpattyFH20 @jsignanini
add benefit to panel rewards hub (#206)
1e382f0
@zhonghao-cliqz @jsignanini
Update browser-core to 7.30.0 (#207)
fae68e5
@trickpattyFH20 @jsignanini
upgrade webpack and browser-core (#210)
dad69f1
@zarembsky @jsignanini
Fix for GH-1251 and for broken Donut. (#212)
ac8fdf1 
* Fix for GH-1251 and for broken Donut.

* remove d3-scale dependency
@trickpattyFH20 @jsignanini
move webpack back to devDeps (#211)
b64e20d
@trickpattyFH20 @jsignanini
improve d3 module imports (#213)
6ff4c60
@trickpattyFH20 @jsignanini
GH-1351 show benefit and title in rewards list (#219)
bd4f644
@IAmThePan @jsignanini
Change header link text to icon image to prevent overlap with tabs (#225
bc83138 
)
@zarembsky @jsignanini
Fix for GH-1425. Fails to add site to trust/restrict list while on ex…
e435654 
…tension page. (#221)
@IAmThePan @jsignanini
GH-1408 fix global blocking tracker dropdown (#220)
638e6c7
@IAmThePan @jsignanini
Update the position of the Profile Icon on the header (#226)
96c0937
@Eden12345 @jsignanini
Change CSS to prevent scrolling bug; also remove unnecessary overflow…
a27cc16 
…-x (#227)
@IAmThePan @jsignanini
GH-1448 Make the SignIn/VerifyAccount link an icon for all panel views (
637f5da 
#235)
@Eden12345 @jsignanini
Minor coordinate change in SVG viewbox (#233)
a3f23d0
@Eden12345 @jsignanini
Make changes to overflow attributes to avoid unnecessary scrollbars (#…
52d8f16 
…232)
@Eden12345 @jsignanini
GH-1435: Unexpected Expansion of Filtered Categories (#228)
85d3313
@IAmThePan @jsignanini
GH-1429 Add WebSockets and bump mininum version numbers (#234)
6558316
christophertino and others added 21 commits Nov 6, 2018
@christophertino @jsignanini
bump browser core version
71b7121
@sammacbeth @jsignanini
ABTest to switch users to new whilelist implementation (#239)
ff3459b
@zarembsky @jsignanini
Fix for GH-1460 and minor adjustment of css for rewards. (#243)
3e6e4f4
@christophertino @jsignanini
update browser core
9aa8842
@jsignanini
Update yarn.lock file.
Loading status checks…
9dcab7f
@christophertino
update changelog for v8.2.5
Loading status checks…
aad75d6
Ilya Zarembsky Ilya Zarembsky
Align Sign Up tooltip relative to its header icon and ensure it fits …
Loading status checks…
0b2e521 
…inside the panel
@IAmThePan @jsignanini
GH-1481 Remove WS permissions for Firefox (#255)
c09f77b
@wlycdgr @jsignanini
Fix sign in tooltip alignment. (#256)
396da47
@tsl143 @jsignanini
Better identifying Cliqz browser with extended runtime API flag (#251)
27b6f9e
@jsignanini
Bump version.
Loading status checks…
ce667a2
@zarembsky
Partial removal of IS_EDGE
69fb096
@zarembsky
Eliminating IS_EDGE
Loading status checks…
bf24402
@zarembsky
Removed unnecessary variable
Loading status checks…
51f7414
@zarembsky
Using latest package.
Loading status checks…
952d239
@zarembsky
Testing adblock v0.6.9
Loading status checks…
ee9bf5f
@zarembsky
Merge branch 'develop' into feature/edgeOffers
8d2cf85 
# Conflicts:
#	CHANGELOG.md
#	app/content-scripts/rewards/OfferCard.jsx
#	app/panel/components/CreateAccount.jsx
#	app/panel/components/Header.jsx
#	app/panel/utils/utils.js
#	app/scss/partials/_tooltip.scss
#	app/setup/components/Views/DataCollectionView.jsx
#	app/setup/components/Views/SetupChoiceView.jsx
#	manifest.json
#	package.json
#	src/background.js
#	src/classes/PanelData.js
#	src/classes/TabInfo.js
#	yarn.lock
@zarembsky
Restoring Offers.
76fa7d8
@zarembsky
Latest package from Philip
ab1b1f2
@zarembsky
Merge branch 'develop' into feature/edgeOffers
Loading status checks…
64b89f9 
# Conflicts:
#	package.json
#	yarn.lock
@zarembsky
Lint errors.
Loading status checks…
291a0e5
@zarembsky zarembsky requested review from IAmThePan, jsignanini, trickpattyFH20 and ghostery/ghostery as code owners Mar 7, 2019
@zarembsky zarembsky closed this Mar 7, 2019
@zarembsky zarembsky deleted the feature/edgeOffers branch Mar 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@IAmThePan IAmThePan

@jsignanini jsignanini

@trickpattyFH20 trickpattyFH20

@ghostery/ghostery Ghostery

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

10 participants
@zarembsky @jsignanini @trickpattyFH20 @sammacbeth @zhonghao-cliqz @IAmThePan @Eden12345 @christophertino @wlycdgr @tsl143