aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Expand)AuthorAgeFilesLines
...
| * | 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
|\|
| * more stable nullable behavior in OperationLogVincent Breitmoser2015-06-181-0/+1
* | handle multiple input URIs and Intent.SEND_MULTIPLEVincent Breitmoser2015-06-181-1/+1
* | Merge branch 'master' into v/multi-decryptVincent Breitmoser2015-06-171-0/+1
|\|
| * fix rest of resource leaks (#1351)Vincent Breitmoser2015-06-171-0/+1
* | Merge branch 'v/instrument' into v/multi-decryptVincent Breitmoser2015-06-175-58/+43
|\|
| * nicer preview of decrypt_text_fragment layoutVincent Breitmoser2015-06-171-0/+3
| * use KeyAdapter in KeySpinnerVincent Breitmoser2015-06-172-57/+19
| * improve preview of ViewKeyActivity layoutVincent Breitmoser2015-06-171-1/+10
| * (minor) layout changesVincent Breitmoser2015-06-171-1/+2
| * add ToolableViewAnimatorVincent Breitmoser2015-06-171-0/+4
| * Merge pull request #1338 from josecastillo/developmentVincent2015-06-121-0/+11
| |\
| | * Replace AssertionErrors with snackbar notifications, fix style issues.Joey Castillo2015-06-111-8/+11
| | * Improved smart card error handlingJoey Castillo2015-06-101-0/+8
| * | Merge remote-tracking branch 'origin/master' into v/eventbusVincent Breitmoser2015-06-112-2/+2
| |\|
* | | fix status icon alignmentVincent Breitmoser2015-06-141-0/+2