Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-15 | 4 | -32/+97 |
|\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | ||||
| * | Remove display of key id in other lists | Dominik Schürmann | 2015-03-15 | 1 | -12/+37 |
| | | |||||
| * | Fixes for selection of certify key | Dominik Schürmann | 2015-03-15 | 2 | -10/+21 |
| | | |||||
| * | Merge pull request #1142 from tdjogi010/development | Dominik Schürmann | 2015-03-15 | 1 | -4/+10 |
| |\ | | | | | | | Preselected Suitable Key | ||||
| | * | Preselected Suitable Key | tdjogi010@gmail.com | 2015-03-13 | 1 | -4/+10 |
| | | | |||||
| * | | Dont display key ids in KeySpinner, display creation date when user ids ↵ | Dominik Schürmann | 2015-03-15 | 3 | -14/+37 |
| |/ | | | | | | | duplicate | ||||
* | | show certificates for secret keys differently | Vincent Breitmoser | 2015-03-14 | 1 | -8/+12 |
| | | |||||
* | | minor additions to CertListWidget | Vincent Breitmoser | 2015-03-10 | 1 | -7/+17 |
| | | |||||
* | | Merge remote-tracking branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-10 | 5 | -129/+155 |
|\| | |||||
| * | Cleanup new widgets | Dominik Schürmann | 2015-03-09 | 3 | -38/+41 |
| | | |||||
| * | Implemented NameEditText | chipset95 | 2015-03-09 | 2 | -51/+4 |
| | | |||||
| * | Improved EmailEditText, Added NameEditText, Removed PasswordEditText #1106 | chipset95 | 2015-03-09 | 3 | -101/+85 |
| | | |||||
| * | minor code style correction | Adithya Abraham Philip | 2015-03-07 | 1 | -1/+2 |
| | | |||||
| * | removed created by comment | Adithya Abraham Philip | 2015-03-06 | 1 | -3/+0 |
| | | |||||
| * | changed default colors for PasswordStrengthView | Adithya Abraham Philip | 2015-03-06 | 1 | -3/+5 |
| | | |||||
| * | added PassphraseEditText to SetPassphraseDialogFragment | Adithya Abraham Philip | 2015-03-06 | 1 | -0/+2 |
| | | |||||
| * | added PassphraseEditText | Adithya Abraham Philip | 2015-03-06 | 1 | -0/+84 |
| | | |||||
* | | rearrange linked id layouts, add CertListWidget | Vincent Breitmoser | 2015-03-09 | 1 | -0/+131 |
| | | |||||
* | | successfully certify linked ids | Vincent Breitmoser | 2015-03-08 | 1 | -0/+1 |
| | | |||||
* | | return key ids from PassphraseDialogActivity, accept null userids | Vincent Breitmoser | 2015-03-08 | 1 | -4/+0 |
| | | |||||
* | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-08 | 4 | -0/+675 |
|\| | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| * | Added GPLv3 License | chipset95 | 2015-03-06 | 2 | -0/+34 |
| | | |||||
| * | Created EmailEditText, PasswordEditText and implemented wherever required | chipset95 | 2015-03-06 | 2 | -0/+164 |
| | | |||||
| * | 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 | 2 | -0/+468 |
| |\ | | | | | | | | | | | | | | | | | | | passphrase-strength-indicator Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java | ||||
| | * | Add license to password strength view classes | Lukas Zorich | 2015-03-03 | 2 | -0/+48 |
| | | | |||||
| | * | 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. | ||||
* | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-05 | 3 | -7/+9 |
|\| | | | | | | | | | | | | | | | | | 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 | 2 | -6/+8 |
| |\ \ | | | | | | | | | #1042 replaced some int constants with enums | ||||
| | * | | #1042 replaced some int constants with enums | Daniel Nelz | 2015-03-04 | 2 | -6/+8 |
| | |/ | | | | | | | | | | | | | Created enum FragAction in CreateKeyActivity.java and enum State in KeyFormattingUtils.java and replaced int constants with them | ||||
| * | | Get high res version of contact photo | Dominik Schürmann | 2015-03-04 | 1 | -1/+1 |
| | | | |||||
| * | | Use master key id instead of fingerprint in sync adapter, use IS_EXPIRED ↵ | Dominik Schürmann | 2015-03-04 | 1 | -1/+1 |
| |/ | | | | | | | instead of EXPIRY where possible | ||||
* | | NON-WORKING Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-02 | 9 | -671/+182 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java OpenKeychain/src/main/res/layout/view_key_main_fragment.xml OpenKeychain/src/main/res/values/strings.xml extern/spongycastle | ||||
| * | Remove swipte to refresh src, fix padding in key list | Dominik Schürmann | 2015-02-27 | 1 | -99/+0 |
| | | |||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-02-26 | 1 | -4/+5 |
| |\ | | | | | | | | | | development | ||||
| | * | pre-select certification key if only one is available | Vincent Breitmoser | 2015-02-26 | 1 | -4/+5 |
| | | | |||||
| * | | Hopefully fixes drop down icon for spinners on Android lower 5 | Dominik Schürmann | 2015-02-26 | 1 | -2/+6 |
| |/ | |||||
| * | First work on new key view toolbar | Dominik Schürmann | 2015-02-25 | 3 | -6/+146 |
| | | |||||
| * | rewrite PgpSignEncrypt data flow | Vincent Breitmoser | 2015-02-01 | 2 | -4/+4 |
| | | | | | | | | | | | | | | - 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 | ||||
| * | Material Design: Full screen dialogs | Dominik Schürmann | 2015-01-26 | 1 | -18/+21 |
| | | |||||
| * | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 4 | -10/+1 |
| | | |||||
| * | Style tabs, add missing drawables | Dominik Schürmann | 2015-01-15 | 2 | -529/+0 |
| | | |||||
* | | intermediate state, nothing really working yet | Vincent Breitmoser | 2015-01-12 | 1 | -0/+38 |
|/ | |||||
* | Fix to preselect certification key if only one is available | Vincent Breitmoser | 2014-10-29 | 1 | -1/+1 |
| | | | | Closes #981 | ||||
* | remove unused ExchangeKeySpinner class | Vincent Breitmoser | 2014-10-29 | 1 | -100/+0 |
| | |||||
* | Silently fail on import on key import with ArrayIndexOutOfBoundsException | Dominik Schürmann | 2014-10-16 | 1 | -3/+3 |
| | |||||
* | More consisitency | Dominik Schürmann | 2014-10-15 | 2 | -6/+6 |
| | |||||
* | Replace many PgpGeneralExceptions with PgpKeyNotFoundException | Dominik Schürmann | 2014-10-09 | 1 | -1/+2 |
| | |||||
* | Revert "Replace PgpGeneralException with NotFoundException where appropriate" | Dominik Schürmann | 2014-10-09 | 1 | -2/+1 |
| | | | | This reverts commit 49b4ff63122988dc1587844e6b4b2ee5d0855385. | ||||
* | Replace PgpGeneralException with NotFoundException where appropriate | Dominik Schürmann | 2014-10-09 | 1 | -1/+2 |
| |