Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge keybase-proof branch | Dominik Schürmann | 2015-02-27 | 1 | -0/+58 |
|\ | |||||
| * | Check fingerprint match between proof & database | Tim Bray | 2014-11-22 | 1 | -0/+1 |
| | | |||||
| * | Merge branch 'development' into keybase-proofs | Dominik Schürmann | 2014-11-21 | 1 | -4/+5 |
| |\ | |||||
| * | | Prevent multiple cloud-trust-search launches. Handle DNS query failure ↵ | Tim Bray | 2014-11-19 | 1 | -0/+1 |
| | | | | | | | | | | | | gracefully. Fixes #1007 & #1008. | ||||
| * | | In the ImportKeysList display, arrange for Keybase UserIDs to sort below the ↵ | Tim Bray | 2014-11-18 | 1 | -0/+1 |
| | | | | | | | | | | | | rest. Also mention Keybase stuff other than Twitter/GitHub/Website | ||||
| * | | All keybase proofs now in place | Tim Bray | 2014-11-11 | 1 | -0/+7 |
| | | | |||||
| * | | Moved from WebView to Spannables, some proof cleanup too | Tim Bray | 2014-11-07 | 1 | -0/+48 |
| | | | |||||
* | | | Fingerprint verification, design fixes for qr code card | Dominik Schürmann | 2015-02-26 | 1 | -0/+5 |
| | | | |||||
* | | | Dont show verification icons in my key view, hide edit button for non-secret ↵ | Dominik Schürmann | 2015-02-25 | 1 | -1/+3 |
| | | | | | | | | | | | | keys | ||||
* | | | CardView and more header design | Dominik Schürmann | 2015-02-25 | 1 | -0/+1 |
| | | | |||||
* | | | First work on new key view toolbar | Dominik Schürmann | 2015-02-25 | 1 | -2/+5 |
| | | | |||||
* | | | Refactor AppsListFragment | Dominik Schürmann | 2015-02-23 | 1 | -1/+0 |
| | | | |||||
* | | | move a string in the safe slinger activity to resources | Łukasz Stelmach | 2015-02-21 | 1 | -0/+1 |
| | | | |||||
* | | | determine correct filesize during decryption from LiteralData packet | Vincent Breitmoser | 2015-02-17 | 1 | -0/+1 |
| | | | |||||
* | | | Move encrypt decrypt operations in own starter activity | Dominik Schürmann | 2015-02-03 | 1 | -4/+6 |
| | | | |||||
* | | | Toolbar fixes, Toolbar under status bar on Lollipop | Dominik Schürmann | 2015-02-03 | 1 | -1/+2 |
| | | | |||||
* | | | rewrite PgpSignEncrypt data flow | Vincent Breitmoser | 2015-02-01 | 1 | -23/+37 |
| | | | | | | | | | | | | | | | | | | | | | - introduce high-level SignEncryptOperation for uri to uri signing/encryption - use SignEncryptParcel for high-level operation parameters - use PgpSignEncryptInput plus streams for low-level operation parameters - get rid of all sign/encrypt logic in KeychainIntentService | ||||
* | | | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2015-01-31 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | Saving of allowed keys | Dominik Schürmann | 2015-01-29 | 1 | -0/+1 |
| | | | | |||||
* | | | | prevent recursive consolidate | Vincent Breitmoser | 2015-01-31 | 1 | -0/+1 |
|/ / / | |||||
* | | | Merge remote-tracking branch 'origin/t/snackbar' into development | Dominik Schürmann | 2015-01-29 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle | ||||
| * | | | use Notify helper everywhere, replace supertoasts with snackbar library | Vincent Breitmoser | 2015-01-19 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'development' into detached-sigs-api | Dominik Schürmann | 2015-01-27 | 1 | -0/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | ||||
| * | | | | backend support for charset in ascii-armored streams | Vincent Breitmoser | 2015-01-27 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | move last parts of import logic from kis into operation | Vincent Breitmoser | 2015-01-26 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Temporary nav drawer fixes | Dominik Schürmann | 2015-01-27 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | Material Design: Full screen dialogs | Dominik Schürmann | 2015-01-26 | 1 | -1/+1 |
| | | | | |||||
* | | | | introduce PromoteKeyOperation to create dummy secret from public keys | Vincent Breitmoser | 2015-01-25 | 1 | -0/+7 |
| | | | | |||||
* | | | | work on divert-to-key and other keyring stuff | Vincent Breitmoser | 2015-01-25 | 1 | -0/+2 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | - allow modifySecretKeyRing operation without passphrase, but a only restricted subset of operations (ie, s2k strip/divert) - pass byte array with serial number to key edit operation to initialize divert-to-card key - update spongycastle to support serial numbers in iv for divert-to-card | ||||
* | | | Toolbar for settings | Dominik Schürmann | 2015-01-14 | 1 | -1/+1 |
| | | | |||||
* | | | Integrate QR Code library instead of requiring the app to be installed, also ↵ | Dominik Schürmann | 2015-01-14 | 1 | -0/+1 |
| | | | | | | | | | | | | due to security reasons | ||||
* | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-14 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | | | | | development | ||||
| * | | | small fixes to user attribute handling | Vincent Breitmoser | 2015-01-14 | 1 | -0/+1 |
| | | | | |||||
* | | | | Fix SearchView | Dominik Schürmann | 2015-01-14 | 1 | -0/+1 |
|/ / / | |||||
* | | | actually import user attributes (though they are not shown anywhere yet) | Vincent Breitmoser | 2015-01-14 | 1 | -0/+17 |
| | | | |||||
* | | | support addition of user attributes | Vincent Breitmoser | 2015-01-13 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java OpenKeychain/src/main/res/values/strings.xml | ||||
* | | | add support for user attributes (during canonicalization) | Vincent Breitmoser | 2015-01-12 | 1 | -1/+16 |
| | | | |||||
* | | | OpenPGP instead of PGP | Dominik Schürmann | 2015-01-07 | 1 | -5/+5 |
| | | | |||||
* | | | PIn not pin passphrase | Dominik Schürmann | 2015-01-07 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-06 | 1 | -13/+31 |
|\ \ \ | | | | | | | | | | | | | development | ||||
| * | | | make certify routines more robust (#1016) | Vincent Breitmoser | 2015-01-03 | 1 | -0/+1 |
| | | | | |||||
| * | | | add more descriptive string about non-mdc encrypted data | Vincent Breitmoser | 2015-01-03 | 1 | -0/+1 |
| | | | | |||||
| * | | | encapsulate high level edit key into new operation class | Vincent Breitmoser | 2015-01-03 | 1 | -0/+8 |
| | | | | |||||
| * | | | deal with non-existent user ids during import (#994) | Vincent Breitmoser | 2015-01-02 | 1 | -6/+7 |
| | | | | |||||
| * | | | extend canonicalize to strip local certificates on export | Vincent Breitmoser | 2015-01-02 | 1 | -6/+8 |
| | | | | |||||
| * | | | small improvements regarding pin tests and logging | Vincent Breitmoser | 2015-01-01 | 1 | -1/+3 |
| | | | | |||||
| * | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-12-30 | 1 | -3/+3 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/res/values/strings.xml | ||||
| * | | | | add PIN as a SecretKeyType | Vincent Breitmoser | 2014-12-30 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | introduce handling of notation direct key signatures, and experimental pin ↵ | Vincent Breitmoser | 2014-12-30 | 1 | -1/+3 |
| | |_|/ | |/| | | | | | | | | | | notation packet | ||||
* | | | | Passphrase wizard tests | Dominik Schürmann | 2015-01-06 | 1 | -0/+27 |
| |/ / |/| | |