aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix crash with v3 key fingerprintsDominik Schürmann2015-05-101-1/+10
|
* CleanupDominik Schürmann2015-05-101-21/+0
|
* Reformat manifestDominik Schürmann2015-05-101-23/+23
|
* Add dontnote to proguardDominik Schürmann2015-05-101-1/+2
|
* Workaround for Samsung Android 4.2 bugDominik Schürmann2015-05-102-0/+33
|
* Use snackbar lib from maven repoDominik Schürmann2015-05-104-5/+2
|
* Fixes and clarifications to app signature (or better certificate) pinningDominik Schürmann2015-05-104-38/+50
|
* Add self-encrypt for old APIDominik Schürmann2015-05-101-0/+14
|
* Merge pull request #1270 from adithyaphilip/linked-contact-crashDominik Schürmann2015-05-093-1/+52
|\ | | | | Fixed sync on key import, crash for 'me' linked contact
| * fixed sync on key import, 'me' linked contact crashAdithya Abraham Philip2015-05-083-1/+52
|/
* Update contrib section in READMEDominik Schürmann2015-05-081-5/+9
|
* Version 3.2Dominik Schürmann2015-05-0624-25/+25
|
* Add screenshotsDominik Schürmann2015-05-068-2/+2
|
* Pull from transifexDominik Schürmann2015-05-0610-141/+163
|
* Update function graphicDominik Schürmann2015-05-062-584/+92
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-05-062-6/+18
|\ | | | | | | development
| * check for fingerprint of any subkey (arguable?)Vincent Breitmoser2015-05-062-6/+18
| |
* | Update openpgp-api libDominik Schürmann2015-05-061-0/+0
|/
* Fix import of keyring with pub+sec key with same key idDominik Schürmann2015-05-062-62/+80
|
* Rename for consistencyDominik Schürmann2015-05-062-5/+4
|
* Renaming for consisitencyDominik Schürmann2015-05-062-11/+10
|
* Move error overlay into generalized DecryptFragment, better error handling ↵Dominik Schürmann2015-05-065-117/+181
| | | | in DecryptTextActivity
* Remove reference to deleted API DemoDominik Schürmann2015-05-061-6/+0
|
* Switch to new library reposDominik Schürmann2015-05-0611-11/+12
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-05-053-9/+54
|\ | | | | | | development
| * Merge pull request #1235 from wfaulk/replacement_extraDominik Schürmann2015-05-043-9/+54
| |\ | | | | | | Fix Bluetooth share without breaking others
| | * revert unneeded changes for short key IDWilliam Faulk2015-05-041-27/+3
| | |
| | * revert unneeded changes for old temp Bluetooth share fileWilliam Faulk2015-05-041-13/+0
| | |
| | * use single file extensionWilliam Faulk2015-05-041-1/+1
| | |
| | * use TemporaryStorageProvider for Bluetooth ShareWilliam Faulk2015-05-042-32/+18
| | |
| | * Use FILE_EXTENSION constantsWilliam Faulk2015-05-041-1/+1
| | |
| | * Use primary user ID for filename instead of short key IDWilliam Faulk2015-05-041-2/+5
| | |
| | * Wrap EXTRA_REPLACEMENT_EXTRAS section so it only runs on Lollipop or greaterWilliam Faulk2015-05-041-42/+44
| | |
| | * Fix Bluetooth share without breaking othersWilliam Faulk2015-05-044-9/+100
| |/
* | Cleanup manifestDominik Schürmann2015-05-051-15/+16
| |
* | Fix nullpointer in file decryptionDominik Schürmann2015-05-051-1/+1
|/
* Fix revoked/expired state in decrypt activityDominik Schürmann2015-05-044-37/+27
|
* Fix cancel/skip in create key wizardDominik Schürmann2015-05-043-52/+35
|
* Display notify above keyboard in CreateKeyEmailFragmentDominik Schürmann2015-05-041-2/+2
|
* Fix email patternDominik Schürmann2015-05-041-1/+1
|
* Merge branch 'Hiperzone-development' into developmentDominik Schürmann2015-05-043-50/+94
|\
| * Use more simple email validation regexDominik Schürmann2015-05-041-7/+8
| |
| * Merge branch 'development' of https://github.com/Hiperzone/open-keychain ↵Dominik Schürmann2015-05-043-51/+94
|/| | | | | | | | | | | | | into Hiperzone-development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java
| * -removed unneeded inputType attribute from xml files (+1 squashed commits)Daniel Ramos2015-04-303-12/+10
| | | | | | | | | | | | Squashed commits: [ef54e68] -code style fixing
| * -Removed unneeded view references from the fragment class since they are not ↵Daniel Ramos2015-04-261-7/+3
| | | | | | | | | | | | used outside of createView. -cleanup
| * -removed unneeded code from previous commits. I tested on a KitKat(4.4.2) ↵Daniel Ramos2015-04-261-3/+0
| | | | | | | | and Lollipop (5.1) phone and everything seems to be preserved as expected.
| * Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Daniel Ramos2015-04-2643-462/+791
| |\ | | | | | | | | | into development
| * \ Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into ↵Daniel Ramos2015-04-245-44/+92
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
| | * \ Merge branch 'feature/emailImprovements' into localdevDaniel Ramos2015-04-246-45/+97
| | |\ \
| | | * | -Fixed a crash while recreating CreateKeyEmailFragmentDaniel Ramos2015-04-241-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | -Email data is properly restored while rotating the Activity. -Added necessary logic to guarantee that an email is actually valid before continuing, there are verifications for empty, duplicated and invalid formatted emails for both additional and main email.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 14:30:29 +0000