aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-2916-8/+1779
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-identitiesVincent Breitmoser2015-05-117-111/+205
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | linked-ids: small compatibility changesVincent Breitmoser2015-05-111-0/+1
| | |
| * | small ui nicetiesVincent Breitmoser2015-04-271-1/+1
| | |
| * | display creation dates for ambiguous user idsVincent Breitmoser2015-04-271-2/+14
| | |
| * | small changes for performanceVincent Breitmoser2015-04-271-3/+4
| | |
| * | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-263-140/+0
| |\ \
| * \ \ Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-269-19/+220
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 stylingsVincent Breitmoser2015-04-253-10/+5
| | | | |
| * | | | change HttpsEditText to generic PrefixEditTextVincent Breitmoser2015-04-252-4/+10
| | | | |
| * | | | fix encrypt activity layoutVincent Breitmoser2015-04-241-1/+3
| | | | |
| * | | | revamp decrypt uiVincent Breitmoser2015-04-242-74/+19
| | | | |
| * | | | use CryptoOperationFragment for linked id fragments, and some warning cleanupVincent Breitmoser2015-04-241-4/+7
| | | | |
| * | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-2412-99/+406
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-091-4/+16
| | | | | |
| * | | | | rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-303-13/+23
| | | | | |
| * | | | | even more linked id ui workVincent Breitmoser2015-03-292-6/+8
| | | | | |
| * | | | | more (subtle) ui workVincent Breitmoser2015-03-261-22/+19
| | | | | |
| * | | | | some linked id ui fine tuningVincent Breitmoser2015-03-269-125/+70
| | | | | |
| * | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-246-147/+165
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * | | | | | support github resource (re)Vincent Breitmoser2015-03-243-0/+321
| | | | | | |
| * | | | | | work on certification uiVincent Breitmoser2015-03-152-27/+39
| | | | | | |
| * | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-154-78/+73
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 creationVincent Breitmoser2015-03-134-190/+146
| | | | | | | |
| * | | | | | | use ViewAnimator for progress, streamline text on first stepVincent Breitmoser2015-03-137-65/+84
| | | | | | | |
| * | | | | | | change finish button label to "link identity"Vincent Breitmoser2015-03-133-3/+3
| | | | | | | |
| * | | | | | | fix linked wizard buttonsVincent Breitmoser2015-03-126-27/+48
| | | | | | | |
| * | | | | | | twitter layout step3 -> step2Vincent Breitmoser2015-03-122-221/+77
| | | | | | | |
| * | | | | | | finish implementing twitter resourceVincent Breitmoser2015-03-121-1/+1
| | | | | | | |
| * | | | | | | better state management in LinkedIdView, move confirm progress into cardVincent Breitmoser2015-03-101-21/+27
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-03-1033-59/+193
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-101-1/+21
| | | | | | | | |
| * | | | | | | | cleaner handling of verification stateVincent Breitmoser2015-03-101-1/+2
| | | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'development' into linked-identitiesVincent Breitmoser2015-03-1025-446/+446
| |\ \ \ \ \ \ \ \
| * | | | | | | | | rearrange linked id layouts, add CertListWidgetVincent Breitmoser2015-03-092-11/+102
| | | | | | | | | |
| * | | | | | | | | add linked id certs uri to KeychainProviderVincent Breitmoser2015-03-091-52/+0
| | | | | | | | | |
| * | | | | | | | | use loader in LinkedIdViewFragmentVincent Breitmoser2015-03-091-0/+8
| | | | | | | | | |
| * | | | | | | | | successfully certify linked idsVincent Breitmoser2015-03-081-0/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-084-21/+55
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * | | | | | | | | | work on certification stepVincent Breitmoser2015-03-081-1/+10
| | | | | | | | | | |
| * | | | | | | | | | first steps in ui towards confirmation of linked idsVincent Breitmoser2015-03-062-6/+86
| | | | | | | | | | |
| * | | | | | | | | | work on LinkedIdViewFragmentVincent Breitmoser2015-03-053-80/+8
| | | | | | | | | | |
| * | | | | | | | | | make linked identity list homogeneousVincent Breitmoser2015-03-052-6/+6
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-0553-178/+276
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 workVincent Breitmoser2015-03-054-0/+212
| | | | | | | | | | | |
| * | | | | | | | | | | work more on separation of linked identities and resources, initial ui workVincent Breitmoser2015-03-041-1/+29
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-022-7/+19
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
| * | | | | | | | | | | | some fixes for compiling (still not working!)Vincent Breitmoser2015-03-023-3/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-0287-1517/+2232
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.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/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java OpenKeychain/src/main/res/layout/view_key_main_fragment.xml OpenKeychain/src/main/res/values/strings.xml extern/spongycastle
| * | | | | | | | | | | | | linked id ui work dns/twitterVincent Breitmoser2015-01-161-4/+2
| | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 18:03:22 +0000