Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |||||
* | retrofit getBlob method of matrixcursor for android 2.3 | Vincent Breitmoser | 2014-10-27 | 1 | -1/+20 |
| | |||||
* | Rename multi certify files to certify | Dominik Schürmann | 2014-10-26 | 6 | -22/+17 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-26 | 1 | -1/+1 |
|\ | | | | | | | development | ||||
| * | disable cancel button instead of hiding it on cancel prevention | Vincent Breitmoser | 2014-10-26 | 1 | -1/+1 |
| | | |||||
* | | Fix notify after certify | Dominik Schürmann | 2014-10-26 | 2 | -26/+20 |
|/ | |||||
* | 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 | 1 | -8/+11 |
|\ | | | | | | | 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 | 1 | -8/+11 |
| | | | |||||
* | | | Move advanced info into own activity | Dominik Schürmann | 2014-10-26 | 4 | -253/+214 |
| |/ |/| | |||||
* | | Keyboard tests | Dominik Schürmann | 2014-10-26 | 1 | -10/+10 |
|/ | |||||
* | Fail on unknown key ids on API, Key item design consistency for API | Dominik Schürmann | 2014-10-26 | 2 | -3/+4 |
| | |||||
* | Fix layout of select key adapter | Dominik Schürmann | 2014-10-26 | 1 | -4/+4 |
| | |||||
* | 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 | 1 | -1/+10 |
|\ | | | | | | | development | ||||
| * | remove unnecessary (and buggy) BufferedInputStream wrapping | Vincent Breitmoser | 2014-10-25 | 1 | -1/+10 |
| | | |||||
* | | 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 |
| | |||||
* | Fix result passing | Dominik Schürmann | 2014-10-25 | 2 | -2/+1 |
| | |||||
* | 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 | 1 | -0/+2 |
|\ | | | | | | | development | ||||
| * | set padding for sublog entries | Vincent Breitmoser | 2014-10-25 | 1 | -0/+2 |
| | | |||||
* | | Safe slinger activity preps | Dominik Schürmann | 2014-10-25 | 3 | -141/+231 |
|/ | |||||
* | 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 | 3 | -15/+22 |
|\ \ | | | | | | | | | | | | | | | | | | | 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 | 8 | -31/+54 |
| |\| | | | | | | | | | | development | ||||
| * | | integrate download from keyserver into key import operation | Vincent Breitmoser | 2014-10-23 | 3 | -13/+20 |
| | | | |||||
* | | | 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 | 4 | -116/+230 |
| |/ |/| | | | | | code separation | ||||
* | | consistency for import UI | Dominik Schürmann | 2014-10-16 | 1 | -5/+27 |
| | | |||||
* | | Silently fail on import on key import with ArrayIndexOutOfBoundsException | Dominik Schürmann | 2014-10-16 | 1 | -3/+3 |
| | | |||||
* | | More consisitency | Dominik Schürmann | 2014-10-15 | 2 | -6/+6 |
| | | |||||
* | | More color/icon consistency | Dominik Schürmann | 2014-10-15 | 5 | -20/+21 |
|/ | |||||
* | color experiments | Dominik Schürmann | 2014-10-15 | 4 | -76/+82 |
| | |||||
* | actually remove filter spinner code. that's what git is for~ | Vincent Breitmoser | 2014-10-13 | 1 | -46/+0 |
| | |||||
* | Remove key list filter for now | Dominik Schürmann | 2014-10-13 | 1 | -27/+27 |
| | |||||
* | Added option for num keypad for YubiKey | Jerzy Kołosowski | 2014-10-13 | 3 | -2/+41 |
| | |||||
* | remove outdated AddKeysActivity | Vincent Breitmoser | 2014-10-13 | 1 | -463/+0 |
| | |||||
* | DeleteResult: add custom createNotify | Vincent Breitmoser | 2014-10-11 | 2 | -11/+21 |
| | |||||
* | move around package structure a bit | Vincent Breitmoser | 2014-10-10 | 22 | -53/+40 |
| |