Skip to content
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

upgraded google2fa (0.7->5.0) #3619

Merged
merged 5 commits into from
Jul 13, 2019
Merged

Conversation

mx2s
Copy link
Contributor

@mx2s mx2s commented May 24, 2019

@welcome
Copy link

welcome bot commented May 24, 2019

Congratulations on opening your first Pull Request, this is a momentous day for you and us! ✨
To help us out, please make sure that you've followed the below:

Copy link

@accesslint accesslint bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are accessibility issues in these changes.

resources/views/dashboard/user/index.blade.php Outdated Show resolved Hide resolved
Copy link

@accesslint accesslint bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👏 You fixed the issue(s)! Great work.

@mx2s mx2s changed the title upgraded google2fa (0.7->5.0) & composer deps upgraded google2fa (0.7->5.0) May 24, 2019
@jbrooksuk
Copy link
Member

Hey, thanks for opening this @MXSS. I'm unsure how I feel about requiring Imagemagick to be installed as well.

Is there an alternative?

@jbrooksuk jbrooksuk self-assigned this Jun 23, 2019
@mx2s
Copy link
Contributor Author

mx2s commented Jun 24, 2019

@jbrooksuk in recent versions of used package (pragmarx/google2fa) image generation is disabled that why I had to install additional package Bacon/QRCode which requires imagick

You can check package readme for more details:
https://github.com/antonioribeiro/google2fa

there's a few alternatives to that package but I'm not sure yet if we can get rid of imagick, I'll take a look

@jbrooksuk
Copy link
Member

Thanks @MXSS!

GD is much easier to install and is typical of most installations that I've come across, whereas I find Imagemagick less common.

@jbrooksuk
Copy link
Member

It looks like https://github.com/chillerlan/php-qrcode has SVG support and doesn't list GD or Imagemagick as a requirement in composer.json.

removed imagick dependency

Signed-off-by: Max Kovalenko <[email protected]>
@mx2s
Copy link
Contributor Author

mx2s commented Jun 26, 2019

@jbrooksuk done

@jbrooksuk
Copy link
Member

Nice! Could you rebase this please and we'll merge it in?

@jbrooksuk jbrooksuk merged commit c6e4447 into cachethq:2.4 Jul 13, 2019
@welcome
Copy link

welcome bot commented Jul 13, 2019

Hooray! Your first Pull Request was merged, here's to many more 🚀

@mx2s mx2s deleted the upgrade-google2fa branch July 13, 2019 08:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants