Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Add missing file with PGP Constants | Dominik Schürmann | 2015-03-05 | 1 | -0/+69 | |
| | | | | ||||||
| * | | | Remove advanced preferences, move compression as menu item in encrypt ↵ | Dominik Schürmann | 2015-03-05 | 19 | -484/+134 | |
| | | | | | | | | | | | | | | | | activites, select hash and encryption algo based on hardcoded preferred lists | |||||
| * | | | Remove preferences multi process min sdk check | Dominik Schürmann | 2015-03-05 | 1 | -6/+2 | |
| | | | | ||||||
| * | | | Remove false comment in list fragment | Dominik Schürmann | 2015-03-05 | 1 | -3/+0 | |
| | | | | ||||||
| * | | | Debug options | Dominik Schürmann | 2015-03-05 | 3 | -2/+6 | |
| | | | | ||||||
| * | | | Design fixes for decryption screen | Dominik Schürmann | 2015-03-05 | 14 | -3/+4 | |
| | | | | ||||||
| * | | | Use no compression in API for now | Dominik Schürmann | 2015-03-05 | 1 | -1/+2 | |
| | | | | ||||||
| * | | | Better selection of preferred algorithm | Dominik Schürmann | 2015-03-05 | 11 | -40/+99 | |
| | | | | ||||||
* | | | | work on certification step | Vincent Breitmoser | 2015-03-08 | 2 | -7/+100 | |
| | | | | ||||||
* | | | | finish after linked id creation | Vincent Breitmoser | 2015-03-06 | 1 | -12/+1 | |
| | | | | ||||||
* | | | | use final fragment superclass for twitter | Vincent Breitmoser | 2015-03-06 | 1 | -98/+23 | |
| | | | | ||||||
* | | | | use final fragment superclass for dns | Vincent Breitmoser | 2015-03-06 | 2 | -214/+19 | |
| | | | | ||||||
* | | | | extract linked id create final fragment superclass | Vincent Breitmoser | 2015-03-06 | 2 | -221/+275 | |
| | | | | ||||||
* | | | | prepare superclass extraction for final linked id creation fragment | Vincent Breitmoser | 2015-03-06 | 5 | -34/+42 | |
| | | | | ||||||
* | | | | first steps in ui towards confirmation of linked ids | Vincent Breitmoser | 2015-03-06 | 8 | -237/+410 | |
| | | | | ||||||
* | | | | work on LinkedIdViewFragment | Vincent Breitmoser | 2015-03-05 | 12 | -105/+178 | |
| | | | | ||||||
* | | | | make linked identity list homogeneous | Vincent Breitmoser | 2015-03-05 | 12 | -112/+156 | |
| | | | | ||||||
* | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-05 | 598 | -1502/+1234 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | |||||
| * | | | Merge pull request #1101 from danielnelz/development | Dominik Schürmann | 2015-03-04 | 13 | -70/+85 | |
| |\ \ \ | | | | | | | | | | | #1042 replaced some int constants with enums | |||||
| | * | | | #1042 replaced some int constants with enums | Daniel Nelz | 2015-03-04 | 13 | -70/+85 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Created enum FragAction in CreateKeyActivity.java and enum State in KeyFormattingUtils.java and replaced int constants with them | |||||
| * | | | | Rewording secret_key_deletion_confirmation | Dominik Schürmann | 2015-03-04 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Show fingerprint menu item only if not revoked or expired | Dominik Schürmann | 2015-03-04 | 1 | -9/+12 | |
| | | | | | ||||||
| * | | | | Use material save icon | Dominik Schürmann | 2015-03-04 | 11 | -1/+2 | |
| | | | | | ||||||
| * | | | | Merge branch 'adithyaphilip-development' into development | Dominik Schürmann | 2015-03-04 | 8 | -2/+225 | |
| |\ \ \ \ | ||||||
| | * | | | | Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ↵ | Dominik Schürmann | 2015-03-04 | 8 | -2/+225 | |
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into adithyaphilip-development Conflicts: OpenKeychain/src/main/res/values/strings.xml | |||||
| | * | | | | corrected code style | Adithya Abraham Philip | 2015-03-04 | 1 | -58/+75 | |
| | | | | | | ||||||
| | * | | | | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵ | Adithya Abraham Philip | 2015-03-02 | 17 | -41/+104 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | into development | |||||
| | * | | | | | supports sub logs in log export | Adithya Abraham Philip | 2015-03-01 | 1 | -68/+55 | |
| | | | | | | | ||||||
| | * | | | | | added logging, notify for log export | Adithya Abraham Philip | 2015-03-01 | 3 | -20/+66 | |
| | | | | | | | ||||||
| | * | | | | | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵ | Adithya Abraham Philip | 2015-02-28 | 4 | -37/+113 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | into development | |||||
| | * \ \ \ \ \ | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵ | Adithya Abraham Philip | 2015-02-28 | 74 | -835/+1672 | |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into development | |||||
| | * | | | | | | | cleaned up log export | Adithya Abraham Philip | 2015-02-28 | 1 | -20/+9 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵ | Adithya Abraham Philip | 2015-02-28 | 37 | -651/+1303 | |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into development | |||||
| | * | | | | | | | | refined log output | Adithya Abraham Philip | 2015-02-28 | 1 | -4/+71 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | merged dialog | Adithya Abraham Philip | 2015-02-26 | 835 | -5627/+14491 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | initial Log Display function | Adithya Abraham Philip | 2015-02-26 | 7 | -0/+117 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Set key signature algo from SHA512 to SHA256 | Dominik Schürmann | 2015-03-04 | 1 | -9/+10 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Remove help button for now | Dominik Schürmann | 2015-03-04 | 7 | -16/+3 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | More icon naming fixes and design | Dominik Schürmann | 2015-03-04 | 24 | -56/+70 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Partially fix file names | Dominik Schürmann | 2015-03-04 | 222 | -48/+36 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Fix transifex | Dominik Schürmann | 2015-03-04 | 1 | -12/+3 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Simplified language: Confirm keys | Dominik Schürmann | 2015-03-04 | 55 | -781/+82 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Update lib list | Dominik Schürmann | 2015-03-04 | 2 | -34/+10 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Get high res version of contact photo | Dominik Schürmann | 2015-03-04 | 3 | -6/+7 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Crop image view to center | Dominik Schürmann | 2015-03-04 | 2 | -7/+6 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Full height contact pic in key view | Dominik Schürmann | 2015-03-04 | 2 | -8/+8 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | ContactHelper cleanup | Dominik Schürmann | 2015-03-04 | 2 | -34/+41 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Use master key id instead of fingerprint in sync adapter, use IS_EXPIRED ↵ | Dominik Schürmann | 2015-03-04 | 9 | -119/+129 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of EXPIRY where possible | |||||
| * | | | | | | | | | | Fix status bar orange | Dominik Schürmann | 2015-03-04 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | More simplification of delete strings | Dominik Schürmann | 2015-03-04 | 1 | -1/+1 | |
| | | | | | | | | | | |