aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Collapse)AuthorAgeFilesLines
...
| * Show linked identity menu item and linked identities only when feature is ↵Dominik Schürmann2015-08-291-1/+1
| | | | | | | | enabled
| * Reword experimental settingsDominik Schürmann2015-08-292-4/+7
| |
| * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2015-08-291-2/+2
| |\
| | * Improve decrypt stringsDominik Schürmann2015-08-281-2/+2
| | |
| * | Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-2953-14/+1973
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Merge tag 'v3.2.1' into linked-identitiesVincent Breitmoser2015-05-1140-288/+404
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-111-0/+1
| | | |
| | * | linked-ids: rename "cookie" to "token"Vincent Breitmoser2015-05-091-6/+6
| | | |
| | * | small ui nicetiesVincent Breitmoser2015-04-272-6/+6
| | | |
| | * | display creation dates for ambiguous user idsVincent Breitmoser2015-04-272-3/+15
| | | |
| | * | add distinct status for messages signed by "your" keyVincent Breitmoser2015-04-271-0/+1
| | | |
| | * | small changes for performanceVincent Breitmoser2015-04-271-3/+4
| | | |
| | * | 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-2625-43/+273
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-254-16/+12
| | | | | |
| | * | | | change HttpsEditText to generic PrefixEditTextVincent Breitmoser2015-04-253-4/+14
| | | | | |
| | * | | | fix encrypt activity layoutVincent Breitmoser2015-04-241-1/+3
| | | | | |
| | * | | | revamp decrypt uiVincent Breitmoser2015-04-244-81/+44
| | | | | |
| | * | | | use CryptoOperationFragment for linked id fragments, and some warning cleanupVincent Breitmoser2015-04-242-4/+8
| | | | | |
| | * | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-24135-1276/+2044
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Graphics/update-drawables.sh OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| | * | | | | minor ui and wording changesVincent Breitmoser2015-04-092-8/+20
| | | | | | |
| | * | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-09191-7866/+9359
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| | * | | | | | rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-303-13/+23
| | | | | | | |
| | * | | | | | even more linked id ui workVincent Breitmoser2015-03-293-6/+9
| | | | | | | |
| | * | | | | | more (subtle) ui workVincent Breitmoser2015-03-262-30/+27
| | | | | | | |
| | * | | | | | more linked id ui fine tuningVincent Breitmoser2015-03-2616-0/+0
| | | | | | | |
| | * | | | | | some linked id ui fine tuningVincent Breitmoser2015-03-2634-126/+115
| | | | | | | |
| | * | | | | | secret/public distinction in LinkedIdViewVincent Breitmoser2015-03-241-0/+9
| | | | | | | |
| | * | | | | | work on cookie scanning during creationVincent Breitmoser2015-03-241-0/+7
| | | | | | | |
| | * | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-2434-176/+222
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| | * | | | | | | support github resource (re)Vincent Breitmoser2015-03-244-1/+331
| | | | | | | | |
| | * | | | | | | support github resource (pa)Vincent Breitmoser2015-03-242-0/+3
| | | | | | | | |
| | * | | | | | | work on certification uiVincent Breitmoser2015-03-1514-33/+71
| | | | | | | | |
| | * | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-15101-1504/+1475
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| | * | | | | | | | work on second step of identity creationVincent Breitmoser2015-03-135-204/+161
| | | | | | | | | |
| | * | | | | | | | use ViewAnimator for progress, streamline text on first stepVincent Breitmoser2015-03-138-85/+102
| | | | | | | | | |
| | * | | | | | | | remove notiion of nonce/identifierVincent Breitmoser2015-03-131-2/+0
| | | | | | | | | |
| | * | | | | | | | change finish button label to "link identity"Vincent Breitmoser2015-03-134-3/+4
| | | | | | | | | |
| | * | | | | | | | fix linked wizard buttonsVincent Breitmoser2015-03-126-27/+48
| | | | | | | | | |
| | * | | | | | | | twitter layout step3 -> step2Vincent Breitmoser2015-03-122-221/+77
| | | | | | | | | |
| | * | | | | | | | finish implementing twitter resourceVincent Breitmoser2015-03-121-1/+1
| | | | | | | | | |
| | * | | | | | | | better state management in LinkedIdView, move confirm progress into cardVincent Breitmoser2015-03-101-21/+27
| | | | | | | | | |
| | * | | | | | | | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-03-1040-64/+200
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java OpenKeychain/src/main/res/layout/view_key_fragment.xml
| | * | | | | | | | | add expand item to linked id listVincent Breitmoser2015-03-103-1/+36
| | | | | | | | | | |
| | * | | | | | | | | cleaner handling of verification stateVincent Breitmoser2015-03-101-1/+2
| | | | | | | | | | |
| | * | | | | | | | | Merge remote-tracking branch 'development' into linked-identitiesVincent Breitmoser2015-03-1082-474/+507
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | rearrange linked id layouts, add CertListWidgetVincent Breitmoser2015-03-092-11/+102
| | | | | | | | | | | |
| | * | | | | | | | | | add linked id certs uri to KeychainProviderVincent Breitmoser2015-03-091-52/+0
| | | | | | | | | | | |
| | * | | | | | | | | | use loader in LinkedIdViewFragmentVincent Breitmoser2015-03-091-0/+8
| | | | | | | | | | | |
| | * | | | | | | | | | successfully certify linked idsVincent Breitmoser2015-03-081-0/+1
| | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 22:04:47 +0000