My Next PR of changes#24
Merged
onlykey merged 9 commits intoonlykey:developmentfrom Dec 23, 2020
Merged
Conversation
onlykey
approved these changes
Dec 23, 2020
onlykey
added a commit
that referenced
this pull request
Jan 5, 2021
* test * Updated * testing recent changes * My Next PR of changes (#24) * removed chat plugin from dev build * disabled xterm console from build * more xterm removal * pw gen fix * fix for encrypt-file * fix for decryptFile * allow target_blank passtrough during link-takeover * update Co-authored-by: onlykey <onlykey@users.noreply.github.com> * update for heroku test * update for heroku test Co-authored-by: Bradley Matusiak <bmatusiak@gmail.com>
onlykey
added a commit
that referenced
this pull request
Jan 10, 2021
* test * Updated * testing recent changes * My Next PR of changes (#24) * removed chat plugin from dev build * disabled xterm console from build * more xterm removal * pw gen fix * fix for encrypt-file * fix for decryptFile * allow target_blank passtrough during link-takeover * update Co-authored-by: onlykey <onlykey@users.noreply.github.com> * update for heroku test * update for heroku test * updates * update * Merge branch 'heroku-deploy' into development # Conflicts: # src/app-src.html # src/onlykey-fido2/onlykey/kbpgp-2.1.0.ok.ecc.js # src/onlykey-fido2/onlykey/onlykey-api.js Co-authored-by: Bradley Matusiak <bmatusiak@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I will be adding all my changes here.. INCOMPLETE