aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Expand)AuthorAgeFilesLines
* Disable robolectric, update to android gradle 0.11.1, update gradle to 1.12Dominik Schürmann2014-06-091-4/+4
* Update buildTools to 19.1Dominik Schürmann2014-06-091-1/+1
* Merge pull request #650 from open-keychain/v/import-logDominik Schürmann2014-06-065-110/+463
|\
| * import-log: better stripped key loggingVincent Breitmoser2014-06-064-17/+43
| * import-log: add output to logcat (for debugging)Vincent Breitmoser2014-06-063-8/+19
| * import-log: add import log string resourcesVincent Breitmoser2014-06-061-0/+38
| * import-log: add log statements in import routineVincent Breitmoser2014-06-062-97/+225
| * import-log: improve operationresultparcel, add indentationVincent Breitmoser2014-06-062-10/+37
| * import-log: add parcelable prototypeVincent Breitmoser2014-06-051-0/+123
* | Merge pull request #649 from mar-v-in/automatic-contact-discoveryDominik Schürmann2014-06-0619-57/+633
|\ \
| * | Fix TAG in account service as wellmar-v-in2014-06-061-7/+8
| * | Fixing TAG and string resourcemar-v-in2014-06-062-4/+4
| * | Fix compile error introduced during mergemar-v-in2014-06-061-1/+2
| * | Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-0537-340/+214
| |\ \
| * | | Add dnsjava as submodulemar-v-in2014-06-051-1/+1
| * | | Show keys with android contactsmar-v-in2014-06-058-11/+119
| * | | Make keylist case insensitivemar-v-in2014-06-051-3/+3
| * | | Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-04146-2416/+4038
| |\ \ \
| * | | | Fix regex for hkp parsing to support multiple uidsmar-v-in2014-06-041-2/+2
| * | | | First version of automatic contact discovery.mar-v-in2014-06-049-0/+358
| * | | | Store expired state within ImportKeysListEntrymar-v-in2014-06-042-0/+12
| * | | | Merge ACTION_DOWNLOAD_AND_IMPORT_KEYS and ACTION_IMPORT_KEYBASE_KEYSmar-v-in2014-05-291-54/+15
| * | | | Merge branch 'hkps-support' into automatic-contact-discoverymar-v-in2014-05-291-15/+54
| |\ \ \ \
| | * | | | Fix url building to support certificate check on hkps serversmar-v-in2014-05-281-8/+19
| | * | | | Add hkps supportmar-v-in2014-05-271-9/+37
| * | | | | Store nice origin with keybase keys (that can't be interpreted as HKP server)mar-v-in2014-05-291-1/+2
| * | | | | Make abstract methods in Keyserver public (implementations make them public a...mar-v-in2014-05-291-3/+3
| * | | | | Download from origin during ACTION_DOWNLOAD_AND_IMPORT_KEYSmar-v-in2014-05-291-3/+4
| |/ / / /
| * | | | Store origin with ImportKeysListEntrymar-v-in2014-05-273-0/+13
| * | | | Add ability to resolve HkpKeyserver from _hkp._tcp SRV recordmar-v-in2014-05-272-0/+39
| * | | | ContactHelper can read email addresses from contact listmar-v-in2014-05-262-0/+22
* | | | | Move SlidingTabLayout and SlidingTabStrip into appropriate subpackageDominik Schürmann2014-06-066-6/+6
* | | | | Hide subkeys, certs tabs in key view, checkable menu item to show/hide themDominik Schürmann2014-06-064-10/+94
| |_|/ / |/| | |
* | | | Clean up keyimport.ImportKeysListEntryTim Bray2014-06-052-67/+66
* | | | Merge pull request #645 from timbray/masterDominik Schürmann2014-06-052-7/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Don't show full fingerprint in key search resultsTim Bray2014-06-051-6/+2
| * | | fixed error messageTim Bray2014-06-042-4/+3
| | |/ | |/|
* | | ui: do show Certify identities button even for secret keysVincent Breitmoser2014-06-041-8/+0
* | | fix bug with bad verifying master keysVincent Breitmoser2014-06-041-3/+3
* | | do respect expectedFingerprint during key importVincent Breitmoser2014-06-042-9/+18
* | | neatness refactoringVincent Breitmoser2014-06-0433-241/+118
|/ /
* | Use fixed gradle versionsDominik Schürmann2014-06-041-1/+1
* | Use fixed gradle versionsDominik Schürmann2014-06-041-2/+4
* | Merge remote-tracking branch 'origin/master' into edit-key-rewriteVincent Breitmoser2014-06-0299-712/+1368
|\ \
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-05-317-63/+54
| |\|
| | * Finished cleaning up rebase conflicts post Keyserver exception refactorTim Bray2014-05-236-32/+33
| | * Add Log.d for QueryFailedExceptionTim Bray2014-05-231-0/+2
| | * Add Log.d for QueryFailedExceptionTim Bray2014-05-237-40/+28
| * | Pull from transifexDominik Schürmann2014-05-3192-649/+1314
| |/
* | wrapped-key-ring: add documentationVincent Breitmoser2014-06-027-7/+83
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 23:28:13 +0000