aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* 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
| |
| * added cardAdithya Abraham Philip2015-03-103-5/+52
| |
* | 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-1015-7/+521
|/ /
* | Show passphrase checkbox in create keyDominik Schürmann2015-03-093-0/+27
| |
* | Make create key wizard step-by-stepDominik Schürmann2015-03-0940-151/+532
|/
* Some fixes for delete after encryptionDominik Schürmann2015-03-093-41/+46
|
* 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-093-14/+7
|
* Cleanup new widgetsDominik Schürmann2015-03-093-38/+41
|
* Merge pull request #1112 from chipset95/issue-1106-impDominik Schürmann2015-03-096-56/+55
|\ | | | | Improved EmailEditText, Added NameEditText, Removed PasswordEditText #1106
| * Implemented NameEditTextchipset952015-03-096-98/+12
| |
| * Improved EmailEditText, Added NameEditText, Removed PasswordEditText #1106chipset952015-03-093-101/+85
| |
* | Redesign of encrypt activites finishedDominik Schürmann2015-03-0916-172/+140
| |
* | Improve iconsDominik Schürmann2015-03-0916-7/+7
| |
* | Fix padding in create keyDominik Schürmann2015-03-091-0/+2
| |
* | Removed unused PasswordEditTextDominik Schürmann2015-03-091-101/+0
| |
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-0911-109/+242
|\| | | | | | | development
| * Merge pull request #1111 from adithyaphilip/passphrase-strength-indicatorDominik Schürmann2015-03-096-90/+140
| |\ | | | | | | Passphrase strength indicator
| | * minor xml code style correctionAdithya Abraham Philip2015-03-081-8/+8
| | |
| | * 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-063-52/+38
| | |
| | * changed default colors for PasswordStrengthViewAdithya Abraham Philip2015-03-062-8/+6
| | |
| | * added PassphraseEditText to SetPassphraseDialogFragmentAdithya Abraham Philip2015-03-063-6/+6
| | |
| | * added PassphraseEditTextAdithya Abraham Philip2015-03-063-31/+92
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 22:42:25 +0000