Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
| * | add logging to import and change order of import, keyservers first | Vincent Breitmoser | 2014-10-25 | 3 | -23/+59 |
| | | |||||
* | | Safe slinger activity preps | Dominik Schürmann | 2014-10-25 | 7 | -152/+350 |
|/ | |||||
* | 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 |
| | |||||
* | 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 | 4 | -72/+32 |
|\ | | | | | 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 | 4 | -72/+32 |
| | | |||||
* | | 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 | 13 | -61/+93 |
| |\ \ | | | | | | | | | | | | | 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 | 2 | -0/+69 |
| | | | | |||||
* | | | | Externalize QR Code scanning and import into its own activity for better ↵ | Dominik Schürmann | 2014-10-23 | 6 | -121/+251 |
| |/ / |/| | | | | | | | | code separation | ||||
* | | | Fix crash on Android 5 | Dominik Schürmann | 2014-10-22 | 1 | -11/+16 |
| |/ |/| | |||||
* | | 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 | 2 | -8/+14 |
| | | |||||
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-15 | 6 | -8/+60 |
|\| | | | | | | | development | ||||
| * | some cleanup and documentation of *Operation classes | Vincent Breitmoser | 2014-10-15 | 6 | -8/+60 |
| | | |||||
* | | More consisitency | Dominik Schürmann | 2014-10-15 | 5 | -13/+11 |
| | | |||||
* | | More color/icon consistency | Dominik Schürmann | 2014-10-15 | 7 | -27/+28 |
|/ | |||||
* | color experiments | Dominik Schürmann | 2014-10-15 | 4 | -76/+82 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-10-14 | 3 | -30/+43 |
|\ | | | | | | | development | ||||
| * | Group passphrase cache settings | Dominik Schürmann | 2014-10-13 | 2 | -24/+25 |
| | | |||||
| * | Register application/pgp-message for encrypted pgp data, more comments in ↵ | Dominik Schürmann | 2014-10-13 | 1 | -6/+18 |
| | | | | | | | | Manifest | ||||
* | | fix test for new PgpDecryptVerify | Vincent Breitmoser | 2014-10-14 | 1 | -1/+3 |
| | | |||||
* | | fix export performance problems | Vincent Breitmoser | 2014-10-14 | 1 | -0/+5 |
| | | |||||
* | | 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 | 2 | -29/+29 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-10-13 | 12 | -7/+61 |
|\ | | | | | | | development | ||||
| * | 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 | 8 | -4/+58 |
| | | |||||
* | | fix syntax typo in androidmanifest | Vincent Breitmoser | 2014-10-13 | 1 | -1/+1 |
| | | |||||
* | | make PgpEncryptSign and PgpDecryptVerify subclasses of BaseOperation | Vincent Breitmoser | 2014-10-13 | 4 | -120/+35 |
| | | |||||
* | | forgot to remove AddKeysActivity in androidmanifest | Vincent Breitmoser | 2014-10-13 | 1 | -11/+0 |
| | | |||||
* | | remove DELETE_FILE_SECURELY | Vincent Breitmoser | 2014-10-13 | 1 | -23/+0 |
|/ | | | | closes #961 |