aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | links own keys to me profile in contactsAdithya Abraham Philip2015-03-132-9/+119
| |/ /
| * | 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-1218-73/+108
| |\ \ \ | | | | | | | | | | #1042: Replaced ints with enums
| | * | | Fixed possible ArrayIndexOutOfBoundsException.danielnelz2015-03-112-2/+2
| | | | |
| | * | | Merge remote-tracking branch 'upstream/development' into developmentdanielnelz2015-03-096-48/+51
| | |\| |
| | * | | Added braces to if else.danielnelz2015-03-092-4/+6
| | | | |
| | * | | Created enum MessageStatus in KeychainIntentServiceHandler and enum IOTypedanielnelz2015-03-0918-73/+106
| | | | | | | | | | | | | | | | | | | | | | | | | in KeychainIntentService and replaced int constants with them. Fixed some typos.
| * | | | Improve file deletion stringsDominik Schürmann2015-03-122-6/+7
| | | | |
| * | | | Merge pull request #1137 from manojkhannakm/developmentDominik Schürmann2015-03-1223-100/+162
| |\ \ \ \ | | | | | | | | | | | | Updated fix for Issue #1116
| | * | | | Updated fix for Issue #1116Manoj Khanna2015-03-1123-100/+162
| | | | | |
| * | | | | Merge pull request #1134 from adithyaphilip/sync-confirmed-keysDominik Schürmann2015-03-123-14/+53
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | Sync only confirmed keys and change
| | * | | | added contact sync at end of CertifyOperationAdithya Abraham Philip2015-03-111-0/+4
| | | | | |
| | * | | | corrected linked system contact display nameAdithya Abraham Philip2015-03-112-14/+49
| | |/ / /
| * / / / change user_id primary key in database, use keyring rather than unified ↵Vincent Breitmoser2015-03-113-14/+26
| |/ / / | | | | | | | | | | | | query in consolidate
| * | | make constant for certify hash algoDominik Schürmann2015-03-112-11/+6
| | | |
| * | | Version 3.2beta2Dominik Schürmann2015-03-102-3/+4
| | | |
| * | | Pull from transifexDominik Schürmann2015-03-1071-1105/+1328
| | | |
| * | | Disable maybe methods in ImportKeysListEntry for nowDominik Schürmann2015-03-101-2/+3
| | | |
| * | | Fix expiry, revoked checks in OpenPgpSignatureResultBuilderDominik Schürmann2015-03-101-2/+2
| | | |
| * | | Changelog 3.2beta1Dominik Schürmann2015-03-101-0/+14
| | | |
| * | | Remove unused NFC Beam htmlDominik Schürmann2015-03-1024-268/+0
| | | |
| * | | API 7Dominik Schürmann2015-03-1012-280/+633
| | | |
* | | | 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-1047-77/+748
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java OpenKeychain/src/main/res/layout/view_key_fragment.xml
| * | | RippleDominik Schürmann2015-03-1024-44/+40
| | | |
| * | | Merge branch 'contact-card' of ↵Dominik Schürmann2015-03-103-8/+123
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-103-0/+27
| | | | |
| | * | | changed default drawable for linked system contactAdithya Abraham Philip2015-03-101-3/+3
| | | | |
| | * | | Make create key wizard step-by-stepDominik Schürmann2015-03-1040-151/+532
| | | | |
| | * | | cleaned up code, added commentsAdithya Abraham Philip2015-03-102-9/+16
| | | | | | | | | | | | | | | | | | | | optimised imports
| | * | | added contact linkingAdithya Abraham Philip2015-03-104-12/+102
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 13:09:18 +0000