aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
Commit message (Expand)AuthorAgeFilesLines
...
* | Fix to preselect certification key if only one is availableVincent Breitmoser2014-10-291-1/+1
* | remove unused ExchangeKeySpinner classVincent Breitmoser2014-10-291-100/+0
* | Close stream on key export to avoid partial write (see #986)Vincent Breitmoser2014-10-291-0/+7
* | retrofit getBlob method of matrixcursor for android 2.3Vincent Breitmoser2014-10-271-1/+20
|/
* Fix crash with NotFoundExceptionDominik Schürmann2014-10-261-3/+8
* 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-267-5/+30
|\
| * Display error on certification attempt with yubikeyVincent Breitmoser2014-10-262-0/+6
| * disable cancel button instead of hiding it on cancel preventionVincent Breitmoser2014-10-261-1/+1
| * fix consolidate if no secret key are presentVincent Breitmoser2014-10-261-2/+6
| * prevent cancel dring consolidate, move logic into progressableVincent Breitmoser2014-10-264-2/+17
* | 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-266-16/+56
|\
| * 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-266-16/+56
* | | Move advanced info into own activityDominik Schürmann2014-10-265-263/+214
| |/ |/|
* | Keyboard testsDominik Schürmann2014-10-261-10/+10
|/
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-10-264-7/+23
|\
| * Fail on unknown key ids on API, Key item design consistency for APIDominik Schürmann2014-10-264-3/+19
| * Fix layout of select key adapterDominik Schürmann2014-10-261-4/+4
* | Retry canonicalization with pubkey self certs if first attempt failedVincent Breitmoser2014-10-262-4/+17
|/
* 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-253-8/+20
|\
| * remove unnecessary (and buggy) BufferedInputStream wrappingVincent Breitmoser2014-10-253-8/+20
* | Fix color in import listDominik Schürmann2014-10-251-6/+8
|/
* Remove tabs from import keys activityDominik Schürmann2014-10-253-320/+62
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-251-2/+2
|\
| * more rewordingVincent Breitmoser2014-10-251-2/+2
* | Fixes and icons for apps list, also add Password StoreDominik Schürmann2014-10-251-12/+25
|/
* Fix result passingDominik Schürmann2014-10-252-2/+1
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-253-2/+11
|\
| * slightly change wording in merge logsVincent Breitmoser2014-10-251-0/+1
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-10-253-141/+234
| |\
| * | change the way merging is loggedVincent Breitmoser2014-10-253-2/+10
* | | 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-253-23/+52
|\|
| * change indentation of import logsVincent Breitmoser2014-10-251-10/+10
| * set padding for sublog entriesVincent Breitmoser2014-10-251-0/+2
| * more work on import loggingVincent Breitmoser2014-10-251-1/+2
| * add logging to import and change order of import, keyservers firstVincent Breitmoser2014-10-252-23/+49
* | Safe slinger activity prepsDominik Schürmann2014-10-253-141/+231
|/
* Fix import from cloudDominik Schürmann2014-10-241-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 13:16:15 +0000