aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Better handle user_id sidecases while splittingfiaxh2016-04-123-5/+45
* Use email field to match email in KeychainProviderfiaxh2016-04-121-4/+4
* Merge pull request #1810 from ecki/patch-1Vincent2016-04-031-1/+1
|\
| * Fix link to open-keychain/bouncycastle forkBernd2016-04-021-1/+1
|/
* Merge pull request #1764 from 007durgesh219/Issue#506Vincent2016-04-0110-191/+273
|\
| * Fix Display Key in UploadKeyActivity, Issue #506Durgesh2016-03-318-23/+45
| * Display Key moved to FragmentDurgesh2016-03-295-173/+233
|/
* Merge pull request #1776 from open-keychain/interval-fixAdithya Abraham Philip2016-03-244-12/+63
|\
| * 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
* | | fix build instructions in readmeVincent Breitmoser2016-03-231-1/+1
* | | 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
| |/ |/|
* | 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
* | | 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-102-20/+26
* | | Update okhttp2, tokenautomcomplete, zxingDominik Schürmann2016-03-101-16/+16
* | | Merge pull request #1774 from fiaxh/keyserver_select_darkDominik Schürmann2016-03-101-3/+4
|\ \ \ | |_|/ |/| |
| * | Fix display of keyserver item in dark themefiaxh2016-03-101-3/+4
|/ /
* | Merge pull request #1769 from 007durgesh219/Issue#1766Dominik Schürmann2016-03-081-1/+1
|\ \
| * | Fix NullPointerException in ImportKeysListFragment.checkAndRequestReadPermiss...Durgesh2016-03-081-1/+1
|/ /
* | Open keyboard for backup codeDominik Schürmann2016-03-081-22/+31
* | Make it a style to reduce code duplicationDominik Schürmann2016-03-086-148/+25
* | Add more responsive text sizesDominik Schürmann2016-03-082-1/+74
* | Using new size qualifiersDominik Schürmann2016-03-084-3/+74
* | Revert "Use non-breaking spaces for backup code MaskedEditText"Dominik Schürmann2016-03-083-11/+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
* | Add nfcGenerateOnCardKey by Joey Castillo before it gets lostDominik Schürmann2016-03-081-0/+42
* | Merge branch 'kepuss-okHttpLinkedToken'Dominik Schürmann2016-03-075-84/+81
|\ \
| * | Merge branch 'okHttpLinkedToken' of https://github.com/kepuss/open-keychain i...Dominik Schürmann2016-03-075-84/+81
|/| |
| * | dependency removedMichal Kepkowski2016-03-051-2/+0
| * | okHttpMichal Kepkowski2016-03-044-82/+81
* | | Version 3.9.2Dominik Schürmann2016-03-071-2/+2
* | | fix get key ids by removing another leftoverDominik Schürmann2016-03-071-1/+0
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 03:30:50 +0000