aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Revert "Use non-breaking spaces for backup code MaskedEditText"Dominik Schürmann2016-03-083-11/+2
| | | | | | | | | | | | | | | | | | | | | This reverts commit 0feb4d074ce284bfed17e82a3cbc218209aff14a. Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java
* | | Fix code style and documentation in BaseSecurityTokenNfcActivityDominik Schürmann2016-03-082-40/+45
| | |
* | | Fix documentation of nfcGenerateOnCardKeyDominik Schürmann2016-03-081-3/+1
| | |
* | | Fix comment in nfcGenerateOnCardKeyDominik Schürmann2016-03-081-1/+1
| | |
* | | Add nfcGenerateOnCardKey by Joey Castillo before it gets lostDominik Schürmann2016-03-081-0/+42
| | |
* | | Merge branch 'kepuss-okHttpLinkedToken'Dominik Schürmann2016-03-075-84/+81
|\ \ \
| * | | Merge branch 'okHttpLinkedToken' of https://github.com/kepuss/open-keychain ↵Dominik Schürmann2016-03-075-84/+81
|/| | | | | | | | | | | | | | | into kepuss-okHttpLinkedToken
| * | | dependency removedMichal Kepkowski2016-03-051-2/+0
| | | |
| * | | okHttpMichal Kepkowski2016-03-044-82/+81
| | | |
* | | | Version 3.9.2Dominik Schürmann2016-03-071-2/+2
| | | |
* | | | fix get key ids by removing another leftoverDominik Schürmann2016-03-071-1/+0
| | | |
* | | | fix bug from leftover line in openpgpserviceVincent Breitmoser2016-03-071-1/+0
| | | |
* | | | Version 3.9.1Dominik Schürmann2016-03-062-3/+3
| | | |
* | | | Merge pull request #1757 from 007durgesh219/Issue#1752Dominik Schürmann2016-03-061-1/+7
|\ \ \ \ | | | | | | | | | | Fix K-9 stable: OpenPGP: Unknown compression algorithm #1752
| * | | | Fix K-9 stable: OpenPGP: Unknown compression algorithm #1752Durgesh2016-03-061-1/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com>
* | | | | Merge pull request #1747 from runnerway/fix-alreadyaddedDominik Schürmann2016-03-061-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | Fix duplicate file insertion while encrypting
| * | | | Remove uri from pending even when already addedAndrea Torlaschi2016-03-041-2/+2
| | | | |
* | | | | Merge pull request #1750 from 007durgesh219/Issue#1746Dominik Schürmann2016-03-051-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix Dark theme no longer works in main screen on android 5, Issue#1746
| * | | | | Fix Dark theme no longer works in main screen on android 5, Issue#1746Durgesh2016-03-051-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com>
* | | | | Merge pull request #1738 from runnerway/storage-permission-fixDominik Schürmann2016-03-051-1/+8
|\ \ \ \ \ | | | | | | | | | | | | Always check read permission
| * | | | | Always check read permissionAndrea Torlaschi2016-03-021-1/+8
| | | | | |
* | | | | | Merge pull request #1751 from runnerway/decrypt-filenameDominik Schürmann2016-03-052-4/+14
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Fix wrong behavior of third-party apps while opening files after decryption
| * | | | | Set filename after decryptionAndrea Torlaschi2016-03-051-2/+3
| | | | | |
| * | | | | Extend FileProvider to support name updateAndrea Torlaschi2016-03-051-2/+11
| | |/ / / | |/| | |
* | | | | Merge pull request #1743 from advaita13/masterDominik Schürmann2016-03-031-0/+7
|\ \ \ \ \ | |/ / / / |/| | | | Contact Synchronisation Notification
| * | | | Update ContactSyncAdapterService.javaAdvaita2016-03-031-0/+7
| | |/ / | |/| |
* | | | Add missing 2 EUR selection for donationDominik Schürmann2016-03-031-0/+1
| | | |
* | | | Version 3.9Dominik Schürmann2016-03-032-7/+2
| | | |
* | | | Transifex: pt_BRDominik Schürmann2016-03-0398-292/+2894
| | | |
* | | | Update openpgp-api submoduleDominik Schürmann2016-03-031-0/+0
|/ / /
* | | add v11 to supported api versionsVincent Breitmoser2016-03-021-3/+6
| | |
* | | update openpgp-api-lib to v11 (closes #1735)Vincent Breitmoser2016-03-021-0/+0
|/ /
* | handle openpgp4fpr intent filter as import rather than certify (see #1661)Vincent Breitmoser2016-03-022-16/+21
| |
* | small nullpointer fixVincent Breitmoser2016-03-021-3/+6
| |
* | nfc: disable broadcomWorkaround for TagDispatcher to reduce delay (see #1734)Vincent Breitmoser2016-03-021-1/+1
| |
* | some changelog for v3.9Vincent Breitmoser2016-03-021-0/+7
| |
* | Merge pull request #1737 from runnerway/backup-code-fixDominik Schürmann2016-03-021-5/+6
|\ \ | | | | | | Fix backup code comparison
| * | Fix backup code comparisonAndrea Torlaschi2016-03-021-5/+6
|/ /
* | Merge pull request #1615 from open-keychain/external-providerVincent2016-03-0116-291/+797
|\ \ | | | | | | provider for OpenPgpApi
| * | add some license headersVincent Breitmoser2016-02-243-0/+52
| | |
| * | wipVincent Breitmoser2016-02-241-42/+88
| | |
| * | add ACTION_CHECK_PERMISSION for a simple permission checkVincent Breitmoser2016-02-242-0/+13
| | |
| * | external-provider: add permission check for status queryVincent Breitmoser2016-02-244-7/+54
| | |
| * | external-provider: add (experimental) external providerVincent Breitmoser2016-02-243-1/+272
| | |
| * | split off ApiDataAccessObject from ProviderHelperVincent Breitmoser2016-02-2411-247/+324
| |/
* | Comment out verification for submodulesDominik Schürmann2016-02-291-8/+8
| |
* | Update to support lib 23.2.0Dominik Schürmann2016-02-292-50/+53
|/
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2016-02-2311-35/+525
|\
| * Merge pull request #1727 from open-keychain/mime-fallbackVincent2016-02-2311-35/+525
| |\ | | | | | | try to guess if data is text or not
| | * ditch isLikelyText flag, set mimeType to text/plain in that caseVincent Breitmoser2016-02-237-25/+32
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 07:58:59 +0000