aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Expand)AuthorAgeFilesLines
* OTG: Add usb device manager prototypeNikita Mikhailov2016-04-145-28/+219
* OTG: update methodsNikita Mikhailov2016-04-148-707/+308
* OTG: port old primitives from otg_alt branchNikita Mikhailov2016-04-1411-0/+995
* Version 3.95 betaDominik Schürmann2016-04-131-2/+2
* Fix stringDominik Schürmann2016-04-131-1/+1
* KeybaseLib workaroundDominik Schürmann2016-04-121-1/+1
* Update Android Gradle Plugin to 2.0 with workaroundsDominik Schürmann2016-04-121-3/+3
* Merge branch 'backup-code'Dominik Schürmann2016-04-129-189/+1605
|\
| * Fix in-app help for backup codesDominik Schürmann2016-04-121-1/+1
| * Revert usage of masked-edittext, back to plain edittexts for backup codesDominik Schürmann2016-04-128-188/+1604
* | Fix stringsDominik Schürmann2016-04-121-3/+3
|/
* Merge pull request #1772 from runnerway/importkey-encryptedVincent2016-04-124-10/+136
|\
| * Handle encrypted files while importing keysAndrea Torlaschi2016-03-274-10/+136
* | Add missing keyholder string paramNikita Mikhailov2016-04-111-1/+1
* | Use cert pinning only if availableDominik Schürmann2016-04-097-41/+36
* | Okhttp3 cleanups, docs, and fix timeouts for default clientDominik Schürmann2016-04-095-29/+41
* | KeyBaseLib response ClientMichal Kepkowski2016-04-082-10/+10
* | cleaningMichal Kepkowski2016-04-062-8/+6
* | Merge branch 'master' into okhttp3Michal Kepkowski2016-04-0651-911/+988
|\ \
| * \ Merge pull request #1804 from vhazali/tint-linked-contact-picture-in-toolbarVincent2016-04-062-0/+4
| |\ \
| | * | Used a constant instead of magic number for colourVictor Hazali2016-04-042-1/+3
| | * | Fixes #1298Victor Hazali2016-03-301-0/+2
| | |/
| * | Fix Unusable signing key not properly disabled, Issue #1468Durgesh2016-04-052-10/+0
| * | Merge pull request #1808 from vhazali/warn-when-stripping-master-keyVincent2016-04-042-5/+31
| |\ \
| | * | setTitle now uses resource id directlyVictor Hazali2016-04-011-1/+1
| | * | Corrected warning messageVictor Hazali2016-04-011-1/+1
| | * | Corrected capitalisation of subkeyVictor Hazali2016-03-301-2/+2
| | * | Refactored switch statements to use constantsVictor Hazali2016-03-301-5/+9
| | * | Extracted methodVictor Hazali2016-03-301-16/+20
| | * | Merge commit '05accb49066a2693cfc1c92e29ad10112f957495' into warn-when-stripp...Victor Hazali2016-03-302-1/+19
| | |\ \ | | | |/ | | |/|
| | | * Alert for Stripping Subkeys.tdjogi010@gmail.com2016-03-022-1/+19
| * | | Merge pull request #1796 from AlexFJW/LimitCreateKeyOptionsVincent2016-04-0414-485/+362
| |\ \ \
| | * | | Redesigned subkey creation dialog and changed default key type created to RSA...Alex Fong2016-04-0114-485/+362
| * | | | Fix Display Key in UploadKeyActivity, Issue #506Durgesh2016-03-318-23/+45
| * | | | Display Key moved to FragmentDurgesh2016-03-295-173/+233
| | |/ / | |/| |
| * | | change sync interval on change in codeAdithya Abraham Philip2016-03-244-12/+63
| * | | Merge pull request #1785 from advaita13/wifi-only-fixVincent2016-03-249-22/+119
| |\ \ \
| | * | | Final commitAdvaita2016-03-239-22/+119
| * | | | Merge pull request #1782 from fiaxh/share_key_mimeDominik Schürmann2016-03-241-1/+1
| |\ \ \ \
| | * | | | Set MIME application/pgp-keys when sending a keyfiaxh2016-03-141-1/+1
| * | | | | use new TokenAutoComplete 2.0.7, fixes #1636Vincent Breitmoser2016-03-233-13/+2
| * | | | | get rid of code path for pin and notation data handlingVincent Breitmoser2016-03-239-157/+75
| * | | | | Fix CertifyKeyActivity back button on action bar not working #1758Durgesh2016-03-221-0/+11
| | |_|/ / | |/| | |
| * | | | update null-check for duplicates, and add matching indexes to name and email ...Vincent Breitmoser2016-03-162-7/+13
| * | | | Version 3.9.4Dominik Schürmann2016-03-151-2/+2
| * | | | small update to duplicate detectionVincent Breitmoser2016-03-151-2/+5
| * | | | Merge pull request #1777 from fjodorver/masterVincent2016-03-151-2/+2
| |\ \ \ \
| | * | | | Updated HAS_DUPLICATE_USER_ID in KeychainProvider to use name and email addre...fjodor2016-03-101-2/+2
| * | | | | fix ridiculous database migration bug introduced by d6e4936fa54dc3577296dbada...Vincent Breitmoser2016-03-151-9/+7
| | |_|/ / | |/| | |
| * | | | Version 3.9.3Dominik Schürmann2016-03-151-2/+2
| | |/ / | |/| |