aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values/strings.xml
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into encrypted-exportVincent Breitmoser2015-09-281-11/+17
|\
| * Dont import more than 100 User IDs (OKC-01-002)Dominik Schürmann2015-09-251-0/+1
| |
| * Remove save support for Android < 4.4 (OKC-01-014)Dominik Schürmann2015-09-241-0/+1
| |
| * Fix genitiv in stringsDominik Schürmann2015-09-241-2/+2
| |
| * Confirm designDominik Schürmann2015-09-241-3/+5
| |
| * phrase confirmationDominik Schürmann2015-09-241-5/+5
| |
| * Keyservers: Dont follow redirects, pin pgp.mit.edu, check for pinned cert on ↵Dominik Schürmann2015-09-201-4/+6
| | | | | | | | add (OKC-01-018)
| * fix fallback for non-mime dataVincent Breitmoser2015-09-191-1/+1
| |
* | export: more cleanup and splitting into subroutinesVincent Breitmoser2015-09-261-5/+0
| |
* | encrypted export WIPVincent Breitmoser2015-09-191-0/+1
|/
* mime: skip trailing unsigned parts, and ignore nested signed dataVincent Breitmoser2015-09-171-0/+1
|
* mime: support for signed-then-encrypted formatVincent Breitmoser2015-09-171-0/+6
|
* multidcrypt: display k9 download only after decryption failureVincent Breitmoser2015-09-171-1/+1
|
* Merge branch 'mime4j' of github.com:open-keychain/open-keychain into mime4jVincent Breitmoser2015-09-171-1/+2
|\
| * Add K-9 Mail warning toastDominik Schürmann2015-09-171-1/+2
| |
* | multidecrypt: use chooser intent on click for everything but text/plain ↵Vincent Breitmoser2015-09-171-0/+1
|/ | | | ACTION_SHOW
* fail with warning if we get data from the AOSP mail client (see #290)Vincent Breitmoser2015-09-161-0/+1
|
* mime: add failure case if openpgp processing fails!Vincent Breitmoser2015-09-161-0/+1
|
* mime: add logging messagesVincent Breitmoser2015-09-161-13/+13
|
* mime: handle non-mime data, just pass it throughVincent Breitmoser2015-09-161-0/+1
|
* mime: add logging to InputDataOperationVincent Breitmoser2015-09-151-0/+12
|
* Merge branch 'master' into mime4jVincent Breitmoser2015-09-141-57/+178
|\ | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java OpenKeychain/src/main/res/values/strings.xml
| * add share item to decrypt file list (#1524)Vincent Breitmoser2015-09-111-1/+1
| |
| * share rather than save log files (OKC-01-015)Vincent Breitmoser2015-09-111-11/+2
| |
| * never import secret keys from keyserver (OKC-01-001)Vincent Breitmoser2015-09-111-1/+2
| |
| * perform fingerprint check after canonicalization (OKC-01-009)Vincent Breitmoser2015-09-111-2/+2
| |
| * add support for signed-only data in the backend (#1507)Vincent Breitmoser2015-09-101-0/+1
| |
| * linked: ditch create dns fragment (for now)Vincent Breitmoser2015-09-101-10/+0
| |
| * linked: localization for github creationVincent Breitmoser2015-09-101-14/+25
| |
| * 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-291-4/+110
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-111-7/+12
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-261-0/+16
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | |
| | * | | 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
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-11 23:51:44 +0000