Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-08 | 32 | -540/+1154 |
|\ | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| * | add support for certification of user attributes | Vincent Breitmoser | 2015-03-08 | 4 | -17/+97 |
| | | |||||
| * | Merge pull request #1108 from tdjogi010/development | Vincent | 2015-03-06 | 1 | -38/+74 |
| |\ | | | | | | | Asks Passphrase for key delete/export in ViewKeyActivity. | ||||
| | * | Asks Passphrase for key delete/export in ViewKeyActivity. | tdjogi010@gmail.com | 2015-03-06 | 1 | -38/+74 |
| | | | |||||
| * | | Added GPLv3 License | chipset95 | 2015-03-06 | 2 | -0/+34 |
| | | | |||||
| * | | Created EmailEditText, PasswordEditText and implemented wherever required | chipset95 | 2015-03-06 | 5 | -84/+182 |
| | | | |||||
| * | | Format code of merged password strength widget | Dominik Schürmann | 2015-03-05 | 2 | -40/+49 |
| | | | |||||
| * | | Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into ↵ | Dominik Schürmann | 2015-03-05 | 4 | -0/+496 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | passphrase-strength-indicator Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java | ||||
| | * | | Integrates passphrase strength indicator to create key wizard. | Lukas Zorich | 2015-03-03 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit patches issue #1050. The padding set in the passphrase edit text is set programmatically because there is a bug in appcompat-v7 where padding via xml doesn't work: http://code.google.com/p/android/issues/detail?id=77982 | ||||
| | * | | Add license to password strength view classes | Lukas Zorich | 2015-03-03 | 3 | -0/+68 |
| | | | | |||||
| | * | | Implemented Matt Allen password strength indicator | Lukas Zorich | 2015-03-03 | 2 | -0/+420 |
| | |/ | | | | | | | | | | | | | | | | | | | I used most of Matt Allen password strength indicator code available here https://github.com/matt-allen/android-password-strength-indicator, but modified it a little bit in order to customize the view's colors through the xml. | ||||
| * | | Use ArrayList instead of LinkedList | Dominik Schürmann | 2015-03-05 | 5 | -11/+13 |
| | | | |||||
| * | | Cleanup of PgpConstants | Dominik Schürmann | 2015-03-05 | 1 | -24/+22 |
| | | | |||||
| * | | Add missing header | Dominik Schürmann | 2015-03-05 | 1 | -0/+17 |
| | | | |||||
| * | | Check for insecure hash and symmetric encryption algos on decrypt | Dominik Schürmann | 2015-03-05 | 2 | -0/+32 |
| | | | |||||
| * | | Use static linked lists instead of arrays | Dominik Schürmann | 2015-03-05 | 6 | -35/+53 |
| | | | |||||
| * | | 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 | 14 | -433/+101 |
| | | | | | | | | | | | | 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 | 1 | -1/+1 |
| | | | |||||
| * | | 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 | 1 | -6/+90 |
| | | | |||||
* | | | 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 | 4 | -231/+310 |
| | | | |||||
* | | | work on LinkedIdViewFragment | Vincent Breitmoser | 2015-03-05 | 9 | -25/+170 |
| | | | |||||
* | | | make linked identity list homogeneous | Vincent Breitmoser | 2015-03-05 | 10 | -106/+150 |
| | | | |||||
* | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-05 | 38 | -451/+780 |
|\| | | | | | | | | | | | | | | | | | 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 | ||||
| * | | Show fingerprint menu item only if not revoked or expired | Dominik Schürmann | 2015-03-04 | 1 | -9/+12 |
| | | | |||||
| * | | Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ↵ | Dominik Schürmann | 2015-03-04 | 2 | -2/+203 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -7/+20 |
| | |\ \ | | | | | | | | | | | | | | | | 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 | 2 | -20/+59 |
| | | | | | |||||
| | * | | | 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 | 15 | -380/+375 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | 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 | 24 | -463/+1033 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | into development | ||||
| | * | | | | | | refined log output | Adithya Abraham Philip | 2015-02-28 | 1 | -4/+71 |
| | | | | | | | | |||||
| | * | | | | | | merged dialog | Adithya Abraham Philip | 2015-02-26 | 41 | -573/+1931 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | initial Log Display function | Adithya Abraham Philip | 2015-02-26 | 1 | -0/+102 |
| | | | | | | | | | |||||
| * | | | | | | | | Set key signature algo from SHA512 to SHA256 | Dominik Schürmann | 2015-03-04 | 1 | -9/+10 |
| | | | | | | | | |