aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
Commit message (Expand)AuthorAgeFilesLines
* Revert usage of masked-edittext, back to plain edittexts for backup codesDominik Schürmann2016-04-122-118/+177
* Merge pull request #1772 from runnerway/importkey-encryptedVincent2016-04-123-10/+135
|\
| * Handle encrypted files while importing keysAndrea Torlaschi2016-03-273-10/+135
* | 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-0633-726/+852
|\ \
| * \ Merge pull request #1804 from vhazali/tint-linked-contact-picture-in-toolbarVincent2016-04-061-0/+3
| |\ \
| | * | Used a constant instead of magic number for colourVictor Hazali2016-04-041-1/+2
| | * | 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-041-5/+28
| |\ \
| | * | setTitle now uses resource id directlyVictor Hazali2016-04-011-1/+1
| | * | 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-301-1/+16
| | |\ \ | | | |/ | | |/|
| | | * Alert for Stripping Subkeys.tdjogi010@gmail.com2016-03-021-1/+16
| * | | Merge pull request #1796 from AlexFJW/LimitCreateKeyOptionsVincent2016-04-046-352/+271
| |\ \ \
| | * | | Redesigned subkey creation dialog and changed default key type created to RSA...Alex Fong2016-04-016-352/+271
| * | | | Fix Display Key in UploadKeyActivity, Issue #506Durgesh2016-03-316-21/+39
| * | | | Display Key moved to FragmentDurgesh2016-03-293-171/+224
| | |/ / | |/| |
| * | | change sync interval on change in codeAdithya Abraham Philip2016-03-244-12/+63
| * | | Merge pull request #1785 from advaita13/wifi-only-fixVincent2016-03-246-22/+102
| |\ \ \
| | * | | Final commitAdvaita2016-03-236-22/+102
| * | | | 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-232-11/+0
| * | | | get rid of code path for pin and notation data handlingVincent Breitmoser2016-03-237-113/+70
| * | | | 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
| * | | 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
| | |/ / | |/| |
| * | | Merge pull request #1780 from AlexFJW/backup-code-selectionDominik Schürmann2016-03-121-0/+25
| |\ \ \
| | * | | Provisional backup-code text selection fixAlex Fong2016-03-121-0/+25
* | | | | OKhttp url factoryMichal Kepkowski2016-04-062-8/+26
* | | | | okhttp3Michal Kepkowski2016-03-1410-109/+127
|/ / / /
* | | | Merge pull request #1763 from fjodorver/masterVincent2016-03-104-15/+38
|\ \ \ \ | | |/ / | |/| |
| * | | Increased version DB and added a migration path from an old database formatfjodor2016-03-071-2/+5
| * | | Save split user ids in database #1745fjodor2016-03-074-13/+33
* | | | service: add opportunistic mode to encryptionVincent Breitmoser2016-03-101-20/+26
* | | | Fix display of keyserver item in dark themefiaxh2016-03-101-3/+4
| |/ / |/| |
* | | Fix NullPointerException in ImportKeysListFragment.checkAndRequestReadPermiss...Durgesh2016-03-081-1/+1
* | | Open keyboard for backup codeDominik Schürmann2016-03-081-22/+31
* | | Revert "Use non-breaking spaces for backup code MaskedEditText"Dominik Schürmann2016-03-081-7/+2
* | | Fix code style and documentation in BaseSecurityTokenNfcActivityDominik Schürmann2016-03-082-40/+45
* | | Fix documentation of nfcGenerateOnCardKeyDominik Schürmann2016-03-081-3/+1
* | | Fix comment in nfcGenerateOnCardKeyDominik Schürmann2016-03-081-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 03:31:32 +0000