aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | fix encrypt activity layoutVincent Breitmoser2015-04-242-3/+4
| | | | | | |
| * | | | | | revamp decrypt uiVincent Breitmoser2015-04-247-230/+391
| | | | | | |
| * | | | | | don't show key spinner for a single entryVincent Breitmoser2015-04-242-1/+10
| | | | | | |
| * | | | | | use CryptoOperationFragment for linked id fragments, and some warning cleanupVincent Breitmoser2015-04-246-80/+38
| | | | | | |
| * | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-24257-5089/+7145
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 changesVincent Breitmoser2015-04-092-8/+20
| | | | | | | |
| * | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-09236-8377/+10293
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 KeyAdapterVincent Breitmoser2015-03-307-406/+423
| | | | | | | | |
| * | | | | | | | even more linked id ui workVincent Breitmoser2015-03-298-34/+38
| | | | | | | | |
| * | | | | | | | more (subtle) ui workVincent Breitmoser2015-03-264-39/+65
| | | | | | | | |
| * | | | | | | | more linked id ui fine tuningVincent Breitmoser2015-03-2621-958/+10
| | | | | | | | |
| * | | | | | | | some linked id ui fine tuningVincent Breitmoser2015-03-2644-154/+1116
| | | | | | | | |
| * | | | | | | | secret/public distinction in LinkedIdViewVincent Breitmoser2015-03-247-25/+27
| | | | | | | | |
| * | | | | | | | work on cookie scanning during creationVincent Breitmoser2015-03-2412-153/+157
| | | | | | | | |
| * | | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-24136-1273/+1900
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * | | | | | | | | support github resource (ci)Vincent Breitmoser2015-03-243-3/+70
| | | | | | | | | |
| * | | | | | | | | support github resource (re)Vincent Breitmoser2015-03-248-1/+594
| | | | | | | | | |
| * | | | | | | | | support github resource (pa)Vincent Breitmoser2015-03-246-46/+224
| | | | | | | | | |
| * | | | | | | | | give short branch description in readmeVincent Breitmoser2015-03-161-0/+6
| | | | | | | | | |
| * | | | | | | | | work on certification uiVincent Breitmoser2015-03-1522-48/+197
| | | | | | | | | |
| * | | | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-15162-1977/+2884
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * | | | | | | | | | show certificates for secret keys differentlyVincent Breitmoser2015-03-144-28/+46
| | | | | | | | | | |
| * | | | | | | | | | work on second step of identity creationVincent Breitmoser2015-03-138-227/+186
| | | | | | | | | | |
| * | | | | | | | | | don't filter tweet intentVincent Breitmoser2015-03-131-31/+6
| | | | | | | | | | |
| * | | | | | | | | | improve error handling in LinkedIdViewFragment, disable unknown identity ↵Vincent Breitmoser2015-03-132-8/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | types (for now?)
| * | | | | | | | | | verification takes a second at leastVincent Breitmoser2015-03-131-1/+11
| | | | | | | | | | |
| * | | | | | | | | | use ViewAnimator for progress, streamline text on first stepVincent Breitmoser2015-03-139-92/+106
| | | | | | | | | | |
| * | | | | | | | | | remove notiion of nonce/identifierVincent Breitmoser2015-03-1318-105/+38
| | | | | | | | | | |
| * | | | | | | | | | change finish button label to "link identity"Vincent Breitmoser2015-03-134-3/+4
| | | | | | | | | | |
| * | | | | | | | | | fix linked wizard buttonsVincent Breitmoser2015-03-126-27/+48
| | | | | | | | | | |
| * | | | | | | | | | twitter layout step3 -> step2Vincent Breitmoser2015-03-123-222/+78
| | | | | | | | | | |
| * | | | | | | | | | regenerate twitter tokenVincent Breitmoser2015-03-121-4/+16
| | | | | | | | | | |
| * | | | | | | | | | small fix for CreateFinalFragmentVincent Breitmoser2015-03-122-5/+2
| | | | | | | | | | |
| * | | | | | | | | | twitter Step3 -> Step2Vincent Breitmoser2015-03-122-12/+5
| | | | | | | | | | |
| * | | | | | | | | | ditch custom text step for twitterVincent Breitmoser2015-03-123-174/+18
| | | | | | | | | | |
| * | | | | | | | | | finish implementing twitter resourceVincent Breitmoser2015-03-129-109/+215
| | | | | | | | | | |
| * | | | | | | | | | better state management in LinkedIdView, move confirm progress into cardVincent Breitmoser2015-03-102-48/+77
| | | | | | | | | | |
| * | | | | | | | | | hack loadSystemContact back inVincent Breitmoser2015-03-102-5/+13
| | | | | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-03-1048-77/+749
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 listVincent Breitmoser2015-03-105-5/+79
| | | | | | | | | | | |
| * | | | | | | | | | | filter out unknown linked idsVincent Breitmoser2015-03-103-22/+116
| | | | | | | | | | | |
| * | | | | | | | | | | minor additions to CertListWidgetVincent Breitmoser2015-03-102-9/+18
| | | | | | | | | | | |
| * | | | | | | | | | | cleaner handling of verification stateVincent Breitmoser2015-03-102-47/+66
| | | | | | | | | | | |
| * | | | | | | | | | | Merge remote-tracking branch 'development' into linked-identitiesVincent Breitmoser2015-03-10179-908/+1492
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | concurrency and continuity fixes for verification backstack handlingVincent Breitmoser2015-03-101-14/+26
| | | | | | | | | | | | |
| * | | | | | | | | | | | support backstack for verificationVincent Breitmoser2015-03-091-12/+26
| | | | | | | | | | | | |
| * | | | | | | | | | | | rearrange linked id layouts, add CertListWidgetVincent Breitmoser2015-03-096-80/+295
| | | | | | | | | | | | |
| * | | | | | | | | | | | add linked id certs uri to KeychainProviderVincent Breitmoser2015-03-093-59/+15
| | | | | | | | | | | | |
| * | | | | | | | | | | | fix transition animationVincent Breitmoser2015-03-093-9/+41
| | | | | | | | | | | | |
| * | | | | | | | | | | | use loader in LinkedIdViewFragmentVincent Breitmoser2015-03-099-110/+275
| | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-20 14:59:50 +0000