| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | | | | | | | | | | work more on separation of linked identities and resources, initial ui work | Vincent Breitmoser | 2015-03-04 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | add linked it to view key context menu | Vincent Breitmoser | 2015-03-02 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-02 | 2 | -2/+3 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ | NON-WORKING Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-02 | 6 | -71/+275 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| | | * | | | | | | | | | | | | | small language fix | Vincent Breitmoser | 2015-01-16 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | linked id ui work dns/twitter | Vincent Breitmoser | 2015-01-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | affirmation -> linked identity | Vincent Breitmoser | 2015-01-15 | 1 | -12/+12 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | work on dns resource, working (dummy) verification | Vincent Breitmoser | 2015-01-14 | 1 | -0/+11 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | small fixes to user attribute handling | Vincent Breitmoser | 2015-01-14 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | actually import user attributes (though they are not shown anywhere yet) | Vincent Breitmoser | 2015-01-14 | 1 | -0/+17 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | certification of the first linked identity packet! | Vincent Breitmoser | 2015-01-13 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | some work on twitter resource | Vincent Breitmoser | 2015-01-13 | 1 | -3/+18 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | support addition of user attributes | Vincent Breitmoser | 2015-01-12 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | add support for user attributes (during canonicalization) | Vincent Breitmoser | 2015-01-12 | 1 | -1/+16 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | even more intermediate result | Vincent Breitmoser | 2015-01-12 | 1 | -0/+21 | |
| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | intermediate state, nothing really working yet | Vincent Breitmoser | 2015-01-12 | 1 | -0/+10 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Make keybase an experimental feature | Dominik Schürmann | 2015-08-28 | 1 | -7/+3 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | introduce text protection and fix color change after confirm | Dominik Schürmann | 2015-08-28 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Dont show FAB for expired, revoked keys | Dominik Schürmann | 2015-08-28 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Improve certify strings | Dominik Schürmann | 2015-08-28 | 1 | -9/+9 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Experimental word comparison | Dominik Schürmann | 2015-08-27 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Prettify settings, rename some strings | Dominik Schürmann | 2015-08-27 | 1 | -15/+22 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Experimental features settings reworked | Dominik Schürmann | 2015-08-27 | 1 | -3/+7 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Experimental feature setting | Dominik Schürmann | 2015-08-27 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | fix msg_ip_merge_secret | Dominik Schürmann | 2015-08-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Use CDATA to prevent transifex problems | Dominik Schürmann | 2015-08-26 | 1 | -6/+6 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Better del_rev_dialog_title | Dominik Schürmann | 2015-08-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Better del_rev_dialog_message | Dominik Schürmann | 2015-08-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-08-24 | 1 | -0/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | mention filename to export to in log | Vincent Breitmoser | 2015-08-22 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Move proxy pref values out of strings | Dominik Schürmann | 2015-08-24 | 2 | -5/+3 | |
| | |/ / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | introduced constants for keyserver sync, fixed sync issue | Adithya Abraham Philip | 2015-08-20 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | added on/off summaries | Adithya Abraham Philip | 2015-08-20 | 1 | -3/+6 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | added sync preferences | Adithya Abraham Philip | 2015-08-20 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | changed sync name | Adithya Abraham Philip | 2015-08-20 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | improved orbot notify, added periodic sync | Adithya Abraham Philip | 2015-08-20 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | introduced keyserver sync adapter | Adithya Abraham Philip | 2015-08-20 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Fix theme problems | Dominik Schürmann | 2015-08-18 | 2 | -6/+16 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | WIP mime parsing | Dominik Schürmann | 2015-08-17 | 1 | -0/+5 | |
| |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Fix theme bugs | Dominik Schürmann | 2015-08-12 | 1 | -1/+6 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Adpt official theme naming schema | Dominik Schürmann | 2015-08-12 | 1 | -12/+12 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Style dialog buttons | Dominik Schürmann | 2015-08-12 | 1 | -1/+15 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Improve comments and reasons in PgpConstants, simple checks for insecure ↵ | Dominik Schürmann | 2015-08-10 | 1 | -3/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | asymmetric keys | |||||
| * | | | | | | | | | | | | | | Follow some of coorus recommendations: better selection of algo whitelist, ↵ | Dominik Schürmann | 2015-08-09 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ignore recipients preferred algos | |||||
| * | | | | | | | | | | | | | | Introduce constants in OpenPgpSignature and DecryptionResult for ↵ | Dominik Schürmann | 2015-08-09 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unsigned/unencrypted content, update API, introduce simple checks for insecure symmetric algos | |||||
| * | | | | | | | | | | | | | | Merge pull request #1473 from open-keychain/orbot-helper | Dominik Schürmann | 2015-08-06 | 1 | -0/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated OrbotHelper with the latest NetCipher | |||||
| | * | | | | | | | | | | | | | | updated OrbotHelper with silent start | Adithya Abraham Philip | 2015-08-06 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | fixed crash on api < 21 due to drawable using attrs | Adithya Abraham Philip | 2015-08-06 | 3 | -9/+20 | |
| |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Merge pull request #1456 from xSooDx/master | Dominik Schürmann | 2015-08-05 | 1 | -8/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ISSUE #1304: Change keybase strings | |||||
| | * | | | | | | | | | | | | | | -No longer appends the links to the keybase_narratives | xSooDx | 2015-07-21 | 1 | -8/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Now uses '%s' to insert the names in the keybase_narratives -added '%s' to keybase_narrative_* in the string.xml file NOTE:Have not modified for other languages | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |