Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Display error on certification attempt with yubikey | Vincent Breitmoser | 2014-10-26 | 3 | -0/+7 | |
| | | | | | | | | 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 | |
| | | ||||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-10-26 | 1 | -2/+2 | |
| |\ | | | | | | | | | | development | |||||
| * | | prevent cancel dring consolidate, move logic into progressable | Vincent Breitmoser | 2014-10-26 | 4 | -2/+17 | |
| | | | ||||||
* | | | Fix notify after certify | Dominik Schürmann | 2014-10-26 | 2 | -26/+20 | |
| |/ |/| | ||||||
* | | 3.1beta1 | Dominik Schürmann | 2014-10-26 | 1 | -2/+2 | |
|/ | ||||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-10-26 | 3 | -81/+32 | |
|\ | | | | | | | development | |||||
| * | Fix decrypt intent api | Dominik Schürmann | 2014-10-26 | 1 | -1/+1 | |
| | | ||||||
| * | Hide keyboard in safe slinger activity | Dominik Schürmann | 2014-10-26 | 1 | -0/+1 | |
| | | ||||||
| * | Use new safe slinger activity from share tab | Dominik Schürmann | 2014-10-26 | 2 | -80/+30 | |
| | | ||||||
* | | add descriptive text to safeslinger activity | Vincent Breitmoser | 2014-10-26 | 3 | -16/+36 | |
|/ | ||||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-26 | 7 | -17/+57 | |
|\ | | | | | | | 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 | 7 | -17/+57 | |
| | | | ||||||
* | | | Move advanced info into own activity | Dominik Schürmann | 2014-10-26 | 12 | -343/+330 | |
| |/ |/| | ||||||
* | | Keyboard tests | Dominik Schürmann | 2014-10-26 | 1 | -10/+10 | |
|/ | ||||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-26 | 3 | -4/+18 | |
|\ | | | | | | | development | |||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-10-26 | 7 | -19/+42 | |
| |\ | | | | | | | | | | development | |||||
| * | | Retry canonicalization with pubkey self certs if first attempt failed | Vincent Breitmoser | 2014-10-26 | 3 | -4/+18 | |
| | | | | | | | | | | | | Fixes #974 | |||||
* | | | Fixes from transifex | Dominik Schürmann | 2014-10-26 | 1 | -37/+37 | |
| |/ |/| | ||||||
* | | Move some multi select items in overflow menu, rename import | Dominik Schürmann | 2014-10-26 | 2 | -8/+15 | |
| | | ||||||
* | | 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 | 2 | -8/+8 | |
|/ | ||||||
* | Remove empty layout | Dominik Schürmann | 2014-10-25 | 3 | -73/+1 | |
| | ||||||
* | Remove PassphraseDialogFragment | Dominik Schürmann | 2014-10-25 | 2 | -435/+2 | |
| | ||||||
* | Remove old certify activity | Dominik Schürmann | 2014-10-25 | 4 | -470/+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 | 5 | -329/+66 | |
| | ||||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-25 | 2 | -7/+7 | |
|\ | | | | | | | development | |||||
| * | shorter certification explanation | Vincent Breitmoser | 2014-10-25 | 1 | -1/+1 | |
| | | ||||||
| * | more rewording | Vincent Breitmoser | 2014-10-25 | 2 | -6/+6 | |
| | | ||||||
* | | Fixes and icons for apps list, also add Password Store | Dominik Schürmann | 2014-10-25 | 4 | -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 | 4 | -4/+17 | |
|\ | | | | | | | development | |||||
| * | slightly change wording in merge logs | Vincent Breitmoser | 2014-10-25 | 2 | -2/+3 | |
| | | ||||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-10-25 | 7 | -152/+353 | |
| |\ | | | | | | | | | | development | |||||
| * | | change the way merging is logged | Vincent Breitmoser | 2014-10-25 | 4 | -3/+15 | |
| | | | ||||||
* | | | 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 | 4 | -23/+62 | |
|\| | | | | | | | 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 | 2 | -6/+7 | |
| | |