aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Collapse)AuthorAgeFilesLines
* work on certification uiVincent Breitmoser2015-03-152-12/+20
|
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-1529-143/+316
|\ | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * Remove display of key id in other listsDominik Schürmann2015-03-153-18/+65
| |
| * Show main user id instead of key in certify screenDominik Schürmann2015-03-151-10/+15
| |
| * Fixes for selection of certify keyDominik Schürmann2015-03-152-10/+21
| |
| * Merge pull request #1142 from tdjogi010/developmentDominik Schürmann2015-03-151-4/+10
| |\ | | | | | | Preselected Suitable Key
| | * Preselected Suitable Keytdjogi010@gmail.com2015-03-131-4/+10
| | |
| * | Merge pull request #1147 from Hiperzone/developmentDominik Schürmann2015-03-151-1/+3
| |\ \ | | | | | | | | -fixed out of bounds crash when retrieving the main profile name with se...
| | * | -fixed out of bounds crash when retrieving the main profile name with secret ↵Daniel Ramos2015-03-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | keys -fixed a possible crash when retrieving the main profile contactid
| * | | Dont display key ids in KeySpinner, display creation date when user ids ↵Dominik Schürmann2015-03-153-14/+37
| | | | | | | | | | | | | | | | duplicate
| * | | Query for duplicate user idsDominik Schürmann2015-03-151-1/+4
| |/ /
| * | added some documentationAdithya Abraham Philip2015-03-131-4/+5
| | |
| * | added own profile support in linekd system contactAdithya Abraham Philip2015-03-131-7/+25
| | |
| * | Clarify logs in DeleteFileDialogDominik Schürmann2015-03-121-2/+2
| | |
| * | Use notify instead of Toast for NFC checkDominik Schürmann2015-03-121-2/+2
| | |
| * | Merge pull request #1133 from Rrego6/developmentDominik Schürmann2015-03-121-0/+6
| |\ \ | | | | | | | | Check if NFC is available on device
| | * | Check if NFC is available on deviceRaoul2015-03-101-0/+6
| | | |
| * | | Merge pull request #1117 from danielnelz/developmentDominik Schürmann2015-03-1215-24/+27
| |\ \ \ | | | | | | | | | | #1042: Replaced ints with enums
| | * | | Merge remote-tracking branch 'upstream/development' into developmentdanielnelz2015-03-094-29/+32
| | |\| |
| | * | | Created enum MessageStatus in KeychainIntentServiceHandler and enum IOTypedanielnelz2015-03-0915-24/+27
| | | | | | | | | | | | | | | | | | | | | | | | | in KeychainIntentService and replaced int constants with them. Fixed some typos.
| * | | | Improve file deletion stringsDominik Schürmann2015-03-121-3/+3
| | | | |
| * | | | Merge pull request #1137 from manojkhannakm/developmentDominik Schürmann2015-03-123-46/+104
| |\ \ \ \ | | | | | | | | | | | | Updated fix for Issue #1116
| | * | | | Updated fix for Issue #1116Manoj Khanna2015-03-113-46/+104
| | | |_|/ | | |/| |
| * / | | corrected linked system contact display nameAdithya Abraham Philip2015-03-111-11/+12
| |/ / /
* | | | show certificates for secret keys differentlyVincent Breitmoser2015-03-144-28/+46
| | | |
* | | | work on second step of identity creationVincent Breitmoser2015-03-133-23/+25
| | | |
* | | | 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-131-7/+4
| | | |
* | | | remove notiion of nonce/identifierVincent Breitmoser2015-03-137-30/+10
| | | |
* | | | twitter layout step3 -> step2Vincent Breitmoser2015-03-121-1/+1
| | | |
* | | | 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-125-46/+43
| | | |
* | | | better state management in LinkedIdView, move confirm progress into cardVincent Breitmoser2015-03-101-27/+50
| | | |
* | | | hack loadSystemContact back inVincent Breitmoser2015-03-102-5/+13
| | | |
* | | | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-03-106-7/+500
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java OpenKeychain/src/main/res/layout/view_key_fragment.xml
| * | | Merge branch 'contact-card' of ↵Dominik Schürmann2015-03-101-3/+70
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/adithyaphilip/open-keychain into adithyaphilip-contact-card Conflicts: Graphics/get-material-icons.sh OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyNameFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyPassphraseFragment.java OpenKeychain/src/main/res/layout/create_key_email_fragment.xml OpenKeychain/src/main/res/values/strings.xml
| | * | | Show passphrase checkbox in create keyDominik Schürmann2015-03-101-0/+19
| | | | |
| | * | | Make create key wizard step-by-stepDominik Schürmann2015-03-105-35/+312
| | | | |
| | * | | cleaned up code, added commentsAdithya Abraham Philip2015-03-101-9/+15
| | | | | | | | | | | | | | | | | | | | optimised imports
| | * | | added contact linkingAdithya Abraham Philip2015-03-101-9/+52
| | | | |
| | * | | added cardAdithya Abraham Philip2015-03-101-0/+18
| | | |/ | | |/|
| * | | Add additional email addresses in create keyDominik Schürmann2015-03-105-6/+433
| | | |
* | | | add expand item to linked id listVincent Breitmoser2015-03-102-4/+43
| | | |
* | | | filter out unknown linked idsVincent Breitmoser2015-03-102-22/+40
| | | |
* | | | minor additions to CertListWidgetVincent Breitmoser2015-03-102-9/+18
| | | |
* | | | cleaner handling of verification stateVincent Breitmoser2015-03-101-46/+64
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 21:32:38 +0000