Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | cleaned up code | Adithya Abraham Philip | 2015-03-06 | 2 | -52/+37 | |
| | | ||||||
| * | changed default colors for PasswordStrengthView | Adithya Abraham Philip | 2015-03-06 | 1 | -3/+5 | |
| | | ||||||
| * | added PassphraseEditText to SetPassphraseDialogFragment | Adithya Abraham Philip | 2015-03-06 | 2 | -5/+5 | |
| | | ||||||
| * | added PassphraseEditText | Adithya Abraham Philip | 2015-03-06 | 2 | -14/+89 | |
| | | ||||||
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-06 | 1 | -38/+74 | |
|\| | | | | | | | development | |||||
| * | 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 | |
| | | | ||||||
* | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-06 | 5 | -84/+216 | |
|\| | | | | | | | | | | | development | |||||
| * | | Added GPLv3 License | chipset95 | 2015-03-06 | 2 | -0/+34 | |
| | | | ||||||
| * | | Created EmailEditText, PasswordEditText and implemented wherever required | chipset95 | 2015-03-06 | 5 | -84/+182 | |
| | | | ||||||
* | | | Fix elevation | Dominik Schürmann | 2015-03-06 | 1 | -2/+2 | |
|/ / | ||||||
* | | 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 | 3 | -0/+494 | |
|\ \ | | | | | | | | | | | | | | | | | | | 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 | 2 | -2/+2 | |
| | | ||||||
* | | Use static linked lists instead of arrays | Dominik Schürmann | 2015-03-05 | 2 | -2/+2 | |
| | | ||||||
* | | Remove advanced preferences, move compression as menu item in encrypt ↵ | Dominik Schürmann | 2015-03-05 | 4 | -183/+53 | |
| | | | | | | | | activites, select hash and encryption algo based on hardcoded preferred lists | |||||
* | | Remove false comment in list fragment | Dominik Schürmann | 2015-03-05 | 1 | -3/+0 | |
| | | ||||||
* | | Design fixes for decryption screen | Dominik Schürmann | 2015-03-05 | 1 | -1/+1 | |
| | | ||||||
* | | Better selection of preferred algorithm | Dominik Schürmann | 2015-03-05 | 3 | -13/+33 | |
| | | ||||||
* | | 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 | 1 | -2/+196 | |
|\ \ | | | | | | | | | | | | | | | | | | | into adithyaphilip-development Conflicts: OpenKeychain/src/main/res/values/strings.xml | |||||
| * | | corrected code style | Adithya Abraham Philip | 2015-03-04 | 1 | -58/+75 | |
| | | | ||||||
| * | | 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 | 1 | -20/+52 | |
| | | | ||||||
| * | | 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 | 13 | -379/+361 | |
| |\ \ \ | | | | | | | | | | | | | | | | 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 | 12 | -412/+582 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | into development | |||||
| * | | | | | refined log output | Adithya Abraham Philip | 2015-02-28 | 1 | -4/+71 | |
| | | | | | | ||||||
| * | | | | | merged dialog | Adithya Abraham Philip | 2015-02-26 | 35 | -365/+1711 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | initial Log Display function | Adithya Abraham Philip | 2015-02-26 | 1 | -0/+102 | |
| | | | | | | | ||||||
* | | | | | | | More icon naming fixes and design | Dominik Schürmann | 2015-03-04 | 2 | -16/+16 | |
| | | | | | | | ||||||
* | | | | | | | Simplified language: Confirm keys | Dominik Schürmann | 2015-03-04 | 1 | -15/+4 | |
| | | | | | | | ||||||
* | | | | | | | Get high res version of contact photo | Dominik Schürmann | 2015-03-04 | 2 | -2/+2 | |
| | | | | | | | ||||||
* | | | | | | | Crop image view to center | Dominik Schürmann | 2015-03-04 | 1 | -3/+2 | |
| | | | | | | | ||||||
* | | | | | | | Full height contact pic in key view | Dominik Schürmann | 2015-03-04 | 1 | -7/+1 | |
| | | | | | | | ||||||
* | | | | | | | Use master key id instead of fingerprint in sync adapter, use IS_EXPIRED ↵ | Dominik Schürmann | 2015-03-04 | 8 | -33/+25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of EXPIRY where possible | |||||
* | | | | | | | Simplify dialogs according to Material Design | Dominik Schürmann | 2015-03-04 | 2 | -13/+9 | |
| | | | | | | | ||||||
* | | | | | | | Merge branch 'development' of https://github.com/vectorijk/open-keychain ↵ | Dominik Schürmann | 2015-03-03 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | into vectorijk-development | |||||
| * | | | | | | | icon name changes in UI files | jiangkai | 2015-03-03 | 2 | -2/+2 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | Show name only in passphrase dialog | Dominik Schürmann | 2015-03-03 | 2 | -1/+25 | |
| | | | | | | | ||||||
* | | | | | | | Fix expiry dialog, reorder layouts | Dominik Schürmann | 2015-03-03 | 3 | -44/+47 | |
| | | | | | | | ||||||
* | | | | | | | Prettify passphrase dialog, it no longer resizes on unlocking the key | Dominik Schürmann | 2015-03-03 | 1 | -24/+25 | |
|/ / / / / / | ||||||
* | | | | | | Remove old min sdk check | Dominik Schürmann | 2015-03-03 | 1 | -3/+1 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #1082 from ishan1604/bug-1081 | Dominik Schürmann | 2015-03-03 | 1 | -3/+0 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fixes Issue #1081 |