Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Changelog 3.1 | Dominik Schürmann | 2014-10-26 | 1 | -0/+12 |
| | |||||
* | Rename multi certify files to certify | Dominik Schürmann | 2014-10-26 | 5 | -299/+85 |
| | |||||
* | Display error on certification attempt with yubikey | Vincent Breitmoser | 2014-10-26 | 1 | -0/+1 |
| | | | | Closes #978 | ||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-10-26 | 1 | -4/+4 |
|\ | | | | | | | development | ||||
| * | Use new safe slinger activity from share tab | Dominik Schürmann | 2014-10-26 | 1 | -4/+4 |
| | | |||||
* | | 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 | 1 | -1/+1 |
|\ | | | | | | | development | ||||
| * | implement upload of keyring after certification, check that option by default | Vincent Breitmoser | 2014-10-26 | 1 | -1/+1 |
| | | |||||
* | | Move advanced info into own activity | Dominik Schürmann | 2014-10-26 | 6 | -80/+111 |
|/ | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-26 | 1 | -0/+1 |
|\ | | | | | | | development | ||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-10-26 | 3 | -12/+19 |
| |\ | | | | | | | | | | development | ||||
| * | | Retry canonicalization with pubkey self certs if first attempt failed | Vincent Breitmoser | 2014-10-26 | 1 | -0/+1 |
| | | | | | | | | | | | | 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 |
| | | |||||
* | | Fix layout of select key adapter | Dominik Schürmann | 2014-10-26 | 1 | -4/+4 |
|/ | |||||
* | Remove empty layout | Dominik Schürmann | 2014-10-25 | 2 | -49/+1 |
| | |||||
* | Remove tabs from import keys activity | Dominik Schürmann | 2014-10-25 | 1 | -7/+3 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-25 | 1 | -5/+5 |
|\ | | | | | | | development | ||||
| * | shorter certification explanation | Vincent Breitmoser | 2014-10-25 | 1 | -1/+1 |
| | | |||||
| * | more rewording | Vincent Breitmoser | 2014-10-25 | 1 | -4/+4 |
| | | |||||
* | | Fixes and icons for apps list, also add Password Store | Dominik Schürmann | 2014-10-25 | 3 | -0/+0 |
|/ | |||||
* | slightly change wording in merge logs | Vincent Breitmoser | 2014-10-25 | 1 | -2/+2 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-10-25 | 3 | -11/+110 |
|\ | | | | | | | development | ||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-25 | 1 | -0/+10 |
| |\ | | | | | | | | | | development | ||||
| * | | Safe slinger activity preps | Dominik Schürmann | 2014-10-25 | 3 | -11/+110 |
| | | | |||||
* | | | change the way merging is logged | Vincent Breitmoser | 2014-10-25 | 1 | -1/+5 |
| |/ |/| | |||||
* | | more work on import logging | Vincent Breitmoser | 2014-10-25 | 1 | -5/+5 |
| | | |||||
* | | add logging to import and change order of import, keyservers first | Vincent Breitmoser | 2014-10-25 | 1 | -0/+10 |
|/ | |||||
* | Qr code button text | Dominik Schürmann | 2014-10-24 | 2 | -2/+2 |
| | |||||
* | remove space in on large devices in layouts where no drawer nav is shown | Dominik Schürmann | 2014-10-24 | 3 | -142/+0 |
| | |||||
* | Merge pull request #973 from timbray/development | Dominik Schürmann | 2014-10-24 | 3 | -67/+26 |
|\ | | | | | Make the Certify screen a little more self-explanatory | ||||
| * | reword sync message | Tim Bray | 2014-10-22 | 1 | -1/+1 |
| | | |||||
| * | Make the Certify screen a little more self-explanatory | Tim Bray | 2014-10-21 | 3 | -67/+26 |
| | | |||||
* | | Start safe slinger activity | Dominik Schürmann | 2014-10-23 | 1 | -0/+26 |
|/ | |||||
* | More consisitency | Dominik Schürmann | 2014-10-15 | 3 | -7/+5 |
| | |||||
* | More color/icon consistency | Dominik Schürmann | 2014-10-15 | 2 | -7/+7 |
| | |||||
* | Group passphrase cache settings | Dominik Schürmann | 2014-10-13 | 2 | -24/+25 |
| | |||||
* | Remove key list filter for now | Dominik Schürmann | 2014-10-13 | 1 | -2/+2 |
| | |||||
* | wording | Dominik Schürmann | 2014-10-13 | 1 | -3/+3 |
| | |||||
* | Better qr code icon | Dominik Schürmann | 2014-10-13 | 4 | -0/+0 |
| | |||||
* | Added option for num keypad for YubiKey | Jerzy Kołosowski | 2014-10-13 | 3 | -2/+6 |
| | |||||
* | rewrite export with new operation style | Vincent Breitmoser | 2014-10-13 | 1 | -0/+24 |
| | |||||
* | DeleteResult: add custom createNotify | Vincent Breitmoser | 2014-10-11 | 1 | -0/+20 |
| | |||||
* | move delete into operation class | Vincent Breitmoser | 2014-10-11 | 1 | -0/+18 |
| | |||||
* | different wording in share tab | Vincent Breitmoser | 2014-10-10 | 1 | -1/+1 |
| | |||||
* | fix width of displayed qr code | Vincent Breitmoser | 2014-10-10 | 1 | -1/+1 |
| | |||||
* | add keys button goes to directly to qr scan | Vincent Breitmoser | 2014-10-10 | 1 | -1/+1 |
| | |||||
* | keylist: add safeslinger exchange button to secret keys | Vincent Breitmoser | 2014-10-10 | 1 | -0/+26 |
| | |||||
* | Better handling if no api key is selected | Dominik Schürmann | 2014-10-09 | 1 | -20/+28 |
| | |||||
* | rename certify_key_item to the more appropriate multi_certify_item | Vincent Breitmoser | 2014-10-08 | 1 | -0/+0 |
| |