aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* linked: use link icon from octo set? not sure yet..Vincent Breitmoser2015-09-018-2/+5
|
* linked: update icon design of github l-id creationVincent Breitmoser2015-09-0114-9/+31
|
* linked: work on github designVincent Breitmoser2015-09-013-57/+102
|
* linked: redesign github resource creation, implement ouath flow (WIP)Vincent Breitmoser2015-09-018-12/+501
|
* add simple StatusIndicator widgetVincent Breitmoser2015-09-012-0/+55
|
* linked: Github -> GitHub (fixes #1513)Vincent Breitmoser2015-08-311-9/+9
|
* linked: fix small typoVincent Breitmoser2015-08-311-1/+1
|
* linked: disable DNS resource (for now)Vincent Breitmoser2015-08-313-5/+9
|
* Show linked identity menu item and linked identities only when feature is ↵Dominik Schürmann2015-08-293-6/+10
| | | | enabled
* Reword experimental settingsDominik Schürmann2015-08-293-6/+11
|
* move stray test file to correct positionVincent Breitmoser2015-08-291-3/+5
|
* Merge remote-tracking branch 'origin/master'Vincent Breitmoser2015-08-295-74/+163
|\
| * Improve decrypt stringsDominik Schürmann2015-08-281-2/+2
| |
| * Support OpenPGP API v9Dominik Schürmann2015-08-281-10/+6
| |
| * Merge branch 'mgeier63-master'Dominik Schürmann2015-08-284-63/+156
| |\
| | * Cleanup OpenPgpService2 code, update openpgp-api libDominik Schürmann2015-08-282-51/+3
| | |
| | * Revert "service side support for ↵Dominik Schürmann2015-08-281-3/+208
| | | | | | | | | | | | | | | | | | https://github.com/open-keychain/openpgp-api/pull/3" This reverts commit 298e42d3aa5a4d78778df08aab3634a7c771d361.
| | * Merge branch 'master' of https://github.com/mgeier63/open-keychain into ↵Dominik Schürmann2015-08-284-271/+207
| |/| | | | | | | | | | mgeier63-master
| | * service side support for https://github.com/open-keychain/openpgp-api/pull/3mgeier632015-08-271-208/+3
| | |
| | * service side support for https://github.com/open-keychain/openpgp-api/pull/3mgeier632015-08-273-63/+204
| | |
* | | Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-29115-97/+6277
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge Linked Identities. Also includes an important fix for OperationHelper ids, which had an error in the bit mask logic. Conflicts: Graphics/update-drawables.sh OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.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/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java OpenKeychain/src/main/res/anim/fade_in.xml OpenKeychain/src/main/res/anim/fade_out.xml OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml OpenKeychain/src/main/res/layout/view_key_fragment.xml OpenKeychain/src/main/res/menu/key_view.xml OpenKeychain/src/main/res/values/strings.xml OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java README.md
| * | yubikey: don't assume signing key is masterKeyId in ViewKeyActivityVincent Breitmoser2015-05-162-42/+54
| | |
| * | fix fragment handling in ViewKeyActivityVincent Breitmoser2015-05-161-37/+12
| | |
| * | linked-ids: remove debug uriVincent Breitmoser2015-05-161-1/+1
| | |
| * | allow linked token without one colonVincent Breitmoser2015-05-121-3/+2
| | |
| * | rename LinkedIdentity to LinkedAttributeVincent Breitmoser2015-05-125-13/+13
| | |
| * | Merge tag 'v3.2.1' into linked-identitiesVincent Breitmoser2015-05-11104-1338/+1597
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 3.2.1 Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/values/strings.xml
| * | | linked-ids: small compatibility changesVincent Breitmoser2015-05-113-2/+4
| | | |
| * | | linked-ids: add certificate pinning, pin twitter api certVincent Breitmoser2015-05-099-27/+54
| | | |
| * | | linked-ids: rename RawLinkedIdentity to UriAttributeVincent Breitmoser2015-05-097-25/+25
| | | |
| * | | linked-ids: rename "cookie" to "token"Vincent Breitmoser2015-05-0912-43/+43
| | | |
| * | | linked-ids: code cleanup, handle all lint errorsVincent Breitmoser2015-05-0922-324/+295
| | | |
| * | | check for fingerprint of any subkey (arguable?)Vincent Breitmoser2015-05-062-6/+18
| | | |
| * | | fix crash when moving focus from EncryptKeyCompletionView with unknown textVincent Breitmoser2015-04-281-1/+1
| | | |
| * | | display unknown keys red rather than orangeVincent Breitmoser2015-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For an unknown key, there is no indication of the state the key is in. To indicate both immediate action required, and to make this status equal to its worst case (rather than *better* than its worst case), the status is displayed in red. At some point, we will probably want to download unknown keys automatically, at which point an unknown key will actually be an error state. This is an intermediate solution until then.
| * | | fix "select all" in key list multi-selectVincent Breitmoser2015-04-281-1/+1
| | | |
| * | | small ui nicetiesVincent Breitmoser2015-04-276-13/+30
| | | |
| * | | prevent crashes in EncryptKeyCompletionViewVincent Breitmoser2015-04-271-2/+10
| | | |
| * | | display creation dates for ambiguous user idsVincent Breitmoser2015-04-274-17/+44
| | | |
| * | | add distinct status for messages signed by "your" keyVincent Breitmoser2015-04-272-0/+14
| | | |
| * | | small changes for performanceVincent Breitmoser2015-04-271-3/+4
| | | |
| * | | profiling says: caching qrCode bitmaps is a good ideaVincent Breitmoser2015-04-272-19/+43
| | | |
| * | | show linked ids card only if unfiltered ids are availableVincent Breitmoser2015-04-261-1/+1
| | | |
| * | | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-263-140/+0
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-2655-238/+1113
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java OpenKeychain/src/main/res/menu/decrypt_menu.xml
| * | | | | update uris and cookie patterns, plus some stylingsVincent Breitmoser2015-04-2511-33/+65
| | | | | |
| * | | | | change HttpsEditText to generic PrefixEditTextVincent Breitmoser2015-04-255-10/+27
| | | | | |
| * | | | | fix certification in unit testsVincent Breitmoser2015-04-242-2/+2
| | | | | |
| * | | | | fix encrypt activity layoutVincent Breitmoser2015-04-242-3/+4
| | | | | |
| * | | | | revamp decrypt uiVincent Breitmoser2015-04-247-230/+391
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 08:30:19 +0000