aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-05-041-1/+2
|\ \
| * \ Merge pull request #1238 from wfaulk/fix-testsDominik Schürmann2015-05-041-1/+2
| |\ \
| | * | updated robolectric to support new android support libsWilliam Faulk2015-05-031-1/+2
| |/ /
* / / 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
* | Update snackbarDominik Schürmann2015-04-301-0/+0
* | Update wrapper to verify local cacheDominik Schürmann2015-04-291-0/+0
* | Use own gradle wrapper to verify downloaded gradle package via SHA-256 sum. S...Dominik Schürmann2015-04-292-0/+1
* | Merge pull request #1233 from wfaulk/readmeDominik Schürmann2015-04-291-10/+12
|\ \
| * | Update README.md with new build infoWilliam Faulk2015-04-281-10/+12
|/ /
* | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2015-04-281-2/+2
|\ \
| * | Display development build statusDominik Schürmann2015-04-281-2/+2
* | | 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-2617-16/+164
|/ /
* / 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
|\
| * Merge pull request #1218 from manojkhannakm/developmentDominik Schürmann2015-04-225-29/+29
| |\
| | * Fixed Snackbar behind layoutManoj Khanna2015-04-225-29/+29
| |/
| * Merge pull request #1214 from adithyaphilip/keyserver-verificationDominik Schürmann2015-04-224-1/+420
| |\
| | * keyserver verification on additionAdithya Abraham Philip2015-04-224-1/+420
| |/
* / Update changelogDominik Schürmann2015-04-221-6/+8
|/