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
Supporter panels and partial theme handling #154
Merged
+1,164
−203
Merge branch 'develop' into feature/supporter
e352834
Select commit
7e5a5e7
Adding Supporter menu item (GH-1253)
zarembsky 5a9307b
Implementing conditional enabling/disabling of Supporter menu item.
zarembsky e051b0d
Header badge implemented
zarembsky fc686bb
Adding Subscription components.
zarembsky e12966d
Adding react files to support Subscription view in the panel.
zarembsky 4a8bab4
Adding Golden Badge panel.
zarembsky aa750d0
Moving inline styles for subscriber panel to scss.
zarembsky f1fb5a4
Merge branch 'develop' into feature/supporter
zarembsky 9e556a8
Merge discrepancies
zarembsky 63878dd
Working on Themes
zarembsky a5c94f5
Styling
zarembsky bff0710
Merge branch 'develop' into feature/supporter
zarembsky c837bdc
Good state #1.
zarembsky 9193671
Adding fields to Subscription info
zarembsky fba7cb7
Merge branch 'develop' into feature/supporter
zarembsky 3b5b2a4
Continue styling.
zarembsky 8497b93
Adding Subscribe panel.
zarembsky d793e65
Merge branch 'develop' into feature/supporter
zarembsky 19e867a
Adding support for subscription data in the background.
zarembsky 6f1e508
Merge branch 'develop' into feature/supporter
zarembsky 6cdbead
Connecting background
zarembsky c3438bc
Implementing supporter connection.
zarembsky f2632df
Code cleanup
zarembsky d8c2066
Working on Midnight theme
zarembsky f4a7be0
Working on Midnight theme.
zarembsky e280db5
Adding persisting of selected theme.
zarembsky 3b338f8
Persisting selected theme.
zarembsky bfa6e43
Style adjustments.
zarembsky 77a79d7
Lint and simplification.
zarembsky 5f5bcb1
Merge branch 'develop' into feature/supporter
zarembsky 2c65044
Merge branch 'develop' into feature/supporter
zarembsky 7398858
Adjustments according to changed requirements
zarembsky c35fe55
Merge branch 'develop' into feature/supporter
zarembsky 38f699e
More or less stable.
zarembsky eab146a
Multiple fixes.
zarembsky 1e3405c
Adding tracker stats
zarembsky 28b8b02
Fix for a bug.
zarembsky b8d7602
Commiting lint changes
zarembsky d4313d6
Removing inlined svg. Replacing supporter to subscriber.
zarembsky 4f3e735
Adding svg files for menu item and badge
zarembsky 93eb1e9
Adding react-svg package.
zarembsky d4f33a5
Adding manage-subscription.svg
zarembsky 2b37dfd
Adding subscribe-badge.svg
zarembsky 356344c
Merge branch 'develop' into feature/supporter
zarembsky 85c18bf
Merge branch 'develop' into feature/supporter
jsignanini ec62793
Merge branch 'develop' into feature/supporter
jsignanini 9de5889
Removing context menu from menu item
zarembsky 78aca6f
Improving UI.
zarembsky e3ab906
Lint fixes.
zarembsky 9807cc8
Merge branch 'develop' into feature/supporter
jsignanini 9c9f99f
Adding $2
zarembsky b85cf3e
Merge branch 'feature/supporter' of https://github.com/ghostery/ghost…
zarembsky 38f4402
Changing $gold color
zarembsky eb16f19
Changing highlight color
zarembsky 9cc45be
Requested changes.
zarembsky ecbd039
Additional requested changes
zarembsky 97d530c
Merge branch 'develop' into feature/supporter
jsignanini 1f1f911
Merge branch 'develop' into feature/supporter
jsignanini b941ae6
Minor fixes.
jsignanini 98227db
Improve setTheme remove logic.
jsignanini 0405e35
Fixes for theme.
zarembsky 3100863
Implement NavLink to ensure the correct route is marked as active.
jsignanini 8bb7958
Replace Link with NavLink.
jsignanini a244867
Minor fixes.
jsignanini c3c8b62
More minor fixes.
jsignanini e352834
Merge branch 'develop' into feature/supporter
jsignanini
Merged
Supporter panels and partial theme handling #154
Merge branch 'develop' into feature/supporter
Jul 17, 2018
Jul 17, 2018
Jul 18, 2018
Jul 18, 2018
Jul 18, 2018
Jul 19, 2018
Jul 19, 2018
Jul 19, 2018
Jul 19, 2018
Jul 20, 2018
Jul 20, 2018
Jul 20, 2018
Jul 20, 2018
Jul 24, 2018
Jul 24, 2018
Jul 25, 2018
Jul 25, 2018
Jul 25, 2018
Jul 25, 2018
Jul 25, 2018
Jul 26, 2018
Jul 26, 2018
Jul 30, 2018
Jul 31, 2018
Jul 31, 2018
Aug 1, 2018
Aug 1, 2018
Aug 6, 2018
Aug 7, 2018
Aug 7, 2018
Aug 13, 2018
Aug 13, 2018
Aug 13, 2018
Aug 14, 2018
Aug 15, 2018
Aug 15, 2018
Aug 15, 2018
Aug 15, 2018
Aug 16, 2018
Aug 16, 2018
Aug 16, 2018
Aug 16, 2018
Aug 16, 2018
Aug 16, 2018
Aug 22, 2018
Aug 22, 2018
Aug 22, 2018
Aug 22, 2018
Aug 22, 2018
Aug 24, 2018
Aug 24, 2018
Aug 24, 2018
Aug 24, 2018
Aug 24, 2018
Aug 27, 2018
Aug 27, 2018
Aug 28, 2018
Aug 30, 2018
Aug 30, 2018
Aug 30, 2018
Aug 30, 2018
Aug 31, 2018
Aug 31, 2018
Aug 31, 2018
Aug 31, 2018
Aug 31, 2018
e352834
Select commit
7e5a5e7
Adding Supporter menu item (GH-1253)
zarembsky 5a9307b
Implementing conditional enabling/disabling of Supporter menu item.
zarembsky e051b0d
Header badge implemented
zarembsky fc686bb
Adding Subscription components.
zarembsky e12966d
Adding react files to support Subscription view in the panel.
zarembsky 4a8bab4
Adding Golden Badge panel.
zarembsky aa750d0
Moving inline styles for subscriber panel to scss.
zarembsky f1fb5a4
Merge branch 'develop' into feature/supporter
zarembsky 9e556a8
Merge discrepancies
zarembsky 63878dd
Working on Themes
zarembsky a5c94f5
Styling
zarembsky bff0710
Merge branch 'develop' into feature/supporter
zarembsky c837bdc
Good state #1.
zarembsky 9193671
Adding fields to Subscription info
zarembsky fba7cb7
Merge branch 'develop' into feature/supporter
zarembsky 3b5b2a4
Continue styling.
zarembsky 8497b93
Adding Subscribe panel.
zarembsky d793e65
Merge branch 'develop' into feature/supporter
zarembsky 19e867a
Adding support for subscription data in the background.
zarembsky 6f1e508
Merge branch 'develop' into feature/supporter
zarembsky 6cdbead
Connecting background
zarembsky c3438bc
Implementing supporter connection.
zarembsky f2632df
Code cleanup
zarembsky d8c2066
Working on Midnight theme
zarembsky f4a7be0
Working on Midnight theme.
zarembsky e280db5
Adding persisting of selected theme.
zarembsky 3b338f8
Persisting selected theme.
zarembsky bfa6e43
Style adjustments.
zarembsky 77a79d7
Lint and simplification.
zarembsky 5f5bcb1
Merge branch 'develop' into feature/supporter
zarembsky 2c65044
Merge branch 'develop' into feature/supporter
zarembsky 7398858
Adjustments according to changed requirements
zarembsky c35fe55
Merge branch 'develop' into feature/supporter
zarembsky 38f699e
More or less stable.
zarembsky eab146a
Multiple fixes.
zarembsky 1e3405c
Adding tracker stats
zarembsky 28b8b02
Fix for a bug.
zarembsky b8d7602
Commiting lint changes
zarembsky d4313d6
Removing inlined svg. Replacing supporter to subscriber.
zarembsky 4f3e735
Adding svg files for menu item and badge
zarembsky 93eb1e9
Adding react-svg package.
zarembsky d4f33a5
Adding manage-subscription.svg
zarembsky 2b37dfd
Adding subscribe-badge.svg
zarembsky 356344c
Merge branch 'develop' into feature/supporter
zarembsky 85c18bf
Merge branch 'develop' into feature/supporter
jsignanini ec62793
Merge branch 'develop' into feature/supporter
jsignanini 9de5889
Removing context menu from menu item
zarembsky 78aca6f
Improving UI.
zarembsky e3ab906
Lint fixes.
zarembsky 9807cc8
Merge branch 'develop' into feature/supporter
jsignanini 9c9f99f
Adding $2
zarembsky b85cf3e
Merge branch 'feature/supporter' of https://github.com/ghostery/ghost…
zarembsky 38f4402
Changing $gold color
zarembsky eb16f19
Changing highlight color
zarembsky 9cc45be
Requested changes.
zarembsky ecbd039
Additional requested changes
zarembsky 97d530c
Merge branch 'develop' into feature/supporter
jsignanini 1f1f911
Merge branch 'develop' into feature/supporter
jsignanini b941ae6
Minor fixes.
jsignanini 98227db
Improve setTheme remove logic.
jsignanini 0405e35
Fixes for theme.
zarembsky 3100863
Implement NavLink to ensure the correct route is marked as active.
jsignanini 8bb7958
Replace Link with NavLink.
jsignanini a244867
Minor fixes.
jsignanini c3c8b62
More minor fixes.
jsignanini e352834
Merge branch 'develop' into feature/supporter
jsignanini