aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-05-062-6/+18
|\
| * 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 in...Dominik Schürmann2015-05-065-117/+181
* 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 dev...Dominik Schürmann2015-05-053-9/+54
|\
| * Merge pull request #1235 from wfaulk/replacement_extraDominik Schürmann2015-05-043-9/+54
| |\
| | * 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 into...Dominik Schürmann2015-05-043-51/+94
|/|
| * -removed unneeded inputType attribute from xml files (+1 squashed commits)Daniel Ramos2015-04-303-12/+10
| * -Removed unneeded view references from the fragment class since they are not ...Daniel Ramos2015-04-261-7/+3
| * -removed unneeded code from previous commits. I tested on a KitKat(4.4.2) and...Daniel Ramos2015-04-261-3/+0
| * Merge branch 'development' of https://github.com/open-keychain/open-keychain ...Daniel Ramos2015-04-2643-462/+791
| |\
| * \ Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into de...Daniel Ramos2015-04-245-44/+92
| |\ \
| | * \ Merge branch 'feature/emailImprovements' into localdevDaniel Ramos2015-04-246-45/+97
| | |\ \
| | | * | -Fixed a crash while recreating CreateKeyEmailFragmentDaniel Ramos2015-04-241-16/+16
| | | * | -Improved email sanity verifications when adding emails when creating a new KeyDaniel Ramos2015-04-146-30/+82
| | |/ /
* | | | Merge branch 'manojkhannakm-development' into developmentDominik Schürmann2015-05-044-2/+288
|\ \ \ \
| * | | | Temporary fix for gradle dependency bugDominik Schürmann2015-05-041-0/+6
| * | | | Fix dublicated code in CreateKeyEmailFragmentDominik Schürmann2015-05-041-4/+0
| * | | | Merge branch 'development' of https://github.com/manojkhannakm/open-keychain ...Dominik Schürmann2015-05-044-2/+286
|/| | | |
| * | | | Espresso test for CreateKeyActivityManoj Khanna2015-04-254-5/+286
* | | | | license header for PgpCertifyOperationDominik Schürmann2015-05-041-1/+19
* | | | | Apply patch from https://github.com/open-keychain/open-keychain/issues/1222#i...Dominik Schürmann2015-05-041-2/+9
* | | | | Apply patch from https://github.com/open-keychain/open-keychain/issues/1240 w...Dominik Schürmann2015-05-041-8/+22
* | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-05-041-1/+2
|\ \ \ \ \
| * \ \ \ \ Merge pull request #1238 from wfaulk/fix-testsDominik Schürmann2015-05-041-1/+2
| |\ \ \ \ \
| | * | | | | updated robolectric to support new android support libsWilliam Faulk2015-05-031-1/+2
| |/ / / / /
* / / / / / Fix yubikey stringsDominik Schürmann2015-05-012-7/+7
|/ / / / /
* | | | | More nullpointer fixesDominik Schürmann2015-05-011-1/+1
* | | | | Fix nullpointer in EncryptKeyCompletionViewDominik Schürmann2015-05-011-2/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 04:59:25 +0000