aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge branch 'development' of https://github.com/open-keychain/open-keychain ...Daniel Ramos2015-04-2642-462/+789
| |\
| * \ Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into de...Daniel Ramos2015-04-245-44/+92
| |\ \
| | * | -Fixed a crash while recreating CreateKeyEmailFragmentDaniel Ramos2015-04-241-16/+16
| | * | -Improved email sanity verifications when adding emails when creating a new KeyDaniel Ramos2015-04-146-30/+82
* | | | Temporary fix for gradle dependency bugDominik Schürmann2015-05-041-0/+6
* | | | Fix dublicated code in CreateKeyEmailFragmentDominik Schürmann2015-05-041-4/+0
* | | | Merge branch 'development' of https://github.com/manojkhannakm/open-keychain ...Dominik Schürmann2015-05-044-2/+286
|\ \ \ \
| * | | | Espresso test for CreateKeyActivityManoj Khanna2015-04-254-5/+286
* | | | | license header for PgpCertifyOperationDominik Schürmann2015-05-041-1/+19
* | | | | Apply patch from https://github.com/open-keychain/open-keychain/issues/1222#i...Dominik Schürmann2015-05-041-2/+9
* | | | | Apply patch from https://github.com/open-keychain/open-keychain/issues/1240 w...Dominik Schürmann2015-05-041-8/+22
* | | | | Fix yubikey stringsDominik Schürmann2015-05-012-7/+7
* | | | | More nullpointer fixesDominik Schürmann2015-05-011-1/+1
* | | | | Fix nullpointer in EncryptKeyCompletionViewDominik Schürmann2015-05-011-2/+2
* | | | | Remove time from key creation displayDominik Schürmann2015-04-301-1/+0
* | | | | Fix key creation string and displayDominik Schürmann2015-04-304-27/+13
* | | | | API: Allow selection of decryption keys when decryption failsDominik Schürmann2015-04-306-6/+188
* | | | | fix crash when moving focus from EncryptKeyCompletionView with unknown textVincent Breitmoser2015-04-281-1/+1
* | | | | display unknown keys red rather than orangeVincent Breitmoser2015-04-281-1/+1
* | | | | fix "select all" in key list multi-selectVincent Breitmoser2015-04-281-1/+1
* | | | | prevent crashes in EncryptKeyCompletionViewVincent Breitmoser2015-04-271-2/+10
* | | | | display creation dates for ambiguous user idsVincent Breitmoser2015-04-274-17/+44
* | | | | add distinct status for messages signed by "your" keyVincent Breitmoser2015-04-272-0/+14
* | | | | profiling says: caching qrCode bitmaps is a good ideaVincent Breitmoser2015-04-272-19/+43
| |_|_|/ |/| | |
* | | | Merge pull request #1225 from vectorijk/SwitchToMaterialDrawerDominik Schürmann2015-04-261-2/+2
|\ \ \ \
| * | | | update lib MaterialDrawer to latest(2.8.2)vectorijk2015-04-251-2/+2
* | | | | UI fixes for Android < 5Dominik Schürmann2015-04-266-27/+24
* | | | | Remove unused decrypt result layoutDominik Schürmann2015-04-263-140/+0
* | | | | Put decrypt result in toolbar, some ui fixes for decryptDominik Schürmann2015-04-2616-16/+162
|/ / / /
* / / / Switch to new support lib version 22.1Dominik Schürmann2015-04-2513-52/+30
|/ / /
* | | Update in-app contributor listDominik Schürmann2015-04-251-3/+22
* | | Set different titles when changing in nav drawerDominik Schürmann2015-04-251-6/+10
* | | Fix empty screen when clicking on encrypt in details viewDominik Schürmann2015-04-251-5/+2
* | | Update lib section in aboutDominik Schürmann2015-04-251-2/+2
* | | Remove old navigation drawer dependencyDominik Schürmann2015-04-253-12/+1
* | | Merge pull request #1220 from vectorijk/SwitchToMaterialDrawerDominik Schürmann2015-04-254-20/+192
|\ \ \
| * | | Fix #1197 Switch to MaterialDrawer libraryvectorijk2015-04-242-46/+89
| * | | Introduce and Switch to mikepenz/MaterialDrawervectorijk2015-04-244-25/+154
| |/ /
* | | fix encrypt activity layoutVincent Breitmoser2015-04-242-3/+4
* | | revamp decrypt uiVincent Breitmoser2015-04-247-230/+391
|/ /
* | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-04-228-30/+449
|\ \
| * | Fixed Snackbar behind layoutManoj Khanna2015-04-225-29/+29
| * | keyserver verification on additionAdithya Abraham Philip2015-04-224-1/+420
* | | Update changelogDominik Schürmann2015-04-221-6/+8
|/ /
* | corrected possible null pointerAdithya Abraham Philip2015-04-221-1/+1
* | Simplify ImportKeysProxyActivityDominik Schürmann2015-04-211-29/+12
* | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-04-2110-52/+212
|\ \
| * | added log to QR code scan/import failAdithya Abraham Philip2015-04-211-12/+11
| * | Fix for initialization failure when card returns FCI in data field.Joey Castillo2015-04-201-1/+1
| * | Track state of PIN verification on smart card; only verify when needed.Joey Castillo2015-04-201-2/+33