aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | 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-214-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
* | Support backupVersion ASCII Armor headerDominik Schürmann2015-10-158-25/+95
* | File ending consisitency for backupsDominik Schürmann2015-10-153-7/+15
* | Cleanup, fix advanced sharingDominik Schürmann2015-10-1511-237/+100
* | Remove debug codeDominik Schürmann2015-10-153-11/+3
* | Mime type consistencyDominik Schürmann2015-10-157-18/+19
* | Use correct filename when sharing backupDominik Schürmann2015-10-151-8/+8
* | Rename TemporaryStorageProvider to TemporaryFileProvider, use interface for d...Dominik Schürmann2015-10-1514-63/+71
* | Show the Internal Storage menu item on openFileDominik Schürmann2015-10-151-4/+4
* | Add restore to backup fragment, cleanup, renamingsDominik Schürmann2015-10-156-20/+80
* | Rename DrawerBackupFragment to BackupRestoreFragmentDominik Schürmann2015-10-152-3/+3
* | Cleanup in BackupCodeFragmentDominik Schürmann2015-10-151-16/+14
* | Fix drawer selection for backupDominik Schürmann2015-10-151-1/+1
* | Layout consistency for backup fragmentDominik Schürmann2015-10-154-435/+373
* | Unify backup filenameDominik Schürmann2015-10-152-4/+5
* | Dont force OpenKeychain in open with for pgp-keysDominik Schürmann2015-10-151-1/+1
* | Open decrypted application/pgp-keys only in OpenKeychainDominik Schürmann2015-10-151-2/+7
* | Merge branch 'master' into encrypted-exportVincent Breitmoser2015-10-094-39/+83
|\ \
| * | Revert "viewkeyactivity: ask for passphrase for backup only if key has one"Vincent Breitmoser2015-10-091-29/+3
| * | fix variable name mistake (wth did I commit there?!)Vincent Breitmoser2015-10-091-2/+2