aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Changelog 3.1Dominik Schürmann2014-10-262-0/+22
* Fix crash with NotFoundExceptionDominik Schürmann2014-10-261-3/+8
* Rename multi certify files to certifyDominik Schürmann2014-10-2612-322/+103
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-268-5/+31
|\
| * Display error on certification attempt with yubikeyVincent Breitmoser2014-10-263-0/+7
| * 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
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-10-261-2/+2
| |\
| * | prevent cancel dring consolidate, move logic into progressableVincent Breitmoser2014-10-264-2/+17
* | | Fix notify after certifyDominik Schürmann2014-10-262-26/+20
| |/ |/|
* | 3.1beta1Dominik Schürmann2014-10-261-2/+2
|/
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-10-263-81/+32
|\
| * Fix decrypt intent apiDominik Schürmann2014-10-261-1/+1
| * Hide keyboard in safe slinger activityDominik Schürmann2014-10-261-0/+1
| * Use new safe slinger activity from share tabDominik Schürmann2014-10-262-80/+30
* | add descriptive text to safeslinger activityVincent Breitmoser2014-10-263-16/+36
|/
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-267-17/+57
|\
| * 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-267-17/+57
* | | Move advanced info into own activityDominik Schürmann2014-10-2612-343/+330
| |/ |/|
* | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-261-1/+4
|\|
| * add description of symantec test caseVincent Breitmoser2014-10-261-1/+4
* | Keyboard testsDominik Schürmann2014-10-261-10/+10
|/
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-266-4/+123
|\
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-10-267-19/+42
| |\
| * | add test case for symantec secret keys (#974)Vincent Breitmoser2014-10-263-0/+105
| * | Retry canonicalization with pubkey self certs if first attempt failedVincent Breitmoser2014-10-263-4/+18
* | | Fixes from transifexDominik Schürmann2014-10-261-37/+37
| |/ |/|
* | Move some multi select items in overflow menu, rename importDominik Schürmann2014-10-262-8/+15
* | 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-262-8/+8
|/
* Remove empty layoutDominik Schürmann2014-10-253-73/+1
* Remove PassphraseDialogFragmentDominik Schürmann2014-10-252-435/+2
* Remove old certify activityDominik Schürmann2014-10-254-470/+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-255-329/+66
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-252-7/+7
|\
| * shorter certification explanationVincent Breitmoser2014-10-251-1/+1
| * more rewordingVincent Breitmoser2014-10-252-6/+6
* | Fixes and icons for apps list, also add Password StoreDominik Schürmann2014-10-254-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-254-4/+17
|\
| * slightly change wording in merge logsVincent Breitmoser2014-10-252-2/+3
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-10-258-152/+353
| |\
| * | change the way merging is loggedVincent Breitmoser2014-10-254-3/+15
* | | Safeslinger fixesÄDominik Schürmann2014-10-251-4/+6
| |/ |/|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 08:34:05 +0000