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

GH-1675: total requests modified readout (& summary refactors) #392

Merged
merged 141 commits into from Jun 11, 2019
+1,560 −1,440
Merged

GH-1675: total requests modified readout (& summary refactors) #392

Changes from 1 commit
Commits
Show all changes
141 commits
Select commit Hold shift + click to select a range
b64fdae
Remove old Plus banner/logo
wlycdgr Mar 20, 2019
68378c6
Merge branch 'develop' into GH-1593_and_GH-1594/UpgradePlus-banner-an…
wlycdgr Apr 8, 2019
a131dfb
Add green upgrade banner to Summary component
wlycdgr Apr 8, 2019
26953b0
Merge branch 'develop' into GH-1593_and_GH-1594/UpgradePlus-banner-an…
wlycdgr Apr 12, 2019
8e409d6
Add upgrade banner class
wlycdgr Apr 12, 2019
a8f4602
Fix classNames -> className typo
wlycdgr Apr 12, 2019
cd6148a
Implement CSS for green upgrade banner
wlycdgr Apr 12, 2019
208fcd4
Display smaller upgrade banner in summary view when on detailed tab
wlycdgr Apr 12, 2019
dd1de6f
Adjust position of smaller upgrade banner upwards a little to avoid o…
wlycdgr Apr 12, 2019
ec59226
Add gold subscriber icon to display when a subscribed user is signed in
wlycdgr Apr 12, 2019
b3a380b
Finish implementation of plus upgrade banner and gold icon display lo…
wlycdgr Apr 14, 2019
4e0af1e
Remove debug code and redundant variable from Summary#render
wlycdgr Apr 14, 2019
901e06e
Refactor Summary#render for clarity
wlycdgr Apr 15, 2019
5c861d9
Add green upgrade banner and gold plus icon SVGs for expanded view
wlycdgr Apr 15, 2019
d4dedb3
Add expanded view upgrade banner div stub to Header#render. Refactor …
wlycdgr Apr 15, 2019
c9eb688
Merge branch 'develop' into GH-1593_and_GH-1594/UpgradePlus-banner-an…
wlycdgr Apr 16, 2019
499051f
Display gold icon in expanded view if user is a logged-in subscriber
wlycdgr Apr 16, 2019
6273e6e
Stub click on badge in expanded view
wlycdgr Apr 16, 2019
8c8b7fd
Replicate dev behavior of badge clicking in Header in expanded view
wlycdgr Apr 16, 2019
8e7abf1
Rename upgrade banner / gold plus badge click handler for clarity
wlycdgr Apr 16, 2019
dbdea1e
Add badge CSS classes to extended view badges. These need updating
wlycdgr Apr 16, 2019
9aedc21
Correct subscriber redirect path for gold plus icon click handler in …
wlycdgr Apr 16, 2019
43b5e81
Update badge CSS
wlycdgr Apr 16, 2019
4cc227b
Tweak CSS for expanded view upgrade banner and gold plus icon to spec
wlycdgr Apr 16, 2019
8c4a316
Remove reference to non-extant state.header from header container map…
wlycdgr Apr 16, 2019
740f61b
Implement show/hide logic for header upgrade banner and gold plus icon
wlycdgr Apr 16, 2019
5ebbd1e
Factor kebab div out to const for clarity in Header#render
wlycdgr Apr 16, 2019
d0c3b4f
Tweak gold plus icon expanded view SVG to make sure Plus is more cent…
wlycdgr Apr 16, 2019
6035749
Finish clarity refactor of Summary#render
wlycdgr Apr 16, 2019
a0170de
Nudge summary content down in expert view so green upgrade banner can…
wlycdgr Apr 16, 2019
8534297
Adjust positioning of simple/detailed view upgrade banners and gold i…
wlycdgr Apr 17, 2019
2a43fa9
Add click handling for simple and detailed view upgrade banner and go…
wlycdgr Apr 17, 2019
dfb9596
Switch between upgrade banner and gold icon in Summary view on sign i…
wlycdgr Apr 17, 2019
1f31716
Merge branch 'develop' into GH-1593_and_GH-1594/UpgradePlus-banner-an…
IAmThePan Apr 18, 2019
10631ab
Decompose totalTrackersBlockedAndPageLoadTime in Summary#render
wlycdgr Apr 18, 2019
be447e7
Remove duplication from return of Summary#render
wlycdgr Apr 18, 2019
069fca6
Merge branch 'GH-1593_and_GH-1594/UpgradePlus-banner-and-logo' of git…
wlycdgr Apr 18, 2019
c38b4b5
Fix Summary view display in Midnight theme on Detailed tab. Realign g…
wlycdgr Apr 18, 2019
ce7158b
Display subscriber badge in header in gold in Midnight theme
wlycdgr Apr 19, 2019
80a1736
Add upgrade banner text to locale strings file. Remove SVG upgarde te…
wlycdgr Apr 19, 2019
26c6ab0
Finalize CSS for upgrade banner text. Delete duplicate upgrade banner…
wlycdgr Apr 19, 2019
de6aa6b
Convert 'upgrade to' text in the green banner from SVG to text for sm…
wlycdgr Apr 19, 2019
c7a43ee
Make sure upgrade banner or subscriber badge display in the hamburger…
wlycdgr Apr 19, 2019
1873388
Stub out Requests Modified readout. Begin to specify CSS, click handler.
wlycdgr Apr 22, 2019
977b610
Swap locale string in for stub for Requests Modified
wlycdgr Apr 22, 2019
4517abc
Display the Requests Modified total in the spec shade of blue
wlycdgr Apr 22, 2019
ad9da95
Add tooltip for Requests Modified readout
wlycdgr Apr 22, 2019
86abd20
Adjust expert mode Summary view CSS so everything fits nicely with th…
wlycdgr Apr 22, 2019
7d5c5cd
Tweak Summary condensed view CSS so everything fits nicely with the n…
wlycdgr Apr 22, 2019
3ce8e6b
Position Requests Modified tooltip correctly in Condensed version of …
wlycdgr Apr 22, 2019
44c8b5c
Remove unusued click handler from Summary. Make Requests Modified rea…
wlycdgr Apr 22, 2019
b69cb7b
Merge in develop after resolving conflicts
wlycdgr Apr 28, 2019
ae24d6d
Remove smart blocking from Requests Modified total. Update tooltip co…
wlycdgr Apr 29, 2019
979165f
Merge branch 'develop' into GH-1675_TrackerListBreakdown-TotalCount
wlycdgr May 1, 2019
8ae8d7c
Remove obsolete abPause code in Summary and related files
wlycdgr May 2, 2019
d36ae0d
Update PauseButton snapshots to reflect removal of abPause code
wlycdgr May 2, 2019
7ef5f82
Remove abPause css from _summary.scss
wlycdgr May 2, 2019
ea44cee
Remove this.pauseLeft property from PauseButton
wlycdgr May 2, 2019
e02077b
Clean up PauseButton dropdown container JSX and CSS
wlycdgr May 2, 2019
7f79415
Update failing PauseButton test snapshot to reflect removal of abPaus…
wlycdgr May 2, 2019
7f3e45a
Remove abPause CSS from _ghostery_features partial
wlycdgr May 2, 2019
0983485
Refactor PauseButton#render
wlycdgr May 3, 2019
87a1cd5
Begin removal of abPause CSS
wlycdgr May 5, 2019
6c83c7e
Continue removing abPause CSS
wlycdgr May 5, 2019
212434c
Remove dropdown abPause CSS from pause button css
wlycdgr May 6, 2019
f743ef5
Further clean up pause button css
wlycdgr May 6, 2019
12e691e
Refactor Summary scss towards modified BEM structure
wlycdgr May 6, 2019
0a23283
Continue CSS refactor for Summary and sub-components
wlycdgr May 6, 2019
63c03e0
Refactor CliqzFeatures out to a generic CliqzFeature building block c…
wlycdgr May 7, 2019
da976b3
Remove CliqzFeatures
wlycdgr May 7, 2019
0204bed
Work to generalize GhosteryFeatures out to GhosteryFeature. CSS and J…
wlycdgr May 9, 2019
d6db970
Finish implementation of GhosteryFeature. Remove GhosteryFeatures.
wlycdgr May 9, 2019
7119fc5
Merge in develop
wlycdgr May 11, 2019
5ecba97
Fix typo & comment placement error
wlycdgr May 13, 2019
efd5d67
Update prop name in CliqzFeature
wlycdgr May 13, 2019
a29bbfd
Rewrite feature-name string interpolation in CliqzFeature
wlycdgr May 13, 2019
db38c79
Send the right data to ad block and smart block Cliqz features
wlycdgr May 13, 2019
292fd5b
Clean up CliqzFeature
wlycdgr May 13, 2019
5c55d73
Cleanup Summary#render
wlycdgr May 13, 2019
b74837f
Break up Summary#render with render helper functions
wlycdgr May 13, 2019
a1df93d
Factor donut and page host readout rendering to render helpers in Sum…
wlycdgr May 13, 2019
1b6c65b
Factor sbBlocked, sbAllowed, sbAdjust, and totalTrackersBlockedCount …
wlycdgr May 13, 2019
9487eb2
Factor antiTrackUnsafe, adBlockBlocked, and totalTrackersFound out to…
wlycdgr May 13, 2019
3fc59a9
Continue refactor of Summary
wlycdgr May 13, 2019
ecd3139
Factor out rendering of GhosteryFeature components to generic render …
wlycdgr May 13, 2019
6a9fff3
Clean up Summary.jsx
wlycdgr May 15, 2019
7ec35c1
Remove unused Custom button handling code from Summary#clickSitePolicy
wlycdgr May 15, 2019
5634995
Clean up CliqzFeature
wlycdgr May 15, 2019
fa1d0df
Comment public CliqzFeature methods. Refactor _getCount helpers.
wlycdgr May 15, 2019
64a3a2b
Doc GhosteryFeature#handleClick. Remove redundant check for paused or…
wlycdgr May 15, 2019
f6250e9
Make semantic constants for whitelist and blacklist site policy states
wlycdgr May 15, 2019
606fc0f
Etend the user of BLACKLIST and WHITELIST globals to Summary. Update …
wlycdgr May 15, 2019
3692dad
Fix page host text alignment
wlycdgr May 15, 2019
65e48a7
Fix page host readout display logic bug
wlycdgr May 15, 2019
e5b6df2
Fix bug that kept GhosteryFeature button text from rendering
wlycdgr May 16, 2019
c5f368c
Make progress towards fixing Trust button CSS
wlycdgr May 16, 2019
3b9a24c
Refactor CSS for GhosteryFeatureButtons
wlycdgr May 16, 2019
04d1242
Modify GhosteryFeature#render to account for CSS updates to GhosteryF…
wlycdgr May 16, 2019
ed4dd1b
Create shared helper classes SASS file. Use these glasses in Ghostery…
wlycdgr May 19, 2019
a428570
Add Foundation button class back to Ghostery Feature button element.
wlycdgr May 22, 2019
e6f1159
Fix text color in Ghostery Feature Buttons. Make sure ghostery featur…
wlycdgr May 29, 2019
069ae5d
Implement BEM CSS for Cliqz Feature icon and count elements
wlycdgr May 29, 2019
a465084
Implement BEM CSS for CliqzFeature feature-name element
wlycdgr May 29, 2019
68f4b54
Implement BEM CSS for stats nav button
wlycdgr Jun 1, 2019
da4ea2e
Implement BEM CSS for green upgrade banner
wlycdgr Jun 2, 2019
0f569c3
Finish and debug BEM CSS for green upgrade banner
wlycdgr Jun 3, 2019
44110b0
Move upgrade banner css to its own partial
wlycdgr Jun 3, 2019
6516f1c
Implement BEM CSS for subscriber badge
wlycdgr Jun 3, 2019
40001d3
Update classes in the JSX for the trackers blocked and requests modif…
wlycdgr Jun 3, 2019
46d7a94
Implement BEM CSS for Donut Graph component
wlycdgr Jun 4, 2019
d5ef546
Convert total tracker count display in Condensed view to BEM
wlycdgr Jun 4, 2019
39c07b6
Fix hover state and feature_name element CSS for CliqzFeature. Clean …
wlycdgr Jun 4, 2019
7187b39
Debug and cleanup CliqzFeature component and its SCSS partial
wlycdgr Jun 5, 2019
896ea62
Uncomment mouseleave handler in Tooltip
wlycdgr Jun 5, 2019
a6f8079
Move GhosteryKVReadout CSS to SummaryPageStat
wlycdgr Jun 6, 2019
c561a55
Clean up page stat render helpers in Summary. Remove GhosteryKVReadou…
wlycdgr Jun 6, 2019
a1aff4d
Finalize summary page host container element and summary page host bl…
wlycdgr Jun 6, 2019
d0cb6fb
Finalize summary page stats container, page stat container, and page …
wlycdgr Jun 6, 2019
ddc3cbd
Simplify CliqzFeature CSS. Reorganize partial based on block-level mo…
wlycdgr Jun 9, 2019
346102d
Fix typo
wlycdgr Jun 9, 2019
09100a0
Rename _ghostery_features partial to _ghostery_feature
wlycdgr Jun 9, 2019
f87c273
Ghostery Feature button alignment and styling fixes. Centered page st…
wlycdgr Jun 9, 2019
3ac3533
Fix Trust button tooltip
wlycdgr Jun 9, 2019
9428034
Fix alignment for ghostery features tooltips in expert mode
wlycdgr Jun 10, 2019
4f4359e
Remove silly placeholder name in pause button CSS. Fix summary vertic…
wlycdgr Jun 10, 2019
0564e52
Fix ghostery feature tooltip alignment in condensed view
wlycdgr Jun 10, 2019
8e2a117
Fix cliqz feature state change notifications bug
wlycdgr Jun 10, 2019
5fe0d0f
Finish fixing and organizing tooltip CSS for trust, restrict, pause, …
wlycdgr Jun 10, 2019
caace4a
Nudge cliqz icons up in expert view
wlycdgr Jun 10, 2019
fe16a44
Finalize requests modified page stat tooltip CSS
wlycdgr Jun 10, 2019
7aad2c3
Finalize total tracker count tooltip CSS
wlycdgr Jun 10, 2019
e52c373
Finalize css for donut number tooltip
wlycdgr Jun 10, 2019
f024579
Make donut category tooltips show again
wlycdgr Jun 10, 2019
0e84e9e
Restore Foundation formatting to donut category tooltips
wlycdgr Jun 10, 2019
1052d93
Update pause button snapshots and tests to reflect code updates
wlycdgr Jun 10, 2019
25d13d1
Merge branch 'develop' into GH-1675_TrackerListBreakdown-TotalCount
wlycdgr Jun 10, 2019
522397e
Fix typo in panel.scss. Remove double header in ghostery_feature.scss…
wlycdgr Jun 10, 2019
870b9c8
Remove count from Cliqz Features, replace with ON/OFF indicator (#393)
IAmThePan Jun 10, 2019
e7a8adc
Remove commented out code from GhosteryFeature
wlycdgr Jun 11, 2019
d7c9559
Make CliqzFeature-specific locale string keys for CliqzFeature status…
wlycdgr Jun 11, 2019
8d54958
Merge branch 'develop' into GH-1675_TrackerListBreakdown-TotalCount
jsignanini Jun 11, 2019
File filter
Filter file types
Clear filters
Jump to
Jump to file
Failed to load files.

Always

Just for now

Prev Next
Loading status checks…

Merge branch 'develop' into GH-1593_and_GH-1594/UpgradePlus-banner-an… 

…d-logo
  • Loading branch information
@wlycdgr
wlycdgr committed Apr 16, 2019
commit c9eb688373be73e2404faccc017494903e1b408e

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.

ProTip! Use n and p to navigate between commits in a pull request.