aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Expand)AuthorAgeFilesLines
* change HttpsEditText to generic PrefixEditTextVincent Breitmoser2015-04-253-4/+14
* fix encrypt activity layoutVincent Breitmoser2015-04-241-1/+3
* revamp decrypt uiVincent Breitmoser2015-04-244-81/+44
* use CryptoOperationFragment for linked id fragments, and some warning cleanupVincent Breitmoser2015-04-242-4/+8
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-24135-1276/+2044
|\
| * Fix YubiKey naming, cleanupDominik Schürmann2015-04-151-5/+5
| * Pull from transifexDominik Schürmann2015-04-14110-1110/+1555
| * Merge pull request #1193 from adithyaphilip/auto-refresh-contactsDominik Schürmann2015-04-131-0/+1
| |\
| | * hide linked system contact card if no contact presentAdithya Abraham Philip2015-04-081-0/+1
| * | Rename advanced to extendedDominik Schürmann2015-03-311-7/+7
| * | From passphrase to passwordDominik Schürmann2015-03-311-47/+47
| * | Simplify passphrase dialog designDominik Schürmann2015-03-312-2/+1
| * | Merge branch 'v/crypto-input-parcel' of github.com:open-keychain/open-keychai...Vincent Breitmoser2015-03-303-63/+60
| |\ \
| | * | Fix scrollbarDominik Schürmann2015-03-301-0/+1
| | * | Use RecyclerView in EncryptFilesFragmentDominik Schürmann2015-03-303-63/+59
| * | | fix Encrypt* with RequiredInputParcelVincent Breitmoser2015-03-301-1/+0
| |/ /
| * | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-303-13/+23
| |\|
| * | Fix strings with email addressDominik Schürmann2015-03-291-2/+2
| * | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-291-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
| |\ \ \
| * | | | 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
| |\ \ \ \
| * | | | | 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
| |\ \ \ \ \
| * | | | | | support yubikeys in (some) edit key operationsVincent Breitmoser2015-03-201-1/+2
| * | | | | | yubikey certifications!Vincent Breitmoser2015-03-181-1/+1
* | | | | | | minor ui and wording changesVincent Breitmoser2015-04-092-8/+20
* | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-09191-7866/+9359
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-303-13/+23
| | |_|_|_|/ | |/| | | |
| * | | | | -Fixed a situation where additional emails could be duplicated when creating ...Daniel Ramos2015-03-271-0/+1
| | |_|_|/ | |/| | |
| * | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-27 18:33:46 +0000