Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | More toolbar fixes | Dominik Schürmann | 2015-02-03 | 5 | -11/+20 |
| | |||||
* | App settings statusbar fix | Dominik Schürmann | 2015-02-03 | 2 | -3/+8 |
| | |||||
* | Toolbar fixes, Toolbar under status bar on Lollipop | Dominik Schürmann | 2015-02-03 | 34 | -96/+118 |
| | |||||
* | Floating Action Button added in app settings | Dominik Schürmann | 2015-02-03 | 38 | -72/+201 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-02-02 | 69 | -844/+1062 |
|\ | | | | | | | development | ||||
| * | rewrite PgpSignEncrypt data flow | Vincent Breitmoser | 2015-02-01 | 68 | -839/+1051 |
| | | | | | | | | | | | | | | - 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 | 44 | -1369/+1181 |
| |\ | |||||
| * | | prevent recursive consolidate | Vincent Breitmoser | 2015-01-31 | 5 | -5/+11 |
| | | | |||||
* | | | UI experiments for app settings | Dominik Schürmann | 2015-02-02 | 5 | -50/+69 |
| |/ |/| | |||||
* | | Rename app setting classes for consistency | Dominik Schürmann | 2015-01-30 | 7 | -15/+14 |
| | | |||||
* | | Fix saving of allowed keys | Dominik Schürmann | 2015-01-30 | 1 | -11/+5 |
| | | |||||
* | | Merge branch 'ligi/fix/add_ability_to_compile_with_java8' of ↵ | Dominik Schürmann | 2015-01-30 | 2 | -2/+2 |
|\ \ | | | | | | | | | | https://github.com/ligi/open-keychain into ligi-ligi/fix/add_ability_to_compile_with_java8 | ||||
| * | | Add explicit casting to be able to compile with java8 | ligi | 2015-01-29 | 1 | -1/+1 |
| | | | |||||
| * | | Use latest buildTools | ligi | 2015-01-29 | 1 | -1/+1 |
| | | | |||||
* | | | Saving of allowed keys | Dominik Schürmann | 2015-01-29 | 11 | -232/+467 |
| | | | |||||
* | | | Introduce allowed keys table per API client | Dominik Schürmann | 2015-01-29 | 4 | -5/+70 |
| | | | |||||
* | | | Header image tryout | Dominik Schürmann | 2015-01-29 | 4 | -5/+3 |
|/ / | |||||
* | | Remove files related to old nav drawer | Dominik Schürmann | 2015-01-29 | 19 | -551/+53 |
| | | |||||
* | | Fix item layout in apps list | Dominik Schürmann | 2015-01-29 | 1 | -10/+10 |
| | | |||||
* | | Close FileDescriptors and input, output streams when possible | Dominik Schürmann | 2015-01-29 | 1 | -285/+335 |
| | | |||||
* | | Refactor DecryptActivity into DecryptOverviewFragment for nav drawer | Dominik Schürmann | 2015-01-29 | 9 | -278/+243 |
| | | |||||
* | | White popup theme | Dominik Schürmann | 2015-01-29 | 1 | -3/+7 |
|/ | |||||
* | Move key list logic into fragment, UI fixes for nav drawer | Dominik Schürmann | 2015-01-29 | 19 | -359/+59 |
| | |||||
* | Merge remote-tracking branch 'origin/t/snackbar' into development | Dominik Schürmann | 2015-01-29 | 11 | -214/+370 |
|\ | | | | | | | | | Conflicts: OpenKeychain/build.gradle | ||||
| * | use Notify helper everywhere, replace supertoasts with snackbar library | Vincent Breitmoser | 2015-01-19 | 8 | -210/+198 |
| | | |||||
* | | Cloud search icon | Dominik Schürmann | 2015-01-28 | 5 | -2/+1 |
| | | |||||
* | | Fix cleartext signatures internally | Dominik Schürmann | 2015-01-27 | 1 | -5/+4 |
| | | |||||
* | | Fix nullpointer in ImportKeysActivity | Dominik Schürmann | 2015-01-27 | 1 | -13/+24 |
| | | |||||
* | | Support verification of detached signatures | Dominik Schürmann | 2015-01-27 | 2 | -98/+223 |
| | | |||||
* | | Merge branch 'development' into detached-sigs-api | Dominik Schürmann | 2015-01-27 | 11 | -57/+133 |
|\ \ | | | | | | | | | | | | | 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 | 11 | -57/+134 |
| |\ \ | | | | | | | | | | | | | development | ||||
| | * | | backend support for charset in ascii-armored streams | Vincent Breitmoser | 2015-01-27 | 7 | -4/+66 |
| | | | | |||||
| | * | | remove unused NonPgpPartException | Vincent Breitmoser | 2015-01-26 | 1 | -12/+0 |
| | | | | |||||
| | * | | move last parts of import logic from kis into operation | Vincent Breitmoser | 2015-01-26 | 5 | -41/+68 |
| | | | | |||||
* | | | | Temporary nav drawer fixes | Dominik Schürmann | 2015-01-27 | 9 | -20/+54 |
| | | | | |||||
* | | | | Fixes for detached signatures | Dominik Schürmann | 2015-01-26 | 2 | -11/+36 |
| | | | | |||||
* | | | | Merge branch 'development' into detached-sigs-api | Dominik Schürmann | 2015-01-26 | 468 | -2984/+3918 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * | | | Material Design Drawer | Dominik Schürmann | 2015-01-26 | 34 | -29/+94 |
| |/ / | |||||
| * | | Material Design: Full screen dialogs | Dominik Schürmann | 2015-01-26 | 56 | -272/+202 |
| | | | |||||
| * | | specify our usage of java 1.7 in build files | Vincent Breitmoser | 2015-01-25 | 1 | -0/+5 |
| | | | |||||
| * | | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 88 | -838/+757 |
| | | | |||||
| * | | introduce PromoteKeyOperation to create dummy secret from public keys | Vincent Breitmoser | 2015-01-25 | 8 | -1/+208 |
| | | | |||||
| * | | work on divert-to-key and other keyring stuff | Vincent Breitmoser | 2015-01-25 | 6 | -16/+114 |
| | | | | | | | | | | | | | | | | | | | | | | | | - 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 | ||||
| * | | allow explicit re-certification in SaveKeyringParcel | Vincent Breitmoser | 2015-01-24 | 2 | -1/+8 |
| | | | |||||
| * | | move key stripping into ChangeSubkey, support divert-to-card | Vincent Breitmoser | 2015-01-24 | 5 | -39/+56 |
| | | | |||||
| * | | only respect most recent signature for key flags | Vincent Breitmoser | 2015-01-19 | 2 | -12/+42 |
| | | | |||||
| * | | always show revoked user ids last! | Vincent Breitmoser | 2015-01-19 | 1 | -4/+4 |
| | | | |||||
| * | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-19 | 2 | -1/+9 |
| |\| | | | | | | | | | | development | ||||
| | * | No setContentView in onCreate for KeyListActivity | Vincent | 2015-01-16 | 1 | -2/+0 |
| | | | |||||
| | * | show notification if KeyListActivity is spawned with an EXTRA_RESULT | Vincent Breitmoser | 2015-01-16 | 2 | -1/+11 |
| | | | | | | | | | | | | | | | | | | | | | Closes #1029 Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java |