aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
Commit message (Collapse)AuthorAgeFilesLines
* remove notiion of nonce/identifierVincent Breitmoser2015-03-1317-103/+38
|
* twitter layout step3 -> step2Vincent Breitmoser2015-03-121-1/+1
|
* 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-128-108/+214
|
* 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-107-13/+548
|\ | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java OpenKeychain/src/main/res/layout/view_key_fragment.xml
| * RippleDominik Schürmann2015-03-101-3/+1
| |
| * 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-102-9/+16
| | | | | | | | | | | | optimised imports
| | * added contact linkingAdithya Abraham Philip2015-03-102-9/+80
| | |
| | * added cardAdithya Abraham Philip2015-03-101-0/+18
| | |
| * | Merge pull request #1121 from adithyaphilip/rawcontact-deletionDominik Schürmann2015-03-101-3/+47
| |\ \ | | | | | | | | Fixed contact deletion Issue #1120
| | * | added CALLER_IS_SYNCADAPTER parameter to delete queriesAdithya Abraham Philip2015-03-101-3/+47
| | | |
| * | | 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-103-22/+116
| | |
* | | minor additions to CertListWidgetVincent Breitmoser2015-03-102-9/+18
| | |
* | | cleaner handling of verification stateVincent Breitmoser2015-03-101-46/+64
| | |
* | | Merge remote-tracking branch 'development' into linked-identitiesVincent Breitmoser2015-03-1024-432/+786
|\| |
| * | Show passphrase checkbox in create keyDominik Schürmann2015-03-091-0/+19
| | |
| * | Make create key wizard step-by-stepDominik Schürmann2015-03-095-35/+312
| |/
| * Some fixes for delete after encryptionDominik Schürmann2015-03-091-22/+27
| |
| * Fix ascii armor in encrypt activityDominik Schürmann2015-03-091-3/+2
| |
| * Fix compression check in activitiesDominik Schürmann2015-03-093-4/+3
| |
| * API: If signature key is known return pi to show keyDominik Schürmann2015-03-091-73/+72
| |
| * Fix colors for remote activityDominik Schürmann2015-03-091-1/+1
| |
| * Cleanup new widgetsDominik Schürmann2015-03-093-38/+41
| |
| * Merge pull request #1112 from chipset95/issue-1106-impDominik Schürmann2015-03-094-54/+53
| |\ | | | | | | Improved EmailEditText, Added NameEditText, Removed PasswordEditText #1106
| | * Implemented NameEditTextchipset952015-03-094-96/+10
| | |
| | * Improved EmailEditText, Added NameEditText, Removed PasswordEditText #1106chipset952015-03-093-101/+85
| | |
| * | Redesign of encrypt activites finishedDominik Schürmann2015-03-097-57/+123
| | |
| * | Removed unused PasswordEditTextDominik Schürmann2015-03-091-101/+0
| | |
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-098-81/+228
| |\| | | | | | | | | | development
| | * Merge pull request #1111 from adithyaphilip/passphrase-strength-indicatorDominik Schürmann2015-03-094-64/+131
| | |\ | | | | | | | | Passphrase strength indicator
| | | * minor code style correctionAdithya Abraham Philip2015-03-073-2/+10
| | | |
| | | * removed created by commentAdithya Abraham Philip2015-03-061-3/+0
| | | |
| | | * cleaned up codeAdithya Abraham Philip2015-03-062-52/+37
| | | |
| | | * changed default colors for PasswordStrengthViewAdithya Abraham Philip2015-03-061-3/+5
| | | |
| | | * added PassphraseEditText to SetPassphraseDialogFragmentAdithya Abraham Philip2015-03-062-5/+5
| | | |
| | | * added PassphraseEditTextAdithya Abraham Philip2015-03-062-14/+89
| | | |
| * | | Remove dublicate email checkDominik Schürmann2015-03-061-3/+1
| | | |
| * | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-061-38/+74
| |\ \ \ | | | |/ | | |/| | | | | development
| * | | Improve way of getting possible names by filtering out emailsDominik Schürmann2015-03-061-1/+25
| | | |
| * | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-065-84/+216
| |\ \ \ | | | | | | | | | | | | | | | development
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 15:29:39 +0000