aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Start refactoring encrypt ui, EncryptFileActivity no longer crashingDominik Schürmann2015-03-269-516/+539
|
* Fix certify with CryptoInputParcelDominik Schürmann2015-03-253-10/+6
|
* Remove backward compat in CertifyKeyFragmentDominik Schürmann2015-03-251-17/+1
|
* Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-24235-8380/+10180
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
| * 3.2beta3Dominik Schürmann2015-03-232-3/+3
| |
| * translation fixesDominik Schürmann2015-03-239-113/+93
| |
| * Fix language problems reported by yahoe.001 on transifexDominik Schürmann2015-03-234-11/+16
| |
| * Update build env and pluginsDominik Schürmann2015-03-237-52/+52
| |
| * Pull from transifexDominik Schürmann2015-03-23114-210/+8860
| |
| * Remove remaining html entities in changelogDominik Schürmann2015-03-231-3/+3
| |
| * Fix transifex configDominik Schürmann2015-03-231-4/+1
| |
| * Merge pull request #1165 from kentnek/dev-yubikey-nullDominik Schürmann2015-03-231-5/+11
| |\ | | | | | | Fixed #1152: NullPointerException when signing with YubiKey
| | * Fixed #1152:Kent2015-03-201-5/+11
| | | | | | | | | | | | - Checking if input.getSignatureSubKeyId() is not null before proceeding.
| * | Merge pull request #1166 from adithyaphilip/multi-threadedDominik Schürmann2015-03-2325-122/+691
| |\ \ | | | | | | | | Multi-threaded key import, update all feature
| | * | shifted multi-threading to own serviceAdithya Abraham Philip2015-03-2321-334/+611
| | | | | | | | | | | | | | | | | | | | | | | | added multi-threaded cloud import, restored KeychainIntentService eliminated code duplication in multi-threaded import
| | * | introduced multi-threadingAdithya Abraham Philip2015-03-236-35/+327
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactored oldKeys to updatedKeys added update all keys, ThreadPoolExecutor used modified CachedThreadPoolExecutor
| * | | Fix passphrase cache not clearing all passphrasesDominik Schürmann2015-03-231-2/+2
| | | |
| * | | Merge pull request #1174 from Jesperbk/developmentDominik Schürmann2015-03-231-1/+3
| |\ \ \ | | |/ / | |/| | Fixed symmetric encryption crash
| | * | Fixed issue where setting a passphrase to null later causes a ↵JesperBK2015-03-231-1/+3
| | | | | | | | | | | | | | | | NullPointerException.
| * | | Update readme for libs linkDominik Schürmann2015-03-231-1/+1
| | | |
| * | | Markdown commentsDominik Schürmann2015-03-235-5/+5
| | | |
| * | | Remove changelog in main folder, update commentsDominik Schürmann2015-03-235-265/+5
| | | |
| * | | Update transifex configDominik Schürmann2015-03-231-9/+12
| | | |
| * | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-235-16/+29
| |\ \ \ | | | | | | | | | | | | | | | development
| | * \ \ Merge pull request #1170 from manojkhannakm/developmentDominik Schürmann2015-03-221-0/+0
| | |\ \ \ | | | | | | | | | | | | Updated openpgp-api-lib
| | | * | | Updated openpgp-api-libManoj Khanna2015-03-221-0/+0
| | | |/ /
| * | / / Use markdown for in-app helpDominik Schürmann2015-03-2383-7652/+524
| | |/ / | |/| |
* | | | further improve yubikey error handlingVincent Breitmoser2015-03-235-24/+78
| | | |
* | | | nicer handling of nfc errorsVincent Breitmoser2015-03-232-5/+9
| | | |
* | | | Merge branch 'development' into v/crypto-input-parcelVincent Breitmoser2015-03-225-16/+29
|\ \ \ \ | | |/ / | |/| |
| * | | use top line in snackbar for status indicationVincent Breitmoser2015-03-225-16/+29
| |/ /
* | | forgot spongycastle updateVincent Breitmoser2015-03-221-0/+0
| | |
* | | fix unit test and add new for divert-to-card promotionVincent Breitmoser2015-03-222-6/+33
| | |
* | | enable nfc in import dialog as wellVincent Breitmoser2015-03-224-6/+51
| | |
* | | finish ui flow for yubikey importVincent Breitmoser2015-03-229-221/+396
| | |
* | | actually promote to divert, pass yubikey's AIDVincent Breitmoser2015-03-226-31/+24
| | |
* | | improve status reporting in yubikey dialogueVincent Breitmoser2015-03-223-14/+114
| | |
* | | move yubikey import into viewkeyfragmentVincent Breitmoser2015-03-229-228/+376
| | |
* | | split up wait/action yubikey fragmentsVincent Breitmoser2015-03-2120-88/+264
| | |
* | | work on ad-hoc yubikey import supportVincent Breitmoser2015-03-217-37/+365
| | |
* | | first steps toward yubikey activityVincent Breitmoser2015-03-2130-468/+689
| | | | | | | | | | | | | | | - move BaseActivity into new package - extract BaseNfcActivity from NfcOperationsActivity
* | | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcelVincent Breitmoser2015-03-2127-198/+215
|\| | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
| * | Merge branch 'manojkhannakm-development' into developmentDominik Schürmann2015-03-2126-203/+184
| |\ \
| | * | Merge branch 'development' of https://github.com/manojkhannakm/open-keychain ↵Dominik Schürmann2015-03-2126-203/+184
| |/| | | | | | | | | | | | | | into manojkhannakm-development
| | * | Added docs for Notify classManoj Khanna2015-03-201-0/+10
| | | |
| | * | Fixed Snackbar behind keyboard on ImportKeysActivityManoj Khanna2015-03-202-9/+24
| | | |
| | * | Reworked Notify classManoj Khanna2015-03-2025-197/+153
| | | |
| * | | Add TODO to remote APIDominik Schürmann2015-03-211-0/+2
| |/ /
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-201-2/+17
| |\ \ | | | | | | | | | | | | development
| | * \ Merge pull request #1163 from kentnek/dev-list-footerDominik Schürmann2015-03-201-2/+17
| | |\ \ | | | | | | | | | | Added a blank footer view to the list of keys
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 22:18:22 +0000