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.

Sign up for GitHub

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

Keystore implementation. #351

Merged
merged 9 commits into from
Feb 2, 2018
Merged

Keystore implementation. #351

merged 9 commits into from
Feb 2, 2018

Commits on May 14, 2016

  1. add keystore implementation for desktop platforms

    @Kovak
    Kovak committed May 14, 2016
    Configuration menu
    Copy the full SHA
    4ef2100 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2016

  1. add android keystore

    @Kovak
    Kovak committed May 21, 2016
    Configuration menu
    Copy the full SHA
    0f94187 View commit details
    Browse the repository at this point in the history

  2. fix keying

    @Kovak
    Kovak committed May 21, 2016
    Configuration menu
    Copy the full SHA
    1921f56 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2016

  1. add ios implementation for keystore

    @Kovak
    Kovak committed Jun 10, 2016
    Configuration menu
    Copy the full SHA
    fac46a8 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2016

  1. convert from objc-str to pystring

    @Kovak
    Kovak committed Jun 13, 2016
    Configuration menu
    Copy the full SHA
    d5197fd View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2016

  1. Merge remote-tracking branch 'upstream/master' 

    Conflicts:
	plyer/__init__.py
	plyer/facades/__init__.py
    @brentpicasso
    brentpicasso committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    6e22822 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2017

  1. Merge remote-tracking branch 'upstream/master'

    @brentpicasso
    brentpicasso committed Jul 16, 2017
    Configuration menu
    Copy the full SHA
    03dd4c8 View commit details
    Browse the repository at this point in the history

  2. fix merge garbage

    @brentpicasso
    brentpicasso committed Jul 16, 2017
    Configuration menu
    Copy the full SHA
    2cdc8a7 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2018

  1. Merge branch 'master' into master

    @akshayaurora
    akshayaurora authored Feb 2, 2018
    Configuration menu
    Copy the full SHA
    566f8a4 View commit details
    Browse the repository at this point in the history