aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Expand)AuthorAgeFilesLines
...
| * added NetCipher as submoduleAdithya Abraham Philip2015-07-031-9/+0
| * added proxy typeAdithya Abraham Philip2015-07-033-7/+28
| * added proxy/tor preferencesAdithya Abraham Philip2015-07-033-0/+50
* | In NfcOperationsActivity, show NFC errors inline, in others show as NotifyDominik Schürmann2015-07-061-1/+40
|/
* Subtle design improvements to yubikey dialogDominik Schürmann2015-07-03113-27/+60
* New NFC dialog design with indeterminate progress, do NFC stuff in backgroundDominik Schürmann2015-07-034-23/+81
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-07-029-1/+2
|\
| * Merge pull request #1387 from ishit/masterDominik Schürmann2015-07-028-0/+0
| |\
| | * Change PassphraseEditAgain status icons.Ishit2015-07-028-0/+0
| * | prevent deletion of last keyserver in preferenceAdithya Abraham Philip2015-07-021-1/+2
* | | Change PIN and Admin PIN after move to key operationDominik Schürmann2015-07-021-1/+5
|/ /
* | reworked keyserver preferences with recyclerviewAdithya Abraham Philip2015-07-0215-89/+111
* | Add missing fragments for YubiKey PINsDominik Schürmann2015-07-012-0/+219
* | Add create key fragments for YubiKey PINsDominik Schürmann2015-07-011-0/+7
* | Merge branch 'master' of github.com:open-keychain/open-keychainAdithya Abraham Philip2015-06-30108-1530/+4447
|\ \
| * \ Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-06-301-3/+4
| |\ \
| | * | small layout fix in EncryptTextFragmentVincent Breitmoser2015-06-301-3/+4
| * | | Better settings workaroundsDominik Schürmann2015-06-301-2/+3
| |/ /
| * | earlier error on empty clipboardVincent Breitmoser2015-06-301-0/+1
| * | Update from transifexDominik Schürmann2015-06-3099-1517/+4347
| * | Update changelog for 3.3Dominik Schürmann2015-06-301-0/+7
| * | Create key wizard for blank YubiKeyDominik Schürmann2015-06-295-4/+81
| |/
| * cleanup share fragment, fix sharing of fingerprintVincent Breitmoser2015-06-291-1/+1
| * Remove html element in help_aboutDominik Schürmann2015-06-291-1/+1
| * Fix strings for transifexDominik Schürmann2015-06-291-2/+2
* | migrated Keybase verificationAdithya Abraham Philip2015-06-271-0/+9
|/
* Language: Remember instead of cachingDominik Schürmann2015-06-261-8/+8
* Merge remote-tracking branch 'origin/master' into v/multi-decryptVincent Breitmoser2015-06-267-3/+28
|\
| * use KeyAdapter for AllowedKeysListFragmentVincent Breitmoser2015-06-261-0/+22
| * Notification: follow design guidelines, fix #1313Dominik Schürmann2015-06-241-3/+6
| * New notify iconDominik Schürmann2015-06-2410-0/+0
| * New all-white status bar icon to fix issue #1356moparisthebest2015-06-225-0/+0
* | fix original file deletion (and instrumentation)Vincent Breitmoser2015-06-231-1/+1
* | implement deletion of filesVincent Breitmoser2015-06-2314-18/+22
* | implement saving of filesVincent Breitmoser2015-06-231-0/+2
* | instrument: adapt to new decrypt file dialog, and some minor fixesVincent Breitmoser2015-06-231-1/+1
* | move select file logic into EncryptDecryptOverviewFragmentVincent Breitmoser2015-06-222-26/+11
* | don't expose dataset for FileAdapter in encrypt view, small improvements to e...Vincent Breitmoser2015-06-2218-18/+19
* | order menu items for encrypt operationsVincent Breitmoser2015-06-223-6/+18
* | multi-decrypt: use indeterminate progress onlyVincent Breitmoser2015-06-222-50/+46
* | add failure state to DecryptListFragmentVincent Breitmoser2015-06-221-1/+49
* | instrument: update symmetric testsVincent Breitmoser2015-06-201-1/+0
* | fix overflow iconVincent Breitmoser2015-06-204-1/+1
* | drop clipboard backwards compatibility for api level < 11Vincent Breitmoser2015-06-2010-10/+12
* | allow encrypting to clipboard in EncryptFileFragmentVincent Breitmoser2015-06-201-0/+5
* | more work on decrypt fragment uxVincent Breitmoser2015-06-201-0/+4
* | working DisplayTextActivity, more input support in DecryptActivityVincent Breitmoser2015-06-201-4/+6
* | handle empty filename in decrypt listVincent Breitmoser2015-06-191-0/+1
* | handle EXTRA_TEXT in decrypt activityVincent Breitmoser2015-06-191-2/+3
* | Merge branch 'master' into v/multi-decryptVincent Breitmoser2015-06-181-0/+1
|\|