aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values/strings.xml
Commit message (Expand)AuthorAgeFilesLines
* Merge keybase-proof branchDominik Schürmann2015-02-271-0/+58
|\
| * Check fingerprint match between proof & databaseTim Bray2014-11-221-0/+1
| * Merge branch 'development' into keybase-proofsDominik Schürmann2014-11-211-4/+5
| |\
| * | Prevent multiple cloud-trust-search launches. Handle DNS query failure grace...Tim Bray2014-11-191-0/+1
| * | In the ImportKeysList display, arrange for Keybase UserIDs to sort below the ...Tim Bray2014-11-181-0/+1
| * | All keybase proofs now in placeTim Bray2014-11-111-0/+7
| * | Moved from WebView to Spannables, some proof cleanup tooTim Bray2014-11-071-0/+48
* | | Fingerprint verification, design fixes for qr code cardDominik Schürmann2015-02-261-0/+5
* | | Dont show verification icons in my key view, hide edit button for non-secret ...Dominik Schürmann2015-02-251-1/+3
* | | CardView and more header designDominik Schürmann2015-02-251-0/+1
* | | First work on new key view toolbarDominik Schürmann2015-02-251-2/+5
* | | Refactor AppsListFragmentDominik Schürmann2015-02-231-1/+0
* | | move a string in the safe slinger activity to resourcesŁukasz Stelmach2015-02-211-0/+1
* | | determine correct filesize during decryption from LiteralData packetVincent Breitmoser2015-02-171-0/+1
* | | Move encrypt decrypt operations in own starter activityDominik Schürmann2015-02-031-4/+6
* | | Toolbar fixes, Toolbar under status bar on LollipopDominik Schürmann2015-02-031-1/+2
* | | rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-011-23/+37
* | | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-01-311-0/+1
|\ \ \
| * | | Saving of allowed keysDominik Schürmann2015-01-291-0/+1
* | | | prevent recursive consolidateVincent Breitmoser2015-01-311-0/+1
|/ / /
* | | Merge remote-tracking branch 'origin/t/snackbar' into developmentDominik Schürmann2015-01-291-1/+1
|\ \ \
| * | | use Notify helper everywhere, replace supertoasts with snackbar libraryVincent Breitmoser2015-01-191-1/+1
* | | | Merge branch 'development' into detached-sigs-apiDominik Schürmann2015-01-271-0/+2
|\ \ \ \
| * | | | backend support for charset in ascii-armored streamsVincent Breitmoser2015-01-271-0/+1
| * | | | move last parts of import logic from kis into operationVincent Breitmoser2015-01-261-0/+1
* | | | | Temporary nav drawer fixesDominik Schürmann2015-01-271-0/+1
|/ / / /
* | | | Material Design: Full screen dialogsDominik Schürmann2015-01-261-1/+1
* | | | introduce PromoteKeyOperation to create dummy secret from public keysVincent Breitmoser2015-01-251-0/+7
* | | | work on divert-to-key and other keyring stuffVincent Breitmoser2015-01-251-0/+2
|/ / /
* | | Toolbar for settingsDominik Schürmann2015-01-141-1/+1
* | | Integrate QR Code library instead of requiring the app to be installed, also ...Dominik Schürmann2015-01-141-0/+1
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-01-141-0/+1
|\ \ \
| * | | small fixes to user attribute handlingVincent Breitmoser2015-01-141-0/+1
* | | | Fix SearchViewDominik Schürmann2015-01-141-0/+1
|/ / /
* | | actually import user attributes (though they are not shown anywhere yet)Vincent Breitmoser2015-01-141-0/+17
* | | support addition of user attributesVincent Breitmoser2015-01-131-0/+3
* | | add support for user attributes (during canonicalization)Vincent Breitmoser2015-01-121-1/+16
* | | OpenPGP instead of PGPDominik Schürmann2015-01-071-5/+5
* | | PIn not pin passphraseDominik Schürmann2015-01-071-1/+1
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-01-061-13/+31
|\ \ \
| * | | make certify routines more robust (#1016)Vincent Breitmoser2015-01-031-0/+1
| * | | add more descriptive string about non-mdc encrypted dataVincent Breitmoser2015-01-031-0/+1
| * | | encapsulate high level edit key into new operation classVincent Breitmoser2015-01-031-0/+8
| * | | deal with non-existent user ids during import (#994)Vincent Breitmoser2015-01-021-6/+7
| * | | extend canonicalize to strip local certificates on exportVincent Breitmoser2015-01-021-6/+8
| * | | small improvements regarding pin tests and loggingVincent Breitmoser2015-01-011-1/+3
| * | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-12-301-3/+3
| |\ \ \
| * | | | add PIN as a SecretKeyTypeVincent Breitmoser2014-12-301-0/+2
| * | | | introduce handling of notation direct key signatures, and experimental pin no...Vincent Breitmoser2014-12-301-1/+3
| | |_|/ | |/| |
* | | | Passphrase wizard testsDominik Schürmann2015-01-061-0/+27
| |/ / |/| |