Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Improve nav drawer drawable | Dominik Schürmann | 2015-02-03 | 2 | -2/+2 |
| | |||||
* | Fix first time wizard design | Dominik Schürmann | 2015-02-03 | 11 | -57/+78 |
| | |||||
* | Add FAB to key list | Dominik Schürmann | 2015-02-03 | 4 | -35/+104 |
| | |||||
* | Move encrypt decrypt operations in own starter activity | Dominik Schürmann | 2015-02-03 | 20 | -27/+74 |
| | |||||
* | 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 | 40 | -715/+451 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-02-02 | 70 | -875/+1092 |
|\ | | | | | | | development | ||||
| * | fix tests for new PgpSignEncryptInput | Vincent Breitmoser | 2015-02-02 | 1 | -29/+29 |
| | | |||||
| * | rewrite PgpSignEncrypt data flow | Vincent Breitmoser | 2015-02-01 | 69 | -851/+1062 |
| | | | | | | | | | | | | | | - 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 | 49 | -1370/+3221 |
| |\ | |||||
| * | | 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 |
| | | |||||
* | | Fix travis for build tools update | Dominik Schürmann | 2015-01-30 | 2 | -1/+1 |
| | | |||||
* | | Update mini dns lib | Dominik Schürmann | 2015-01-30 | 1 | -0/+0 |
| | | |||||
* | | Merge branch 'ligi-ligi/fix/add_ability_to_compile_with_java8' into development | Dominik Schürmann | 2015-01-30 | 2 | -2/+2 |
|\ \ | |||||
| * | | 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 |
| | | | |||||
* | | | Header exported | Dominik Schürmann | 2015-01-30 | 1 | -1/+4 |
| | | | |||||
* | | | Saving of allowed keys | Dominik Schürmann | 2015-01-29 | 12 | -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 | 6 | -5/+2039 |
| | | | |||||
* | | | Update api lib | Dominik Schürmann | 2015-01-29 | 1 | -0/+0 |
|/ / | |||||
* | | 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 | 2 | -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 |
| | | |||||
* | | Update api lib | Dominik Schürmann | 2015-01-29 | 1 | -0/+0 |
| | | |||||
* | | 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 | 20 | -360/+61 |
| | |||||
* | 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 | 10 | -3/+58 |
| | | |||||
* | | Fix cleartext signatures internally | Dominik Schürmann | 2015-01-27 | 1 | -5/+4 |
| | | |||||
* | | Update api lib | Dominik Schürmann | 2015-01-27 | 1 | -0/+0 |
| | | |||||
* | | Fix nullpointer in ImportKeysActivity | Dominik Schürmann | 2015-01-27 | 1 | -13/+24 |
| | | |||||
* | | Merge branch 'detached-sigs-api' into development | Dominik Schürmann | 2015-01-27 | 16 | -200/+449 |
|\ \ | |||||
| * | | Support verification of detached signatures | Dominik Schürmann | 2015-01-27 | 3 | -98/+223 |
| | | | |||||
| * | | Merge branch 'development' into detached-sigs-api | Dominik Schürmann | 2015-01-27 | 13 | -57/+187 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | ||||
| * | | | 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 | 652 | -3346/+5071 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * | | | | Update safeslinger lib | Dominik Schürmann | 2015-01-12 | 1 | -0/+0 |
| | | | | | |||||
| * | | | | No output stream for detached signatures, makes no sense to pipe it through | Dominik Schürmann | 2015-01-08 | 2 | -2/+1 |
| | | | | | |||||
| * | | | | Experimental API support for detached signatures (not tested) | Dominik Schürmann | 2015-01-08 | 6 | -44/+118 |
| | | | | | |||||
* | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-27 | 1 | -0/+0 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | development |