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 1960 & GH-2028 ForgotPassword Hub Error Message and Loading Icon Fix #533

Merged
merged 4 commits into from Apr 26, 2020
+123 −192
Merged

GH 1960 & GH-2028 ForgotPassword Hub Error Message and Loading Icon Fix #533

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d3f24ae
Cancel button brings you back to log in page
benstrumeyer Apr 23, 2020
1908c12
Add error toast message in hub and minor style changes
benstrumeyer Apr 24, 2020
a1074f8
Move loader to a partials scss file to be used in panel and hub
benstrumeyer Apr 24, 2020
b4f9b36
Merge branch 'develop' into GH-1960/fix
christophertino Apr 26, 2020
File filter
Filter file types
Clear filters
Jump to
Jump to file
Failed to load files.

Always

Just for now

Prev
Loading status checks…
Merge branch 'develop' into GH-1960/fix
  • Loading branch information
@christophertino
christophertino committed Apr 26, 2020
Verified
This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: 4AEE18F83AFDEB23 Learn about vigilant mode.
commit b4f9b368959304a496e1eb3f73c9eddb9b7053ae
1 app/Account/AccountActions.js
View file
Open in desktop
@@ -30,6 +30,7 @@ import {
GET_USER_SUBSCRIPTION_DATA_SUCCESS
} from './AccountConstants';
import { SET_TOAST } from '../hub/Views/AppView/AppViewConstants';
import { CLEAR_THEME } from '../panel/constants/constants';

export const getUserSettings = () => dispatch => (
sendMessageInPromise('account.getUserSettings')
You are viewing a condensed version of this merge commit. You can view the full changes here.
ProTip! Use n and p to navigate between commits in a pull request.