aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Collapse)AuthorAgeFilesLines
...
* 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
|
* Use material overflow icon in decrypt listDominik Schürmann2015-09-179-3/+4
| | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java OpenKeychain/src/main/res/layout/decrypt_list_entry.xml
* white share icon in log display activityVincent Breitmoser2015-09-176-1/+1
|
* multidecrypt: black share icon in bottom sheetVincent Breitmoser2015-09-176-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
|
* multidecrypt: use bottom sheet for longclick optionsVincent Breitmoser2015-09-162-1/+22
|
* multidecrypt: context menu per card, not per fileVincent Breitmoser2015-09-163-22/+12
|
* Add text icon in decrypt listDominik Schürmann2015-09-165-0/+0
| | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
* multidecrypt: display all outputUris as individual itemsVincent Breitmoser2015-09-162-62/+66
|
* multidecrypt: prepare viewholder for file listVincent Breitmoser2015-09-161-51/+58
|
* mime: add logging to InputDataOperationVincent Breitmoser2015-09-151-0/+12
|
* Merge branch 'master' into mime4jVincent Breitmoser2015-09-14242-4270/+5584
|\ | | | | | | | | | | | | | | 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-112-1/+7
| |
| * share rather than save log files (OKC-01-015)Vincent Breitmoser2015-09-112-13/+4
| |
| * never import secret keys from keyserver (OKC-01-001)Vincent Breitmoser2015-09-118-8/+9
| |
| * 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-103-300/+0
| |
| * linked: localization for github creationVincent Breitmoser2015-09-102-20/+31
| |
| * linked: add "retry"Vincent Breitmoser2015-09-086-2/+13
| |
| * linked: fix button margins in select dialogVincent Breitmoser2015-09-081-3/+6
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-09-0611-9/+9
| |\
| | * Fixes open-keychain/open-keychain#1515Kaladin Light2015-09-0311-9/+9
| | | | | | | | | | | | Move launcher icons to mipmap
| * | linked: basic shared element transitionVincent Breitmoser2015-09-065-282/+5
| | |
| * | linked: use webview instead of app, and some minor layoutingsVincent Breitmoser2015-09-024-18/+26
| |/
| * linked: fix back button in github dialogVincent Breitmoser2015-09-012-1/+26
| |
| * linked: order selection dialog alphabeticallyVincent Breitmoser2015-09-011-25/+20
| |
| * linked: redesign github resource creation, implement ouath flowVincent Breitmoser2015-09-011-31/+31
| |
| * linked: use link icon from octo set? not sure yet..Vincent Breitmoser2015-09-016-1/+1
| |
| * linked: update icon design of github l-id creationVincent Breitmoser2015-09-0111-7/+27
| |
| * linked: work on github designVincent Breitmoser2015-09-011-45/+46
| |
| * linked: redesign github resource creation, implement ouath flow (WIP)Vincent Breitmoser2015-09-013-2/+174
| |
| * add simple StatusIndicator widgetVincent Breitmoser2015-09-011-0/+30
| |
| * 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-311-1/+3
| |
| * 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
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 13:15:18 +0000