aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* OTG: Rename 'javacard' package, methods, remove JavacardInterfaceNikita Mikhailov2016-04-1416-67/+770
|
* OTG: Fix usb transportNikita Mikhailov2016-04-143-43/+108
|
* OTG: Usb device manager fixesNikita Mikhailov2016-04-145-93/+74
|
* 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
|
* Remove old keybase pathDominik Schürmann2016-04-131-1/+0
|
* Version 3.95 betaDominik Schürmann2016-04-131-2/+2
|
* Fix stringDominik Schürmann2016-04-131-1/+1
|
* KeybaseLib workaroundDominik Schürmann2016-04-122-2/+5
|
* Fix wrapper URLDominik Schürmann2016-04-121-1/+1
|
* Update Android Gradle Plugin to 2.0 with workaroundsDominik Schürmann2016-04-127-19/+23
|
* 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 in "import key" file selection
| * Handle encrypted files while importing keysAndrea Torlaschi2016-03-274-10/+136
| |
* | Merge pull request #1828 from nmikhailov/holder_text_fixDominik Schürmann2016-04-121-1/+1
|\ \ | | | | | | Add missing keyholder string param
| * | Add missing keyholder string paramNikita Mikhailov2016-04-111-1/+1
|/ /
* | Merge branch 'kepuss-okhttp3'Dominik Schürmann2016-04-0913-124/+165
|\ \
| * | 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
| | |
| * | Update keybase submoduleDominik Schürmann2016-04-091-0/+0
| | |
| * | KeyBaseLib response ClientMichal Kepkowski2016-04-082-10/+10
| | |
| * | cleaningMichal Kepkowski2016-04-062-8/+6
| | |
| * | Merge branch 'master' into okhttp3Michal Kepkowski2016-04-0652-913/+990
| |\ \ | |/ / |/| |
* | | Merge pull request #1804 from vhazali/tint-linked-contact-picture-in-toolbarVincent2016-04-062-0/+4
|\ \ \ | | | | | | | | tint linked contact picture in toolbar #1298
| * | | Used a constant instead of magic number for colourVictor Hazali2016-04-042-1/+3
| | | | | | | | | | | | | | | | Explicitly stated the blending mode
| * | | Fixes #1298Victor Hazali2016-03-301-0/+2
| | |/ | |/|
* | | Merge pull request #1818 from 007durgesh219/Issue#1468Vincent2016-04-062-10/+0
|\ \ \ | | | | | | | | Fix Unusable signing key not properly disabled, Issue #1468
| * | | Fix Unusable signing key not properly disabled, Issue #1468Durgesh2016-04-052-10/+0
|/ / / | | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com>
* | | Merge pull request #1808 from vhazali/warn-when-stripping-master-keyVincent2016-04-042-5/+31
|\ \ \ | | | | | | | | Warn when stripping master key #1554
| * | | 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 ↵Victor Hazali2016-03-302-1/+19
| |\ \ \ | | |/ / | |/| | | | | | warn-when-stripping-master-key
| | * | Alert for Stripping Subkeys.tdjogi010@gmail.com2016-03-022-1/+19
| | | |
* | | | Merge pull request #1796 from AlexFJW/LimitCreateKeyOptionsVincent2016-04-0414-485/+362
|\ \ \ \ | | | | | | | | | | Refer to issue #1600 Limit create key options
| * | | | Redesigned subkey creation dialog and changed default key type created to ↵Alex Fong2016-04-0114-485/+362
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RSA, 3072 bit. Added code to prevent removal of master subkey when modifying a new key.
* | | | | Merge pull request #1810 from ecki/patch-1Vincent2016-04-031-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix link to open-keychain/bouncycastle fork
| * | | | | Fix link to open-keychain/bouncycastle forkBernd2016-04-021-1/+1
|/ / / / /
* | | | | Merge pull request #1764 from 007durgesh219/Issue#506Vincent2016-04-0110-191/+273
|\ \ \ \ \ | |_|/ / / |/| | | | Display Key in UploadKeyActivity Issue #506
| * | | | Fix Display Key in UploadKeyActivity, Issue #506Durgesh2016-03-318-23/+45
| | | | |
| * | | | Display Key moved to FragmentDurgesh2016-03-295-173/+233
|/ / / / | | | | | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com>
* | | | Merge pull request #1776 from open-keychain/interval-fixAdithya Abraham Philip2016-03-244-12/+63
|\ \ \ \ | | | | | | | | | | Update Keyserver Sync if Sync Interval Changed
| * | | | 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
|\ \ \ \ | | | | | | | | | | Sync only when unmetered internet is available #1670
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 04:04:44 +0000