aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/menu
Commit message (Collapse)AuthorAgeFilesLines
* white share icon in log display activityVincent Breitmoser2015-09-171-1/+1
|
* multidecrypt: black share icon in bottom sheetVincent Breitmoser2015-09-171-1/+1
|
* multidecrypt: use bottom sheet for longclick optionsVincent Breitmoser2015-09-161-0/+19
|
* multidecrypt: context menu per card, not per fileVincent Breitmoser2015-09-161-12/+0
|
* add share item to decrypt file list (#1524)Vincent Breitmoser2015-09-111-0/+6
|
* share rather than save log files (OKC-01-015)Vincent Breitmoser2015-09-111-2/+2
|
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-292-2/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-261-3/+3
| |\ | | | | | | | | | | | | | | | | | | 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
| * | revamp decrypt uiVincent Breitmoser2015-04-241-0/+17
| | |
| * | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-242-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-091-0/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * \ \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-243-5/+29
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * \ \ \ \ Merge remote-tracking branch 'development' into linked-identitiesVincent Breitmoser2015-03-102-2/+30
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-082-0/+10
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * \ \ \ \ \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-052-1/+12
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * | | | | | | | add linked it to view key context menuVincent Breitmoser2015-03-021-0/+5
| | | | | | | | |
* | | | | | | | | Experimental word comparisonDominik Schürmann2015-08-271-0/+6
| | | | | | | | |
* | | | | | | | | keylist: show delete as icon in multi-selectVincent Breitmoser2015-07-081-3/+2
| | | | | | | | |
* | | | | | | | | cleanup KeyListFragment, remove export all keysVincent Breitmoser2015-07-081-5/+0
| | | | | | | | |
* | | | | | | | | Rudimentary backup featureDominik Schürmann2015-07-081-16/+4
| | | | | | | | |
* | | | | | | | | reworked keyserver preferences with recyclerviewAdithya Abraham Philip2015-07-021-0/+10
| | | | | | | | |
* | | | | | | | | Create key wizard for blank YubiKeyDominik Schürmann2015-06-291-1/+1
| | | | | | | | |
* | | | | | | | | implement deletion of filesVincent Breitmoser2015-06-231-1/+1
| | | | | | | | |
* | | | | | | | | order menu items for encrypt operationsVincent Breitmoser2015-06-223-6/+18
| | | | | | | | |
* | | | | | | | | allow encrypting to clipboard in EncryptFileFragmentVincent Breitmoser2015-06-201-0/+5
| | | | | | | | |
* | | | | | | | | multi-decrypt: working context menuVincent Breitmoser2015-06-031-0/+22
| | | | | | | | |
* | | | | | | | | correctly preserve state in EncryptFilesFragmentVincent Breitmoser2015-05-271-2/+0
| | | | | | | | |
* | | | | | | | | move synchronous encryption into activity, and preserve checkbox stateVincent Breitmoser2015-05-273-10/+9
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Put decrypt result in toolbar, some ui fixes for decryptDominik Schürmann2015-04-261-2/+2
| | | | | | | |
* | | | | | | | revamp decrypt uiVincent Breitmoser2015-04-241-0/+17
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Fixing crashes with new encrypt uiDominik Schürmann2015-03-292-0/+0
| |_|_|_|_|/ |/| | | | |
* | | | | | introduced multi-threadingAdithya Abraham Philip2015-03-231-0/+5
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactored oldKeys to updatedKeys added update all keys, ThreadPoolExecutor used modified CachedThreadPoolExecutor
* | | | | Manage my keys wizardDominik Schürmann2015-03-191-1/+1
| | | | |
* | | | | Disable hidden recipients for nowDominik Schürmann2015-03-162-10/+10
| | | | |
* | | | | Allow for hidden recipients in encrypt methodsDominik Schürmann2015-03-162-2/+15
| | | | |
* | | | | Allow encrypt of filenames via overflow menuDominik Schürmann2015-03-162-4/+15
| |_|_|/ |/| | |
* | | | Tryout design for encrypt, decryptDominik Schürmann2015-03-062-2/+30
| |_|/ |/| |
* | | Remove advanced preferences, move compression as menu item in encrypt ↵Dominik Schürmann2015-03-052-0/+10
| |/ |/| | | | | activites, select hash and encryption algo based on hardcoded preferred lists
* | Use material save iconDominik Schürmann2015-03-041-1/+1
| |
* | Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ↵Dominik Schürmann2015-03-041-0/+11
|\ \ | | | | | | | | | | | | | | | | | | into adithyaphilip-development Conflicts: OpenKeychain/src/main/res/values/strings.xml
| * | merged dialogAdithya Abraham Philip2015-02-265-21/+36
| |\|
| * | initial Log Display functionAdithya Abraham Philip2015-02-261-0/+11
| | |
* | | change icon name in layout filesjiangkai2015-03-031-1/+1
| |/ |/|
* | Fingerprint verification, design fixes for qr code cardDominik Schürmann2015-02-261-0/+6
| |
* | Dont show verification icons in my key view, hide edit button for non-secret ↵Dominik Schürmann2015-02-251-0/+7
| | | | | | | | keys
* | First work on new key view toolbarDominik Schürmann2015-02-251-0/+11
| |
* | Fix QR Code, design experiments for key viewDominik Schürmann2015-02-241-1/+6
| |
* | Uncluttering App Settings: Move advanced info in dialogDominik Schürmann2015-02-231-0/+5
| |
* | Fix multi select and more colorsDominik Schürmann2015-02-221-4/+1
| |
* | Floating action button icons and methods for key listDominik Schürmann2015-02-211-16/+0
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 20:02:00 +0000