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 |
| | | | |||||
* | | | Remove old Holo design resources | Dominik Schürmann | 2015-02-26 | 4 | -87/+0 |
| | | | |||||
* | | | Hopefully fixes drop down icon for spinners on Android lower 5 | Dominik Schürmann | 2015-02-26 | 1 | -19/+0 |
| | | | |||||
* | | | 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 | ||||
* | | | Design fixes for header, QR Code shared element transitions | Dominik Schürmann | 2015-02-25 | 1 | -1/+1 |
| | | | |||||
* | | | CardView and more header design | Dominik Schürmann | 2015-02-25 | 2 | -0/+11 |
| | | | |||||
* | | | First work on new key view toolbar | Dominik Schürmann | 2015-02-25 | 3 | -2/+15 |
| | | | |||||
* | | | Refactor AppsListFragment | Dominik Schürmann | 2015-02-23 | 1 | -1/+0 |
| | | | |||||
* | | | Update tab lib and fix colors of tabs | Dominik Schürmann | 2015-02-23 | 1 | -0/+5 |
| | | | |||||
* | | | Fix multi select and more colors | Dominik Schürmann | 2015-02-22 | 3 | -6/+8 |
| | | | |||||
* | | | Color for holo | Dominik Schürmann | 2015-02-22 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-02-22 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | | | | | development | ||||
| * \ \ | Merge pull request #1047 from steelman/dev-strings | Dominik Schürmann | 2015-02-22 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | | | Some Polish translated strings and some tiny cleanups | ||||
| | * | | | move a string in the safe slinger activity to resources | Łukasz Stelmach | 2015-02-21 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Once again: Colors and header image | Dominik Schürmann | 2015-02-22 | 2 | -24/+18 |
|/ / / / | |||||
* / / / | Status bar height fix | Dominik Schürmann | 2015-02-21 | 2 | -2/+3 |
|/ / / | |||||
* | | | determine correct filesize during decryption from LiteralData packet | Vincent Breitmoser | 2015-02-17 | 1 | -0/+1 |
| | | | |||||
* | | | Add FAB to key list | Dominik Schürmann | 2015-02-03 | 2 | -0/+15 |
| | | | |||||
* | | | Move encrypt decrypt operations in own starter activity | Dominik Schürmann | 2015-02-03 | 1 | -4/+6 |
| | | | |||||
* | | | More toolbar fixes | Dominik Schürmann | 2015-02-03 | 1 | -0/+2 |
| | | | |||||
* | | | Toolbar fixes, Toolbar under status bar on Lollipop | Dominik Schürmann | 2015-02-03 | 3 | -6/+8 |
| | | | |||||
* | | | Floating Action Button added in app settings | Dominik Schürmann | 2015-02-03 | 1 | -0/+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 | 4 | -8/+10 |
|\ \ \ | |||||
| * | | | Saving of allowed keys | Dominik Schürmann | 2015-01-29 | 1 | -0/+1 |
| | | | | |||||
| * | | | Header image tryout | Dominik Schürmann | 2015-01-29 | 2 | -3/+2 |
| | | | | |||||
| * | | | Remove files related to old nav drawer | Dominik Schürmann | 2015-01-29 | 1 | -2/+0 |
| | | | | |||||
| * | | | White popup theme | Dominik Schürmann | 2015-01-29 | 1 | -3/+7 |
| | | | | |||||
* | | | | 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 | ||||
| * \ \ \ | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-27 | 1 | -0/+2 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | development | ||||
| | * | | | | 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 | 2 | -2/+11 |
|/ / / / / | |||||
* / / / / | Material Design Drawer | Dominik Schürmann | 2015-01-26 | 1 | -0/+5 |
|/ / / / | |||||
* | | | | Material Design: Full screen dialogs | Dominik Schürmann | 2015-01-26 | 2 | -2/+2 |
| | | | | |||||
* | | | | 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 |