Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Display error on certification attempt with yubikey | Vincent Breitmoser | 2014-10-26 | 2 | -0/+6 |
| | | | | Closes #978 | ||||
* | disable cancel button instead of hiding it on cancel prevention | Vincent Breitmoser | 2014-10-26 | 1 | -1/+1 |
| | |||||
* | fix consolidate if no secret key are present | Vincent Breitmoser | 2014-10-26 | 1 | -2/+6 |
| | |||||
* | prevent cancel dring consolidate, move logic into progressable | Vincent Breitmoser | 2014-10-26 | 4 | -2/+17 |
| | |||||
* | Use new safe slinger activity from share tab | Dominik Schürmann | 2014-10-26 | 1 | -76/+26 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-26 | 6 | -16/+56 |
|\ | | | | | | | development | ||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-10-26 | 1 | -10/+10 |
| |\ | | | | | | | | | | development | ||||
| * | | implement upload of keyring after certification, check that option by default | Vincent Breitmoser | 2014-10-26 | 6 | -16/+56 |
| | | | |||||
* | | | Move advanced info into own activity | Dominik Schürmann | 2014-10-26 | 5 | -263/+214 |
| |/ |/| | |||||
* | | Keyboard tests | Dominik Schürmann | 2014-10-26 | 1 | -10/+10 |
|/ | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-10-26 | 4 | -7/+23 |
|\ | | | | | | | development | ||||
| * | Fail on unknown key ids on API, Key item design consistency for API | Dominik Schürmann | 2014-10-26 | 4 | -3/+19 |
| | | |||||
| * | Fix layout of select key adapter | Dominik Schürmann | 2014-10-26 | 1 | -4/+4 |
| | | |||||
* | | Retry canonicalization with pubkey self certs if first attempt failed | Vincent Breitmoser | 2014-10-26 | 2 | -4/+17 |
|/ | | | | Fixes #974 | ||||
* | Remove empty layout | Dominik Schürmann | 2014-10-25 | 1 | -24/+0 |
| | |||||
* | Remove PassphraseDialogFragment | Dominik Schürmann | 2014-10-25 | 2 | -435/+2 |
| | |||||
* | Remove old certify activity | Dominik Schürmann | 2014-10-25 | 3 | -461/+1 |
| | |||||
* | Use passphrase dialog activity instead of passphrase dialog | Dominik Schürmann | 2014-10-25 | 3 | -36/+67 |
| | |||||
* | Remove old exception handling code from loaders | Dominik Schürmann | 2014-10-25 | 1 | -35/+3 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-25 | 3 | -8/+20 |
|\ | | | | | | | development | ||||
| * | remove unnecessary (and buggy) BufferedInputStream wrapping | Vincent Breitmoser | 2014-10-25 | 3 | -8/+20 |
| | | |||||
* | | Fix color in import list | Dominik Schürmann | 2014-10-25 | 1 | -6/+8 |
|/ | |||||
* | Remove tabs from import keys activity | Dominik Schürmann | 2014-10-25 | 3 | -320/+62 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-25 | 1 | -2/+2 |
|\ | | | | | | | development | ||||
| * | more rewording | Vincent Breitmoser | 2014-10-25 | 1 | -2/+2 |
| | | |||||
* | | Fixes and icons for apps list, also add Password Store | Dominik Schürmann | 2014-10-25 | 1 | -12/+25 |
|/ | |||||
* | Fix result passing | Dominik Schürmann | 2014-10-25 | 2 | -2/+1 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-25 | 3 | -2/+11 |
|\ | | | | | | | development | ||||
| * | slightly change wording in merge logs | Vincent Breitmoser | 2014-10-25 | 1 | -0/+1 |
| | | |||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-10-25 | 3 | -141/+234 |
| |\ | | | | | | | | | | development | ||||
| * | | change the way merging is logged | Vincent Breitmoser | 2014-10-25 | 3 | -2/+10 |
| | | | |||||
* | | | Safeslinger fixesÄ | Dominik Schürmann | 2014-10-25 | 1 | -4/+6 |
| |/ |/| | |||||
* | | Fix safe slinger button | Dominik Schürmann | 2014-10-25 | 1 | -1/+1 |
| | | |||||
* | | Fix safe slinger button | Dominik Schürmann | 2014-10-25 | 1 | -2/+4 |
| | | |||||
* | | Use selected number of users in safe slinger | Dominik Schürmann | 2014-10-25 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-25 | 3 | -23/+52 |
|\| | | | | | | | development | ||||
| * | change indentation of import logs | Vincent Breitmoser | 2014-10-25 | 1 | -10/+10 |
| | | |||||
| * | set padding for sublog entries | Vincent Breitmoser | 2014-10-25 | 1 | -0/+2 |
| | | |||||
| * | more work on import logging | Vincent Breitmoser | 2014-10-25 | 1 | -1/+2 |
| | | |||||
| * | add logging to import and change order of import, keyservers first | Vincent Breitmoser | 2014-10-25 | 2 | -23/+49 |
| | | |||||
* | | Safe slinger activity preps | Dominik Schürmann | 2014-10-25 | 3 | -141/+231 |
|/ | |||||
* | Fix import from cloud | Dominik Schürmann | 2014-10-24 | 1 | -1/+1 |
| | |||||
* | Merge pull request #973 from timbray/development | Dominik Schürmann | 2014-10-24 | 1 | -5/+6 |
|\ | | | | | Make the Certify screen a little more self-explanatory | ||||
| * | Make the Certify screen a little more self-explanatory | Tim Bray | 2014-10-21 | 1 | -5/+6 |
| | | |||||
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-23 | 9 | -128/+167 |
|\ \ | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java | ||||
| * \ | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-10-23 | 10 | -47/+81 |
| |\ \ | | | | | | | | | | | | | development | ||||
| * | | | integrate download from keyserver into key import operation | Vincent Breitmoser | 2014-10-23 | 9 | -126/+165 |
| | | | | |||||
* | | | | Start safe slinger activity | Dominik Schürmann | 2014-10-23 | 1 | -0/+43 |
| | | | | |||||
* | | | | Externalize QR Code scanning and import into its own activity for better ↵ | Dominik Schürmann | 2014-10-23 | 5 | -116/+232 |
| |/ / |/| | | | | | | | | code separation | ||||
* | | | Fix crash on Android 5 | Dominik Schürmann | 2014-10-22 | 1 | -11/+16 |
| |/ |/| |