| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | small changes for performance | Vincent Breitmoser | 2015-04-27 | 1 | -3/+4 | |
| | | | | | ||||||
| | | * | | Merge remote-tracking branch 'origin/development' into linked-identities | Vincent Breitmoser | 2015-04-26 | 3 | -140/+0 | |
| | | |\ \ | ||||||
| | | * \ \ | Merge remote-tracking branch 'origin/development' into linked-identities | Vincent Breitmoser | 2015-04-26 | 25 | -43/+273 | |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| | | * | | | | update uris and cookie patterns, plus some stylings | Vincent Breitmoser | 2015-04-25 | 4 | -16/+12 | |
| | | | | | | | ||||||
| | | * | | | | change HttpsEditText to generic PrefixEditText | Vincent Breitmoser | 2015-04-25 | 3 | -4/+14 | |
| | | | | | | | ||||||
| | | * | | | | fix encrypt activity layout | Vincent Breitmoser | 2015-04-24 | 1 | -1/+3 | |
| | | | | | | | ||||||
| | | * | | | | revamp decrypt ui | Vincent Breitmoser | 2015-04-24 | 4 | -81/+44 | |
| | | | | | | | ||||||
| | | * | | | | use CryptoOperationFragment for linked id fragments, and some warning cleanup | Vincent Breitmoser | 2015-04-24 | 2 | -4/+8 | |
| | | | | | | | ||||||
| | | * | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-24 | 135 | -1276/+2044 | |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| | | * | | | | | minor ui and wording changes | Vincent Breitmoser | 2015-04-09 | 2 | -8/+20 | |
| | | | | | | | | ||||||
| | | * | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-09 | 191 | -7866/+9359 | |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -13/+23 | |
| | | | | | | | | | ||||||
| | | * | | | | | | even more linked id ui work | Vincent Breitmoser | 2015-03-29 | 3 | -6/+9 | |
| | | | | | | | | | ||||||
| | | * | | | | | | more (subtle) ui work | Vincent Breitmoser | 2015-03-26 | 2 | -30/+27 | |
| | | | | | | | | | ||||||
| | | * | | | | | | more linked id ui fine tuning | Vincent Breitmoser | 2015-03-26 | 16 | -0/+0 | |
| | | | | | | | | | ||||||
| | | * | | | | | | some linked id ui fine tuning | Vincent Breitmoser | 2015-03-26 | 34 | -126/+115 | |
| | | | | | | | | | ||||||
| | | * | | | | | | secret/public distinction in LinkedIdView | Vincent Breitmoser | 2015-03-24 | 1 | -0/+9 | |
| | | | | | | | | | ||||||
| | | * | | | | | | work on cookie scanning during creation | Vincent Breitmoser | 2015-03-24 | 1 | -0/+7 | |
| | | | | | | | | | ||||||
| | | * | | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-24 | 34 | -176/+222 | |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | |||||
| | | * | | | | | | | support github resource (re) | Vincent Breitmoser | 2015-03-24 | 4 | -1/+331 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | support github resource (pa) | Vincent Breitmoser | 2015-03-24 | 2 | -0/+3 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | work on certification ui | Vincent Breitmoser | 2015-03-15 | 14 | -33/+71 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-15 | 101 | -1504/+1475 | |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | |||||
| | | * | | | | | | | | work on second step of identity creation | Vincent Breitmoser | 2015-03-13 | 5 | -204/+161 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | use ViewAnimator for progress, streamline text on first step | Vincent Breitmoser | 2015-03-13 | 8 | -85/+102 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | remove notiion of nonce/identifier | Vincent Breitmoser | 2015-03-13 | 1 | -2/+0 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | change finish button label to "link identity" | Vincent Breitmoser | 2015-03-13 | 4 | -3/+4 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | fix linked wizard buttons | Vincent Breitmoser | 2015-03-12 | 6 | -27/+48 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | twitter layout step3 -> step2 | Vincent Breitmoser | 2015-03-12 | 2 | -221/+77 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | finish implementing twitter resource | Vincent Breitmoser | 2015-03-12 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | better state management in LinkedIdView, move confirm progress into card | Vincent Breitmoser | 2015-03-10 | 1 | -21/+27 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | Merge remote-tracking branch 'origin/development' into linked-identities | Vincent Breitmoser | 2015-03-10 | 40 | -64/+200 | |
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java OpenKeychain/src/main/res/layout/view_key_fragment.xml | |||||
| | | * | | | | | | | | | add expand item to linked id list | Vincent Breitmoser | 2015-03-10 | 3 | -1/+36 | |
| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | cleaner handling of verification state | Vincent Breitmoser | 2015-03-10 | 1 | -1/+2 | |
| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | Merge remote-tracking branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-10 | 82 | -474/+507 | |
| | | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | rearrange linked id layouts, add CertListWidget | Vincent Breitmoser | 2015-03-09 | 2 | -11/+102 | |
| | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | add linked id certs uri to KeychainProvider | Vincent Breitmoser | 2015-03-09 | 1 | -52/+0 | |
| | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | use loader in LinkedIdViewFragment | Vincent Breitmoser | 2015-03-09 | 1 | -0/+8 | |
| | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | successfully certify linked ids | Vincent Breitmoser | 2015-03-08 | 1 | -0/+1 | |
| | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-08 | 20 | -75/+110 | |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | |||||
| | | * | | | | | | | | | | | work on certification step | Vincent Breitmoser | 2015-03-08 | 1 | -1/+10 | |
| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | first steps in ui towards confirmation of linked ids | Vincent Breitmoser | 2015-03-06 | 4 | -6/+100 | |
| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | work on LinkedIdViewFragment | Vincent Breitmoser | 2015-03-05 | 3 | -80/+8 | |
| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | make linked identity list homogeneous | Vincent Breitmoser | 2015-03-05 | 2 | -6/+6 | |
| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-05 | 486 | -950/+370 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | |||||
| | | * | | | | | | | | | | | | do a TON of UI work | Vincent Breitmoser | 2015-03-05 | 5 | -0/+216 | |
| | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | work more on separation of linked identities and resources, initial ui work | Vincent Breitmoser | 2015-03-04 | 2 | -1/+30 | |
| | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | add linked it to view key context menu | Vincent Breitmoser | 2015-03-02 | 2 | -1/+7 | |
| | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-02 | 4 | -9/+22 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java | |||||
| | | * | | | | | | | | | | | | | some fixes for compiling (still not working!) | Vincent Breitmoser | 2015-03-02 | 3 | -3/+3 | |
| | | | | | | | | | | | | | | | | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |