| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | keylist: filter results by all user ids for search (fixes #1645) | Vincent Breitmoser | 2015-12-29 | 1 | -19/+6 |
| | | |||||
| * | added Facebook links support, reworked Preferences | Adithya Abraham Philip | 2015-12-06 | 1 | -7/+2 |
| | | |||||
| * | Revert "Add first time wizard for sync settings" | Dominik Schürmann | 2015-11-23 | 1 | -1/+2 |
| | | | | | This reverts commit cd601988db41f7651f376ef419be3dd50aaa4e10. | ||||
| * | Add first time wizard for sync settings | Dominik Schürmann | 2015-11-23 | 1 | -2/+1 |
| | | |||||
| * | Merge pull request #1543 from rohands/issue_mouseover_hints | Vincent | 2015-11-16 | 1 | -0/+3 |
| |\ | | | | | mouseover hints | ||||
| | * | Class names and string names are updated | rohands | 2015-09-22 | 1 | -2/+2 |
| | | | |||||
| | * | Updated | rohands | 2015-09-20 | 1 | -1/+1 |
| | | | |||||
| | * | Mousehints | rohands | 2015-09-20 | 1 | -0/+3 |
| | | | |||||
| * | | some optimizations and indexes for the main key list query | Vincent Breitmoser | 2015-11-15 | 1 | -1/+1 |
| | | | |||||
| * | | bench: add benchmark operation for testing | Vincent Breitmoser | 2015-11-04 | 1 | -0/+44 |
| | | | |||||
| * | | keylist: add "search for query" button to empty view | Vincent Breitmoser | 2015-11-02 | 1 | -14/+51 |
| | | | |||||
| * | | import: make operation cancelable (again), make "update all" cancelable | Vincent Breitmoser | 2015-10-29 | 1 | -2/+2 |
| |/ | | | | (also, use unbounded blocking queue to fix update of more than 10 keys) | ||||
| * | 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 |
| | | | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |