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 Intro Hub Forgot Password #507

Merged
merged 15 commits into from Apr 16, 2020
+301 −19
Merged

GH-1960 Intro Hub Forgot Password #507

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ba5d040
Add ForgotPassword view to hub. Move related code from panel to share…
benstrumeyer Mar 5, 2020
6474c4a
Remove unused scss
benstrumeyer Mar 5, 2020
1cbf85c
Update and remove comments
benstrumeyer Mar 5, 2020
c97b10c
Move ForgotPassword to shared-components
benstrumeyer Apr 7, 2020
2e1a3f7
Hook up redux. Start merging panel and hub jsx and scss
benstrumeyer Apr 9, 2020
665c985
Reuse panel css inside hub
benstrumeyer Apr 13, 2020
b6a8814
Use shared ForgotPassword component in hub and panel
benstrumeyer Apr 16, 2020
ddd9ddd
Move functions back to app/panel/utils
benstrumeyer Apr 16, 2020
1e249b1
Delete functions from app/panel/utils. Remove console log
benstrumeyer Apr 16, 2020
083fa31
Fix imports for shared utils functions
benstrumeyer Apr 16, 2020
53681db
Minor css changes
benstrumeyer Apr 16, 2020
bb862bd
More minor css changes
benstrumeyer Apr 16, 2020
e438ce8
Merge branch 'develop' into feature/intro-hub-forgot-password
christophertino Apr 16, 2020
2beef10
Add document header to sass file
benstrumeyer Apr 16, 2020
9e2d393
Merge branch 'feature/intro-hub-forgot-password' of github.com:ghoste…
benstrumeyer Apr 16, 2020
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 feature/intro-hub-forgot-password

  • Loading branch information
@christophertino
christophertino committed Apr 16, 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 e438ce892039b99051203ffd905c4e782010a9a7

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.