aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-291-0/+1
|\
| * -Fixed a situation where additional emails could be duplicated when creating ...Daniel Ramos2015-03-271-0/+1
* | Fixing crashes with new encrypt uiDominik Schürmann2015-03-293-2/+1
* | Refactoring of EncryptTextActivityDominik Schürmann2015-03-271-4/+3
* | Start refactoring encrypt ui, EncryptFileActivity no longer crashingDominik Schürmann2015-03-263-10/+8
* | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-24191-7866/+9358
|\|
| * 3.2beta3Dominik Schürmann2015-03-231-1/+1
| * translation fixesDominik Schürmann2015-03-238-113/+93
| * Fix language problems reported by yahoe.001 on transifexDominik Schürmann2015-03-234-11/+16
| * Pull from transifexDominik Schürmann2015-03-23110-199/+8849
| * Remove remaining html entities in changelogDominik Schürmann2015-03-231-3/+3
| * introduced multi-threadingAdithya Abraham Philip2015-03-232-0/+7
| * Markdown commentsDominik Schürmann2015-03-235-5/+5
| * Remove changelog in main folder, update commentsDominik Schürmann2015-03-234-0/+4
| * Use markdown for in-app helpDominik Schürmann2015-03-2378-7635/+481
* | further improve yubikey error handlingVincent Breitmoser2015-03-231-0/+1
* | nicer handling of nfc errorsVincent Breitmoser2015-03-231-0/+1
* | enable nfc in import dialog as wellVincent Breitmoser2015-03-221-1/+2
* | finish ui flow for yubikey importVincent Breitmoser2015-03-222-23/+66
* | actually promote to divert, pass yubikey's AIDVincent Breitmoser2015-03-221-1/+3
* | improve status reporting in yubikey dialogueVincent Breitmoser2015-03-222-3/+12
* | move yubikey import into viewkeyfragmentVincent Breitmoser2015-03-223-70/+117
* | split up wait/action yubikey fragmentsVincent Breitmoser2015-03-2111-19/+88
* | work on ad-hoc yubikey import supportVincent Breitmoser2015-03-211-16/+85
* | first steps toward yubikey activityVincent Breitmoser2015-03-212-17/+100
* | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcelVincent Breitmoser2015-03-211-5/+15
|\|
| * Fixed Snackbar behind keyboard on ImportKeysActivityManoj Khanna2015-03-201-5/+15
* | add edit key unit test for no-opVincent Breitmoser2015-03-201-0/+1
* | fix unit tests (for real)Vincent Breitmoser2015-03-201-2/+4
* | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-03-2029-164/+152
|\|
| * Implemented #1162: Invoke NFC in Advanced ViewKent2015-03-206-4/+21
| * Manage my keys wizardDominik Schürmann2015-03-1923-160/+131
* | support yubikeys in (some) edit key operationsVincent Breitmoser2015-03-201-1/+2
* | yubikey certifications!Vincent Breitmoser2015-03-181-1/+1
|/
* Disable hidden recipients for nowDominik Schürmann2015-03-162-10/+10
* Allow for hidden recipients in encrypt methodsDominik Schürmann2015-03-163-2/+16
* Allow encrypt of filenames via overflow menuDominik Schürmann2015-03-163-5/+17
* Clarify certification help screenDominik Schürmann2015-03-161-2/+2
* Allow selection of none in SelectSignKeyIdActivityDominik Schürmann2015-03-151-0/+22
* Remove display of key id in other listsDominik Schürmann2015-03-151-1/+1
* Dont display key ids in KeySpinner, display creation date when user ids dupli...Dominik Schürmann2015-03-151-2/+2
* Improve file deletion stringsDominik Schürmann2015-03-121-3/+4
* Updated fix for Issue #1116Manoj Khanna2015-03-1120-54/+58
* Version 3.2beta2Dominik Schürmann2015-03-101-1/+2
* Pull from transifexDominik Schürmann2015-03-1071-1105/+1328
* Changelog 3.2beta1Dominik Schürmann2015-03-101-0/+14
* Remove unused NFC Beam htmlDominik Schürmann2015-03-1024-268/+0
* API 7Dominik Schürmann2015-03-103-76/+72
* RippleDominik Schürmann2015-03-1023-41/+39
* Merge branch 'contact-card' of https://github.com/adithyaphilip/open-keychain...Dominik Schürmann2015-03-102-5/+53
|\