aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Collapse)AuthorAgeFilesLines
* linked: ditch create dns fragment (for now)Vincent Breitmoser2015-09-103-300/+0
|
* linked: localization for github creationVincent Breitmoser2015-09-102-20/+31
|
* linked: add "retry"Vincent Breitmoser2015-09-086-2/+13
|
* linked: fix button margins in select dialogVincent Breitmoser2015-09-081-3/+6
|
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-09-0611-9/+9
|\
| * Fixes open-keychain/open-keychain#1515Kaladin Light2015-09-0311-9/+9
| | | | | | | | Move launcher icons to mipmap
* | linked: basic shared element transitionVincent Breitmoser2015-09-065-282/+5
| |
* | linked: use webview instead of app, and some minor layoutingsVincent Breitmoser2015-09-024-18/+26
|/
* linked: fix back button in github dialogVincent Breitmoser2015-09-012-1/+26
|
* linked: order selection dialog alphabeticallyVincent Breitmoser2015-09-011-25/+20
|
* linked: redesign github resource creation, implement ouath flowVincent Breitmoser2015-09-011-31/+31
|
* linked: use link icon from octo set? not sure yet..Vincent Breitmoser2015-09-016-1/+1
|
* linked: update icon design of github l-id creationVincent Breitmoser2015-09-0111-7/+27
|
* linked: work on github designVincent Breitmoser2015-09-011-45/+46
|
* linked: redesign github resource creation, implement ouath flow (WIP)Vincent Breitmoser2015-09-013-2/+174
|
* add simple StatusIndicator widgetVincent Breitmoser2015-09-011-0/+30
|
* linked: Github -> GitHub (fixes #1513)Vincent Breitmoser2015-08-311-9/+9
|
* linked: fix small typoVincent Breitmoser2015-08-311-1/+1
|
* linked: disable DNS resource (for now)Vincent Breitmoser2015-08-311-1/+3
|
* Show linked identity menu item and linked identities only when feature is ↵Dominik Schürmann2015-08-291-1/+1
| | | | enabled
* Reword experimental settingsDominik Schürmann2015-08-292-4/+7
|
* Merge remote-tracking branch 'origin/master'Vincent Breitmoser2015-08-291-2/+2
|\
| * Improve decrypt stringsDominik Schürmann2015-08-281-2/+2
| |
* | Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-2953-14/+1973
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1140-288/+404
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |
| * | linked-ids: rename "cookie" to "token"Vincent Breitmoser2015-05-091-6/+6
| | |
| * | small ui nicetiesVincent Breitmoser2015-04-272-6/+6
| | |
| * | display creation dates for ambiguous user idsVincent Breitmoser2015-04-272-3/+15
| | |
| * | add distinct status for messages signed by "your" keyVincent Breitmoser2015-04-271-0/+1
| | |
| * | 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-2625-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 stylingsVincent Breitmoser2015-04-254-16/+12
| | | | |
| * | | | change HttpsEditText to generic PrefixEditTextVincent Breitmoser2015-04-253-4/+14
| | | | |
| * | | | fix encrypt activity layoutVincent Breitmoser2015-04-241-1/+3
| | | | |
| * | | | revamp decrypt uiVincent Breitmoser2015-04-244-81/+44
| | | | |
| * | | | use CryptoOperationFragment for linked id fragments, and some warning cleanupVincent Breitmoser2015-04-242-4/+8
| | | | |
| * | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-24135-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 changesVincent Breitmoser2015-04-092-8/+20
| | | | | |
| * | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-09191-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 KeyAdapterVincent Breitmoser2015-03-303-13/+23
| | | | | | |
| * | | | | | even more linked id ui workVincent Breitmoser2015-03-293-6/+9
| | | | | | |
| * | | | | | more (subtle) ui workVincent Breitmoser2015-03-262-30/+27
| | | | | | |
| * | | | | | more linked id ui fine tuningVincent Breitmoser2015-03-2616-0/+0
| | | | | | |
| * | | | | | some linked id ui fine tuningVincent Breitmoser2015-03-2634-126/+115
| | | | | | |
| * | | | | | secret/public distinction in LinkedIdViewVincent Breitmoser2015-03-241-0/+9
| | | | | | |
| * | | | | | work on cookie scanning during creationVincent Breitmoser2015-03-241-0/+7
| | | | | | |
| * | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-2434-176/+222
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * | | | | | | support github resource (re)Vincent Breitmoser2015-03-244-1/+331
| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 04:30:46 +0000