aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge pull request #859 from timbray/masterDominik Schürmann2014-09-161-2/+2
|\ | | | | Fix construction of algorithmID in Keybase result lists
| * Fix construction of algorithmID in Keybase result listsTim Bray2014-09-151-2/+2
|/
* start work on encrypt/decrypt test classesVincent Breitmoser2014-09-156-138/+134
|
* minor fix for passphrase testVincent Breitmoser2014-09-152-3/+1
|
* Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-09-1594-942/+1900
|\ | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java OpenKeychain/src/main/res/values-de/strings.xml
| * Pull from transifexDominik Schürmann2014-09-1543-162/+733
| |
| * ACCESS_NETWORK_STATE no longer neededDominik Schürmann2014-09-151-1/+0
| |
| * Fix buildDominik Schürmann2014-09-151-1/+0
| |
| * Update libsDominik Schürmann2014-09-152-0/+0
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-1558-681/+678
| |\
| | * Merge pull request #844 from timbray/masterDominik Schürmann2014-09-1430-548/+550
| | |\ | | | | | | | | Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefs
| | | * update for new plural origins on ImportKeyListEntryTim Bray2014-09-131-1/+1
| | | |
| | | * Keys found on multiple servers are now imported from all of themTim Bray2014-09-137-38/+49
| | | |
| | | * Change shuffle to rotate, and when merging ImportKeysList entries, if either ↵Tim Bray2014-09-134-7/+17
| | | | | | | | | | | | | | | | side is revoked/expired, the merge reflects that
| | | * Restore Yubikey setting, lost in fumble-fingered mergeTim Bray2014-09-131-0/+7
| | | |
| | | * Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefsTim Bray2014-09-1326-527/+501
| | |/
| * | New decrypt activity design (WIP), saner UTF8 decoding (replacing ↵Dominik Schürmann2014-09-1519-307/+532
| | | | | | | | | | | | non-decodable characters)
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-148-214/+404
| |\ \
| * \ \ Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-143-30/+34
| |\ \ \
| * | | | First work on decryptDominik Schürmann2014-09-146-4/+166
| | | | |
* | | | | move LogLevel info into LogType enumVincent Breitmoser2014-09-1519-501/+491
| |_|_|/ |/| | |
* | | | work on OperationResultParcelVincent Breitmoser2014-09-1430-123/+116
| | | |
* | | | pending results are a type of non-successVincent Breitmoser2014-09-146-10/+12
| |_|/ |/| |
* | | (forgot a file for previous commit)Vincent Breitmoser2014-09-141-0/+103
| | |
* | | add SignEncryptResult parcel (probably break stuff)Vincent Breitmoser2014-09-147-214/+301
| |/ |/|
* | Merge pull request #850 from da-kid/masterDominik Schürmann2014-09-143-30/+34
|\ \ | |/ |/| Fixed pull2refresh bugs
| * Temporary fix for #848, fixed pull2refresh bugsDaniel Albert2014-09-133-30/+34
|/
* Hack to disable overscroll effect of swipe to updateDominik Schürmann2014-09-133-15/+486
|
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-133-4/+11
|\
| * add key id to trailing asym data log msgVincent Breitmoser2014-09-132-4/+7
| |
| * just skip foreign uid certifications during import for nowVincent Breitmoser2014-09-131-0/+4
| | | | | | | | Related to #836, fix still pending
* | Custom actionbar to indicate swipe down effectDominik Schürmann2014-09-133-0/+66
|/
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-135-6/+9
|\
| * Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-09-132-3/+8
| |\
| * | move IS_REVOKED table prefix to the right placesVincent Breitmoser2014-09-135-6/+9
| | | | | | | | | | | | Fixes #849
* | | Fix testsDominik Schürmann2014-09-131-1/+1
| |/ |/|
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-133-0/+6
|\|
| * very small fix, don't show name on encoding warningVincent Breitmoser2014-09-131-2/+1
| |
| * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-09-131-8/+3
| |\
| | * Cleanup testDominik Schürmann2014-09-131-8/+3
| | |
| * | log warning on bad uid encodingVincent Breitmoser2014-09-133-0/+7
| |/
* | Cleanup testsDominik Schürmann2014-09-132-10/+4
| |
* | Set literal data format tag to UTF8 when encrypting textDominik Schürmann2014-09-131-1/+7
|/
* Merge branch 'result-parcels'Vincent Breitmoser2014-09-1310-216/+384
|\
| * some DecryptVerify log refinementsVincent Breitmoser2014-09-132-7/+15
| |
| * add a ton of logging to DecryptVerifyVincent Breitmoser2014-09-134-26/+166
| |
| * working version of DecryptVerifyResultVincent Breitmoser2014-09-136-64/+113
| |
| * introduce OperationResultParcel for PgpDecryptVerify operations (WIP)Vincent Breitmoser2014-09-138-233/+204
| |
* | deactivate screenshots in new PassphraseDialogActivityDominik Schürmann2014-09-132-0/+11
| |
* | More smaller UI fixesDominik Schürmann2014-09-133-0/+7
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 10:00:23 +0000