Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | more cleanup | Dominik Schürmann | 2014-11-21 | 1 | -14/+9 | |
| | | ||||||
* | | NFC activity design | Dominik Schürmann | 2014-11-21 | 4 | -19/+14 | |
| | | ||||||
* | | Minor code cleanup | Dominik Schürmann | 2014-11-21 | 4 | -11/+11 | |
|/ | ||||||
* | Version 3.1.2 | Dominik Schürmann | 2014-11-02 | 1 | -2/+2 | |
| | ||||||
* | Pull from transifex | Dominik Schürmann | 2014-11-02 | 23 | -17/+182 | |
| | ||||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-11-02 | 1 | -18/+39 | |
|\ | | | | | | | development | |||||
| * | export secret and public keys in separate armored blocks | Vincent Breitmoser | 2014-10-31 | 1 | -9/+24 | |
| | | ||||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-10-30 | 31 | -116/+486 | |
| |\ | | | | | | | | | | development | |||||
| * | | forgot a thing for secret key export | Vincent Breitmoser | 2014-10-30 | 1 | -18/+24 | |
| | | | ||||||
* | | | Changelog | Dominik Schürmann | 2014-11-02 | 1 | -0/+5 | |
| |/ |/| | ||||||
* | | Version 3.1.1 | Dominik Schürmann | 2014-10-30 | 1 | -2/+2 | |
| | | ||||||
* | | Revert "Version 3.1.1" | Dominik Schürmann | 2014-10-30 | 1 | -2/+2 | |
| | | | | | | | | This reverts commit 8461f953f6da9c3c4929d42abbc7cfd992e21167. | |||||
* | | Version 3.1.1 | Dominik Schürmann | 2014-10-30 | 1 | -2/+2 | |
| | | ||||||
* | | Pull from transifex | Dominik Schürmann | 2014-10-30 | 27 | -101/+467 | |
| | | ||||||
* | | Changelog 3.1.1 | Dominik Schürmann | 2014-10-30 | 2 | -1/+7 | |
| | | ||||||
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-30 | 4 | -102/+28 | |
|\| | | | | | | | development | |||||
| * | Fix to preselect certification key if only one is available | Vincent Breitmoser | 2014-10-29 | 1 | -1/+1 | |
| | | | | | | | | Closes #981 | |||||
| * | remove unused ExchangeKeySpinner class | Vincent Breitmoser | 2014-10-29 | 1 | -100/+0 | |
| | | ||||||
| * | Close stream on key export to avoid partial write (see #986) | Vincent Breitmoser | 2014-10-29 | 1 | -0/+7 | |
| | | ||||||
| * | retrofit getBlob method of matrixcursor for android 2.3 | Vincent Breitmoser | 2014-10-27 | 1 | -1/+20 | |
| | | ||||||
* | | Always use INTEGER instead of BOOLEAN in database to avoid confusion | Dominik Schürmann | 2014-10-29 | 1 | -12/+10 | |
|/ | ||||||
* | Version 3.1 | Dominik Schürmann | 2014-10-26 | 1 | -2/+2 | |
| | ||||||
* | Pull from transifex | Dominik Schürmann | 2014-10-26 | 20 | -0/+220 | |
| | ||||||
* | Pull from transifex | Dominik Schürmann | 2014-10-26 | 56 | -878/+3333 | |
| | ||||||
* | Changelog 3.1 | Dominik Schürmann | 2014-10-26 | 1 | -0/+12 | |
| | ||||||
* | Fix crash with NotFoundException | Dominik Schürmann | 2014-10-26 | 1 | -3/+8 | |
| | ||||||
* | Rename multi certify files to certify | Dominik Schürmann | 2014-10-26 | 12 | -322/+103 | |
| | ||||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-26 | 8 | -5/+31 | |
|\ | | | | | | | development | |||||
| * | 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 | |
| | |