aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values
Commit message (Collapse)AuthorAgeFilesLines
* linked: basic shared element transitionVincent Breitmoser2015-09-061-10/+2
|
* linked: use webview instead of app, and some minor layoutingsVincent Breitmoser2015-09-021-5/+4
|
* linked: redesign github resource creation, implement ouath flow (WIP)Vincent Breitmoser2015-09-011-0/+1
|
* linked: Github -> GitHub (fixes #1513)Vincent Breitmoser2015-08-311-9/+9
|
* linked: fix small typoVincent Breitmoser2015-08-311-1/+1
|
* 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-291-4/+6
|
* 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-292-4/+114
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-112-13/+13
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: rename "cookie" to "token"Vincent Breitmoser2015-05-091-6/+6
| | |
| * | small ui nicetiesVincent Breitmoser2015-04-271-5/+5
| | |
| * | display creation dates for ambiguous user idsVincent Breitmoser2015-04-271-1/+1
| | |
| * | add distinct status for messages signed by "your" keyVincent Breitmoser2015-04-271-0/+1
| | |
| * | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-263-10/+18
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-251-6/+7
| | | |
| * | | change HttpsEditText to generic PrefixEditTextVincent Breitmoser2015-04-251-0/+4
| | | |
| * | | revamp decrypt uiVincent Breitmoser2015-04-241-7/+8
| | | |
| * | | use CryptoOperationFragment for linked id fragments, and some warning cleanupVincent Breitmoser2015-04-241-0/+1
| | | |
| * | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-241-62/+78
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-091-4/+4
| | | | |
| * | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-091-25/+13
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * | | | | even more linked id ui workVincent Breitmoser2015-03-291-0/+1
| | | | | |
| * | | | | more (subtle) ui workVincent Breitmoser2015-03-261-8/+8
| | | | | |
| * | | | | some linked id ui fine tuningVincent Breitmoser2015-03-261-1/+9
| | | | | |
| * | | | | 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-241-4/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * | | | | | support github resource (re)Vincent Breitmoser2015-03-241-1/+10
| | | | | | |
| * | | | | | support github resource (pa)Vincent Breitmoser2015-03-241-0/+3
| | | | | | |
| * | | | | | work on certification uiVincent Breitmoser2015-03-151-6/+10
| | | | | | |
| * | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-151-5/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-131-14/+15
| | | | | | | |
| * | | | | | | use ViewAnimator for progress, streamline text on first stepVincent Breitmoser2015-03-131-20/+18
| | | | | | | |
| * | | | | | | remove notiion of nonce/identifierVincent Breitmoser2015-03-131-2/+0
| | | | | | | |
| * | | | | | | change finish button label to "link identity"Vincent Breitmoser2015-03-131-0/+1
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-03-102-5/+7
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-101-0/+4
| | | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'development' into linked-identitiesVincent Breitmoser2015-03-101-12/+17
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-082-3/+23
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * \ \ \ \ \ \ \ \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-052-30/+33
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * | | | | | | | | | | work more on separation of linked identities and resources, initial ui workVincent Breitmoser2015-03-041-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | add linked it to view key context menuVincent Breitmoser2015-03-021-1/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-022-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
| * \ \ \ \ \ \ \ \ \ \ \ NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-026-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 fixVincent Breitmoser2015-01-161-2/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | linked id ui work dns/twitterVincent Breitmoser2015-01-161-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | affirmation -> linked identityVincent Breitmoser2015-01-151-12/+12
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | work on dns resource, working (dummy) verificationVincent Breitmoser2015-01-141-0/+11
| | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-03 05:11:03 +0000