| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | enc-export: use BackupActivity for backup from ViewKeyActivity | Vincent Breitmoser | 2015-09-30 | 1 | -1/+1 |
| | | |||||
| * | Remove save support for Android < 4.4 (OKC-01-014) | Dominik Schürmann | 2015-09-24 | 1 | -10/+5 |
| | | |||||
| * | Confirm design | Dominik Schürmann | 2015-09-24 | 1 | -1/+1 |
| | | |||||
| * | white share icon in log display activity | Vincent Breitmoser | 2015-09-17 | 1 | -1/+1 |
| | | |||||
| * | multidecrypt: black share icon in bottom sheet | Vincent Breitmoser | 2015-09-17 | 1 | -1/+1 |
| | | |||||
| * | multidecrypt: use bottom sheet for longclick options | Vincent Breitmoser | 2015-09-16 | 1 | -0/+19 |
| | | |||||
| * | multidecrypt: context menu per card, not per file | Vincent Breitmoser | 2015-09-16 | 1 | -12/+0 |
| | | |||||
| * | add share item to decrypt file list (#1524) | Vincent Breitmoser | 2015-09-11 | 1 | -0/+6 |
| | | |||||
| * | share rather than save log files (OKC-01-015) | Vincent Breitmoser | 2015-09-11 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'linked-identities' (and fix OperationHelper ids) | Vincent Breitmoser | 2015-08-29 | 2 | -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-identities | Vincent Breitmoser | 2015-04-26 | 1 | -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 ui | Vincent Breitmoser | 2015-04-24 | 1 | -0/+17 |
| | | | | |||||
| | * | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-24 | 2 | -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-identities | Vincent Breitmoser | 2015-04-09 | 1 | -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-identities | Vincent Breitmoser | 2015-03-24 | 3 | -5/+29 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| | * \ \ \ \ | Merge remote-tracking branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-10 | 2 | -2/+30 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-08 | 2 | -0/+10 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| | * \ \ \ \ \ \ | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-05 | 2 | -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 menu | Vincent Breitmoser | 2015-03-02 | 1 | -0/+5 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Experimental word comparison | Dominik Schürmann | 2015-08-27 | 1 | -0/+6 |
| | | | | | | | | | | |||||
| * | | | | | | | | | keylist: show delete as icon in multi-select | Vincent Breitmoser | 2015-07-08 | 1 | -3/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | cleanup KeyListFragment, remove export all keys | Vincent Breitmoser | 2015-07-08 | 1 | -5/+0 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Rudimentary backup feature | Dominik Schürmann | 2015-07-08 | 1 | -16/+4 |
| | | | | | | | | | | |||||
| * | | | | | | | | | reworked keyserver preferences with recyclerview | Adithya Abraham Philip | 2015-07-02 | 1 | -0/+10 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Create key wizard for blank YubiKey | Dominik Schürmann | 2015-06-29 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | implement deletion of files | Vincent Breitmoser | 2015-06-23 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | order menu items for encrypt operations | Vincent Breitmoser | 2015-06-22 | 3 | -6/+18 |
| | | | | | | | | | | |||||
| * | | | | | | | | | allow encrypting to clipboard in EncryptFileFragment | Vincent Breitmoser | 2015-06-20 | 1 | -0/+5 |
| | | | | | | | | | | |||||
| * | | | | | | | | | multi-decrypt: working context menu | Vincent Breitmoser | 2015-06-03 | 1 | -0/+22 |
| | | | | | | | | | | |||||
| * | | | | | | | | | correctly preserve state in EncryptFilesFragment | Vincent Breitmoser | 2015-05-27 | 1 | -2/+0 |
| | | | | | | | | | | |||||
| * | | | | | | | | | move synchronous encryption into activity, and preserve checkbox state | Vincent Breitmoser | 2015-05-27 | 3 | -10/+9 |
| | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | | Put decrypt result in toolbar, some ui fixes for decrypt | Dominik Schürmann | 2015-04-26 | 1 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | revamp decrypt ui | Vincent Breitmoser | 2015-04-24 | 1 | -0/+17 |
| | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | | Fixing crashes with new encrypt ui | Dominik Schürmann | 2015-03-29 | 2 | -0/+0 |
| | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | | introduced multi-threading | Adithya Abraham Philip | 2015-03-23 | 1 | -0/+5 |
| | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactored oldKeys to updatedKeys added update all keys, ThreadPoolExecutor used modified CachedThreadPoolExecutor | ||||
| * | | | | | Manage my keys wizard | Dominik Schürmann | 2015-03-19 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Disable hidden recipients for now | Dominik Schürmann | 2015-03-16 | 2 | -10/+10 |
| | | | | | | |||||
| * | | | | | Allow for hidden recipients in encrypt methods | Dominik Schürmann | 2015-03-16 | 2 | -2/+15 |
| | | | | | | |||||
| * | | | | | Allow encrypt of filenames via overflow menu | Dominik Schürmann | 2015-03-16 | 2 | -4/+15 |
| | |_|_|/ |/| | | | |||||
| * | | | | Tryout design for encrypt, decrypt | Dominik Schürmann | 2015-03-06 | 2 | -2/+30 |
| | |_|/ |/| | | |||||
| * | | | Remove advanced preferences, move compression as menu item in encrypt ↵ | Dominik Schürmann | 2015-03-05 | 2 | -0/+10 |
| | |/ |/| | | | | | activites, select hash and encryption algo based on hardcoded preferred lists | ||||
| * | | Use material save icon | Dominik Schürmann | 2015-03-04 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ↵ | Dominik Schürmann | 2015-03-04 | 1 | -0/+11 |
| |\ \ | | | | | | | | | | | | | | | | | | | into adithyaphilip-development Conflicts: OpenKeychain/src/main/res/values/strings.xml | ||||
| | * | | merged dialog | Adithya Abraham Philip | 2015-02-26 | 5 | -21/+36 |
| | |\| | |||||
| | * | | initial Log Display function | Adithya Abraham Philip | 2015-02-26 | 1 | -0/+11 |
| | | | | |||||
| * | | | change icon name in layout files | jiangkai | 2015-03-03 | 1 | -1/+1 |
| | |/ |/| | |||||
| * | | Fingerprint verification, design fixes for qr code card | Dominik Schürmann | 2015-02-26 | 1 | -0/+6 |
| | | | |||||
| * | | Dont show verification icons in my key view, hide edit button for non-secret ↵ | Dominik Schürmann | 2015-02-25 | 1 | -0/+7 |
| | | | | | | | | | keys | ||||
| * | | First work on new key view toolbar | Dominik Schürmann | 2015-02-25 | 1 | -0/+11 |
| | | | |||||
| * | | Fix QR Code, design experiments for key view | Dominik Schürmann | 2015-02-24 | 1 | -1/+6 |
| | | | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |