Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: onlykey/onlykey.github.io
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: heroku-deploy
Choose a base ref
...
head repository: onlykey/onlykey.github.io
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: development
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 11 commits
  • 7 files changed
  • 2 contributors

Commits on Aug 26, 2020

  1. test

    @onlykey
    onlykey committed Aug 26, 2020
    Configuration menu
    Copy the full SHA
    524415c View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2020

  1. Updated

    @onlykey
    onlykey committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    861d733 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2020

  1. testing recent changes

    @onlykey
    onlykey committed Dec 23, 2020
    Configuration menu
    Copy the full SHA
    70c2660 View commit details
    Browse the repository at this point in the history

  2. 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 <[email protected]>
    @bmatusiak @onlykey
    bmatusiak and onlykey authored Dec 23, 2020
    Configuration menu
    Copy the full SHA
    73a7a76 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2021

  1. update for heroku test

    @onlykey
    onlykey committed Jan 5, 2021
    Configuration menu
    Copy the full SHA
    83e0fec View commit details
    Browse the repository at this point in the history

  2. update for heroku test

    @onlykey
    onlykey committed Jan 5, 2021
    Configuration menu
    Copy the full SHA
    d97d4b2 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2021

  1. updates

    @onlykey
    onlykey committed Jan 9, 2021
    Configuration menu
    Copy the full SHA
    d63b915 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/development' into development 

    # Conflicts:
#	src/onlykey-fido2/onlykey/onlykey-api.js
    @onlykey
    onlykey committed Jan 9, 2021
    Configuration menu
    Copy the full SHA
    6159eb9 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2021

  1. update

    @onlykey
    onlykey committed Jan 10, 2021
    Configuration menu
    Copy the full SHA
    58ce5cc View commit details
    Browse the repository at this point in the history

  2. 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
    @onlykey
    onlykey committed Jan 10, 2021
    Configuration menu
    Copy the full SHA
    7f6e1e0 View commit details
    Browse the repository at this point in the history

  3. 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
    @onlykey
    onlykey committed Jan 10, 2021
    Configuration menu
    Copy the full SHA
    b0bca49 View commit details
    Browse the repository at this point in the history
Loading