aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Expand)AuthorAgeFilesLines
* Clearup after lockpattern experimentsDominik Schürmann2015-01-061-25/+25
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-01-063-8/+11
|\
| * encapsulate high level edit key into new operation classVincent Breitmoser2015-01-031-4/+6
| * get rid of RuntimeException control flow in UncachedKeyRing.fromStreamVincent Breitmoser2015-01-021-1/+2
| * fix small merge conflict oversightVincent Breitmoser2014-12-301-3/+0
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-12-301-32/+85
| |\
| * | add PIN as a SecretKeyTypeVincent Breitmoser2014-12-301-0/+3
* | | Passphrase wizard testsDominik Schürmann2015-01-062-22/+627
| |/ |/|
* | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-12-292-4/+12
|\|
| * introduce new ChangeUnlockParcel packet for extended passphrase changing capa...Vincent Breitmoser2014-12-292-4/+12
* | New work on PIN and lock pattern UIDominik Schürmann2014-12-291-32/+85
|/
* Fix crash on first time wizardDominik Schürmann2014-12-281-2/+2
* Fix to preselect certification key if only one is availableVincent Breitmoser2014-10-291-1/+1
* remove unused ExchangeKeySpinner classVincent Breitmoser2014-10-291-100/+0
* retrofit getBlob method of matrixcursor for android 2.3Vincent Breitmoser2014-10-271-1/+20
* Rename multi certify files to certifyDominik Schürmann2014-10-266-22/+17
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-261-1/+1
|\
| * disable cancel button instead of hiding it on cancel preventionVincent Breitmoser2014-10-261-1/+1
* | Fix notify after certifyDominik Schürmann2014-10-262-26/+20
|/
* Use new safe slinger activity from share tabDominik Schürmann2014-10-261-76/+26
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-261-8/+11
|\
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-10-261-10/+10
| |\
| * | implement upload of keyring after certification, check that option by defaultVincent Breitmoser2014-10-261-8/+11
* | | Move advanced info into own activityDominik Schürmann2014-10-264-253/+214
| |/ |/|
* | Keyboard testsDominik Schürmann2014-10-261-10/+10
|/
* Fail on unknown key ids on API, Key item design consistency for APIDominik Schürmann2014-10-262-3/+4
* Fix layout of select key adapterDominik Schürmann2014-10-261-4/+4
* Remove empty layoutDominik Schürmann2014-10-251-24/+0
* Remove PassphraseDialogFragmentDominik Schürmann2014-10-252-435/+2
* Remove old certify activityDominik Schürmann2014-10-253-461/+1
* Use passphrase dialog activity instead of passphrase dialogDominik Schürmann2014-10-253-36/+67
* Remove old exception handling code from loadersDominik Schürmann2014-10-251-35/+3
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-251-1/+10
|\
| * remove unnecessary (and buggy) BufferedInputStream wrappingVincent Breitmoser2014-10-251-1/+10
* | Fix color in import listDominik Schürmann2014-10-251-6/+8
|/
* Remove tabs from import keys activityDominik Schürmann2014-10-253-320/+62
* Fix result passingDominik Schürmann2014-10-252-2/+1
* Safeslinger fixesÄDominik Schürmann2014-10-251-4/+6
* Fix safe slinger buttonDominik Schürmann2014-10-251-1/+1
* Fix safe slinger buttonDominik Schürmann2014-10-251-2/+4
* Use selected number of users in safe slingerDominik Schürmann2014-10-251-0/+1
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-251-0/+2
|\
| * set padding for sublog entriesVincent Breitmoser2014-10-251-0/+2
* | Safe slinger activity prepsDominik Schürmann2014-10-253-141/+231
|/
* Merge pull request #973 from timbray/developmentDominik Schürmann2014-10-241-5/+6
|\
| * Make the Certify screen a little more self-explanatoryTim Bray2014-10-211-5/+6
* | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-233-15/+22
|\ \
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-10-238-31/+54
| |\|
| * | integrate download from keyserver into key import operationVincent Breitmoser2014-10-233-13/+20
* | | Start safe slinger activityDominik Schürmann2014-10-231-0/+43
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 15:02:46 +0000