aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Expand)AuthorAgeFilesLines
...
* Pull from transifexDominik Schürmann2015-11-2348-421/+3509
* Fix strings, thanks to Alain-OlivierDominik Schürmann2015-11-238-33/+33
* Revert "Add first time wizard for sync settings"Dominik Schürmann2015-11-232-86/+1
* Add first time wizard for sync settingsDominik Schürmann2015-11-232-1/+86
* Show notification when READ_CONTACTS permission is denied in sync service, hi...Dominik Schürmann2015-11-236-0/+2
* Request contact permission in settings for contact linkingDominik Schürmann2015-11-231-4/+4
* Handle denied storage permission, use ContentResolver.SCHEME_FILE constantDominik Schürmann2015-11-191-0/+1
* Merge pull request #1543 from rohands/issue_mouseover_hintsVincent2015-11-163-1/+12
|\
| * Class names and string names are updatedrohands2015-09-223-9/+11
| * Updatedrohands2015-09-202-1/+6
| * Mousehintsrohands2015-09-201-0/+4
* | Merge branch 'master' into v/decrypt-key-lookupVincent Breitmoser2015-11-1550-153/+348
|\ \
| * | decrypt: skip all encountered marker packets (fix #1582)Vincent Breitmoser2015-11-151-1/+0
| * | decrypt: skip unavailable and unsuitable keysVincent Breitmoser2015-11-131-0/+2
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-11-082-0/+16
| |\ \
| | * | bench: add simple s2k benchmark (iterations for 100ms)Vincent Breitmoser2015-11-041-2/+4
| | * | bench: run ops multiple times and for an average timeVincent Breitmoser2015-11-041-0/+2
| | * | Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-11-0410-4/+20
| | |\ \
| | * | | bench: simple working benchmarkVincent Breitmoser2015-11-041-0/+5
| | * | | bench: add benchmark operation for testingVincent Breitmoser2015-11-042-0/+7
| * | | | Cleanup settings activityDominik Schürmann2015-11-081-10/+0
| | |/ / | |/| |
| * | | Support for Android 6 ACTION_PROCESS_TEXTDominik Schürmann2015-11-028-0/+9
| * | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-11-022-2/+30
| |\| |
| | * | keylist: add "search for query" button to empty viewVincent Breitmoser2015-11-022-2/+30
| * | | Fix API 23 regression for activities without layout, see http://stackoverflow...Dominik Schürmann2015-11-022-4/+11
| |/ /
| * | use Proxy.NO_PROXY instead of null value for no proxyVincent Breitmoser2015-10-291-1/+1
| * | uploadop: clean up, add loggingVincent Breitmoser2015-10-292-8/+15
| * | Target SDK 23 and related fixesDominik Schürmann2015-10-261-0/+3
| * | Update android-patternview, materialtabstrip, floatingactionbuttonDominik Schürmann2015-10-261-1/+1
| * | Update zxing-android-embedded with new custom activityDominik Schürmann2015-10-261-0/+13
| * | Pull from transifexDominik Schürmann2015-10-2633-127/+248
| * | https everywhereDominik Schürmann2015-10-251-4/+4
* | | decryptlist: re-decrypt after key lookupVincent Breitmoser2015-10-231-0/+2
* | | decryptlist: implement key lookup (wip)Vincent Breitmoser2015-10-231-13/+40
|/ /
* | inputdataoperation: guess filetype from filename for generic application/ mim...Vincent Breitmoser2015-10-231-0/+1
* | More space for backup codeDominik Schürmann2015-10-221-11/+10
* | Sync changelog with transifexDominik Schürmann2015-10-2219-0/+228
* | Version 3.6, Changelog 3.6Dominik Schürmann2015-10-221-0/+12
* | Remove unnecessary line in keybase fragmentDominik Schürmann2015-10-211-5/+0
* | Fix keybase verificationDominik Schürmann2015-10-212-10/+0
* | Update from transifexDominik Schürmann2015-10-2126-1544/+1310
* | encrypttext: localization, and truncate overlong inputVincent Breitmoser2015-10-211-1/+3
* | displaytextactivity: truncate displayed text if too longVincent Breitmoser2015-10-211-0/+2
* | linked: fix colors for dark themeVincent Breitmoser2015-10-215-5/+5
* | re-add accidentally deleted stringVincent Breitmoser2015-10-211-0/+1
* | UI preparations for yubikey resetDominik Schürmann2015-10-163-129/+180
* | Remove default PIN settingDominik Schürmann2015-10-162-10/+1
* | nfc dialog: button placeholder to retain sizeDominik Schürmann2015-10-161-2/+24
* | Prevent nfc dialog from closing when touching outside of it, add cancel buttonDominik Schürmann2015-10-162-1/+11
* | Allow choosing of YubiKey PINDominik Schürmann2015-10-163-126/+34