| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'linked-identities' (and fix OperationHelper ids) | Vincent Breitmoser | 2015-08-29 | 1 | -1/+0 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-identities | Vincent Breitmoser | 2015-05-11 | 1 | -1/+0 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | fix "select all" in key list multi-select | Vincent Breitmoser | 2015-04-28 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge remote-tracking branch 'origin/development' into linked-identities | Vincent Breitmoser | 2015-04-26 | 1 | -10/+9 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * \ \ | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-09 | 1 | -17/+169 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| | * | | | | rewrite EncryptKeyCompletionView with generalized KeyAdapter | Vincent Breitmoser | 2015-03-30 | 1 | -178/+33 |
| | | | | | | |||||
| * | | | | | reworked keyserversyncadapterservice flow | Adithya Abraham Philip | 2015-08-20 | 1 | -23/+10 |
| | | | | | | |||||
| * | | | | | introduced keyserver sync adapter | Adithya Abraham Philip | 2015-08-20 | 1 | -6/+18 |
| | | | | | | |||||
| * | | | | | display dummy key for empty result, don't display during search | Vincent Breitmoser | 2015-08-14 | 1 | -2/+3 |
| | | | | | | |||||
| * | | | | | show dummy item if there are no secret keys | Vincent Breitmoser | 2015-08-14 | 1 | -2/+47 |
| | | | | | | |||||
| * | | | | | Make header text and tertiary text color themeable | Thialfihar | 2015-07-21 | 1 | -6/+2 |
| | | | | | | |||||
| * | | | | | Start moving colors into themes | Thialfihar | 2015-07-21 | 1 | -1/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using attrs instead of fixed colors it will be possible to style everything and also dynamically grab the color where needed in code. This is done with colorEmphasis as an initial test. Also remove several unused colors. | ||||
| * | | | | | fixed multi-deletion bug, moved logic into DeleteKeyDialogActivity | Adithya Abraham Philip | 2015-07-15 | 1 | -7/+0 |
| | | | | | | |||||
| * | | | | | added licenses, cleaned up code, fixed warnings | Adithya Abraham Philip | 2015-07-13 | 1 | -7/+2 |
| | | | | | | |||||
| * | | | | | use only one DeleteDialogActivity | Adithya Abraham Philip | 2015-07-13 | 1 | -1/+8 |
| | | | | | | |||||
| * | | | | | implemented revocation on deletion | Adithya Abraham Philip | 2015-07-13 | 1 | -34/+36 |
| | | | | | | |||||
| * | | | | | add pseudo-static id property to CryptoOperationHelper | Vincent Breitmoser | 2015-07-09 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | cleanup KeyListFragment, remove export all keys | Vincent Breitmoser | 2015-07-08 | 1 | -27/+14 |
| | | | | | | |||||
| * | | | | | Rudimentary backup feature | Dominik Schürmann | 2015-07-08 | 1 | -73/+0 |
| | | | | | | |||||
| * | | | | | Temporary fix for multi export | Dominik Schürmann | 2015-07-08 | 1 | -14/+19 |
| | | | | | | |||||
| * | | | | | reformatted code | Adithya Abraham Philip | 2015-07-03 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | added proxy support to OperationHelper | Adithya Abraham Philip | 2015-07-03 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Rename package back to orbot because these are orbot utils | Dominik Schürmann | 2015-07-03 | 1 | -3/+0 |
| | | | | | | |||||
| * | | | | | Cleanup tor code | Dominik Schürmann | 2015-07-03 | 1 | -5/+4 |
| | | | | | | |||||
| * | | | | | ensuring code style is preserved | Adithya Abraham Philip | 2015-07-03 | 1 | -10/+8 |
| | | | | | | |||||
| * | | | | | added proxy to all import operations using KeychainService | Adithya Abraham Philip | 2015-07-03 | 1 | -2/+3 |
| | | | | | | |||||
| * | | | | | changed to work with multi-decrypt | Adithya Abraham Philip | 2015-06-27 | 1 | -0/+10 |
| | | | | | | |||||
| * | | | | | removed debug logs, added licenses | Adithya Abraham Philip | 2015-06-27 | 1 | -2/+3 |
| | | | | | | |||||
| * | | | | | migrated consolidation | Adithya Abraham Philip | 2015-06-27 | 1 | -41/+30 |
| | | | | | | |||||
| * | | | | | migrated import to KeychainNewService | Adithya Abraham Philip | 2015-06-27 | 1 | -48/+38 |
| | | | | | | |||||
| * | | | | | fix rest of resource leaks (#1351) | Vincent Breitmoser | 2015-06-17 | 1 | -8/+20 |
| | | | | | | |||||
| * | | | | | backport CryptoOperationFragment changes without eventbus | Vincent Breitmoser | 2015-06-10 | 1 | -13/+8 |
| | | | | | | |||||
| * | | | | | renamed KeychainIntentService to KeychainService | Adithya Abraham Philip | 2015-06-01 | 1 | -12/+12 |
| | | | | | | |||||
| * | | | | | merged services | Adithya Abraham Philip | 2015-06-01 | 1 | -11/+12 |
| | |_|_|/ |/| | | | |||||
| * | | | | fix "select all" in key list multi-select | Vincent Breitmoser | 2015-04-28 | 1 | -1/+1 |
| | |_|/ |/| | | |||||
| * | | | Format KeyListFragment | Dominik Schürmann | 2015-04-18 | 1 | -10/+9 |
| | |/ |/| | |||||
| * | | rewrite EncryptKeyCompletionView with generalized KeyAdapter | Vincent Breitmoser | 2015-03-30 | 1 | -177/+33 |
| | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java | ||||
| * | | Modify break as return. | iseki | 2015-03-26 | 1 | -1/+1 |
| | | | |||||
| * | | Add brackets for if-else constructs and externalize the procedure as ↵ | iseki | 2015-03-26 | 1 | -26/+33 |
| | | | | | | | | | showMultiExportDialog. | ||||
| * | | Add a loop for multiple key export. | iseki | 2015-03-25 | 1 | -13/+68 |
| | | | |||||
| * | | shifted multi-threading to own service | Adithya Abraham Philip | 2015-03-23 | 1 | -17/+17 |
| | | | | | | | | | | | | | added multi-threaded cloud import, restored KeychainIntentService eliminated code duplication in multi-threaded import | ||||
| * | | introduced multi-threading | Adithya Abraham Philip | 2015-03-23 | 1 | -0/+88 |
| |/ | | | | | | | | refactored oldKeys to updatedKeys added update all keys, ThreadPoolExecutor used modified CachedThreadPoolExecutor | ||||
| * | Reworked Notify class | Manoj Khanna | 2015-03-20 | 1 | -6/+6 |
| | | |||||
| * | - Added footer so that the Floating Action Button won't block the last few ↵ | Kent | 2015-03-20 | 1 | -2/+17 |
| | | | | | items' content | ||||
| * | Manage my keys wizard | Dominik Schürmann | 2015-03-19 | 1 | -1/+2 |
| | | |||||
| * | object oriented split user id | Dominik Schürmann | 2015-03-16 | 1 | -5/+5 |
| | | |||||
| * | Query for duplicate user ids | Dominik Schürmann | 2015-03-15 | 1 | -1/+4 |
| | | |||||
| * | Created enum MessageStatus in KeychainIntentServiceHandler and enum IOType | danielnelz | 2015-03-09 | 1 | -1/+1 |
| | | | | | | in KeychainIntentService and replaced int constants with them. Fixed some typos. | ||||
| * | Remove false comment in list fragment | Dominik Schürmann | 2015-03-05 | 1 | -3/+0 |
| | | |||||
| * | Merge pull request #1101 from danielnelz/development | Dominik Schürmann | 2015-03-04 | 1 | -4/+5 |
| |\ | | | | | #1042 replaced some int constants with enums | ||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |