aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * -removed unneeded inputType attribute from xml files (+1 squashed commits)Daniel Ramos2015-04-303-12/+10
| | * -Removed unneeded view references from the fragment class since they are not ...Daniel Ramos2015-04-261-7/+3
| | * -removed unneeded code from previous commits. I tested on a KitKat(4.4.2) and...Daniel Ramos2015-04-261-3/+0
| | * Merge branch 'development' of https://github.com/open-keychain/open-keychain ...Daniel Ramos2015-04-2643-462/+791
| | |\
| | * \ Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into de...Daniel Ramos2015-04-245-44/+92
| | |\ \
| | | * \ Merge branch 'feature/emailImprovements' into localdevDaniel Ramos2015-04-246-45/+97
| | | |\ \
| | | | * | -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
| | | |/ /
| * | | | Merge branch 'manojkhannakm-development' into developmentDominik Schürmann2015-05-044-2/+288
| |\ \ \ \
| | * | | | 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
| * | | | | 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
* | | | | | linked-ids: small compatibility changesVincent Breitmoser2015-05-113-2/+4
* | | | | | linked-ids: add certificate pinning, pin twitter api certVincent Breitmoser2015-05-099-27/+54
* | | | | | linked-ids: rename RawLinkedIdentity to UriAttributeVincent Breitmoser2015-05-097-25/+25
* | | | | | linked-ids: rename "cookie" to "token"Vincent Breitmoser2015-05-0912-43/+43
* | | | | | linked-ids: code cleanup, handle all lint errorsVincent Breitmoser2015-05-0922-324/+295
* | | | | | check for fingerprint of any subkey (arguable?)Vincent Breitmoser2015-05-062-6/+18
* | | | | | 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