aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Expand)AuthorAgeFilesLines
* prevent crashes in EncryptKeyCompletionView (2)Vincent Breitmoser2015-10-261-10/+19
* Target SDK 23 and related fixesDominik Schürmann2015-10-264-26/+29
* Update stickylistheaders, html-textviewDominik Schürmann2015-10-261-7/+4
* Update tokenautocompleteDominik Schürmann2015-10-262-21/+20
* Update android-patternview, materialtabstrip, floatingactionbuttonDominik Schürmann2015-10-262-8/+8
* Update zxing-android-embedded with new custom activityDominik Schürmann2015-10-265-26/+108
* Version 3.6.1Dominik Schürmann2015-10-261-2/+2
* Pull from transifexDominik Schürmann2015-10-2633-127/+248
* import: move uri resolution into AsyncTask, prevent NetworkOnMainThreadExceptionVincent Breitmoser2015-10-262-49/+44
* decrypt: restart operation if interrupted by fragment recreationVincent Breitmoser2015-10-261-15/+12
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-10-262-18/+12
|\
| * Commit Github tokensDominik Schürmann2015-10-261-15/+6
* | fix FileHelper class for pre-lollipop devicesVincent Breitmoser2015-10-262-43/+86
|/
* https everywhereDominik Schürmann2015-10-251-4/+4
* linked: fix crash on <= lollipopVincent Breitmoser2015-10-251-3/+6
* inputdataoperation: guess filetype from filename for generic application/ mim...Vincent Breitmoser2015-10-233-3/+19
* import: use filesize from content provider on input uriVincent Breitmoser2015-10-231-3/+3
* decryptlist: use generic file icon for application/octet-streamVincent Breitmoser2015-10-231-0/+4
* 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-222-2/+14
* fix argument order screwup in FileHelperVincent Breitmoser2015-10-223-3/+3
* Remove unnecessary line in keybase fragmentDominik Schürmann2015-10-211-5/+0
* Fix keybase verificationDominik Schürmann2015-10-213-30/+17
* Update from transifexDominik Schürmann2015-10-2126-1544/+1310
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-10-2111-13/+85
|\
| * decrypt: special case single encrypted text -> directly display text, if not ...Vincent Breitmoser2015-10-211-0/+23
| * Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-10-212-6/+19
| |\
| * | encrypttext: localization, and truncate overlong inputVincent Breitmoser2015-10-212-3/+9
| * | encrypttext: handle input via Intent.EXTRA_STREAM in addition to Intent.EXTRA...Vincent Breitmoser2015-10-211-6/+34
| * | displaytextactivity: truncate displayed text if too longVincent Breitmoser2015-10-213-0/+13
| * | fix crash due to malformed log entryVincent Breitmoser2015-10-211-1/+1
| * | linked: fix colors for dark themeVincent Breitmoser2015-10-215-5/+5
| * | re-add accidentally deleted stringVincent Breitmoser2015-10-212-1/+3
* | | Improve file handling in TemporaryFileProviderDominik Schürmann2015-10-211-16/+21
| |/ |/|
* | SHA1 and RIPEMD160 are not declared insecure until widely deployedDominik Schürmann2015-10-211-2/+2
* | Use Github OAuth ID and secret from propertiesDominik Schürmann2015-10-211-4/+17
|/
* Integrate yubikey reset methodDominik Schürmann2015-10-163-6/+38
* UI preparations for yubikey resetDominik Schürmann2015-10-165-160/+248
* Remove default PIN settingDominik Schürmann2015-10-168-63/+1
* Clear cache when PIN is too shortDominik Schürmann2015-10-162-12/+7
* 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-165-7/+27
* Allow choosing of YubiKey PINDominik Schürmann2015-10-166-281/+116
* Add NFC reset methodDominik Schürmann2015-10-161-10/+46
* Remove debug logDominik Schürmann2015-10-151-1/+0
* Layout for backup code inputDominik Schürmann2015-10-151-0/+152
* Renaming export strings to backupDominik Schürmann2015-10-1517-163/+164
* Display backup code UI instead of passphrase on decryptDominik Schürmann2015-10-152-2/+58
* Check if backup code in passphrase dialogDominik Schürmann2015-10-153-0/+23