aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/LuboViluda/open-keychain into ↵Dominik Schürmann2016-04-293-4/+75
|\ | | | | | | LuboViluda-master
| * unnecesary code removedLubo Viluda2016-04-122-7/+0
| | | | | | | | | | - setContentView removed - R.layout.redirect_import_keys_activity.xml removed
| * Unnecesary code removed and string repairedLubo Viluda2016-04-124-11/+4
| | | | | | | | | | | | | | - Unnecesary import from RedirectImportKeyActivity.java removed - ..\value-w820dp\dimens.xml was unnecesary - \..value\dimens.xml unnecasary line - string sources repaired
| * Activity renamedLubo Viluda2016-04-041-2/+2
| | | | | | | | Activity renamed from startScanActivity to startQrCodeCaptureActivity
| * Changed activity during RedirectKeysActivityLubo Viluda2016-04-041-6/+1
| | | | | | | | QrCodeCaptureActivity is open instead ImportKeysActivity
| * Theme changeLubo Viluda2016-03-242-2/+1
| | | | | | | | Theme.Keychain.Transparet is used
| * upgrade of Redirect import activityLubo Viluda2016-03-245-98/+38
| | | | | | | | | | | | | | -> RedirectImportActivity is transparent now -> some poinlessly data removed -> String moved into sources -> xml for activity simplified
| * #1661 - Don't expose CertifyActivityLubo Viluda2016-03-206-5/+156
| | | | | | | | | | | | | | *Add new activity - RedirectImportKeysActivity, which prompts user to use Openkeychain directly *Add intent filter for the activity *Change intent filter for CertifyActivity
* | Use StringBuilder.append() according to lintDominik Schürmann2016-04-291-2/+6
| |
* | Re-enable move-to-card option, improve stringsDominik Schürmann2016-04-295-96/+88
| |
* | Include only add button in dropdown widthDominik Schürmann2016-04-291-2/+2
| |
* | Merge branch 'Issue#925' of https://github.com/007durgesh219/open-keychain ↵Dominik Schürmann2016-04-293-1/+36
|\ \ | | | | | | | | | into 007durgesh219-Issue#925
| * | Add + button besides TokenAutoComplete, Issue #925Durgesh2016-04-143-1/+36
| | | | | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com>
* | | Merge pull request #1816 from fiaxh/no_name_choose_emailDominik Schürmann2016-04-294-9/+49
|\ \ \ | | | | | | | | Correctly handle keys only having an email address
| * | | Better handle user_id sidecases while splittingfiaxh2016-04-123-5/+45
| | | |
| * | | Use email field to match email in KeychainProviderfiaxh2016-04-121-4/+4
| | | | | | | | | | | | | | | | fixes #1699
* | | | Merge pull request #1831 from fiaxh/key_creation_flexibleDominik Schürmann2016-04-297-85/+67
|\ \ \ \ | | | | | | | | | | Handle user input on key creation more generously
| * | | | Handle user input on key creation more generouslyfiaxh2016-04-157-85/+67
| | | | | | | | | | | | | | | | | | | | | | | | | Allow empty name and do not regex-check email fixes #1825
* | | | | Merge pull request #1832 from 007durgesh219/WrongCachedFileEncryptDominik Schürmann2016-04-291-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix Wrong file encrypted from cached input
| * | | | | Fix Wrong file encrypted from cached inputDurgesh2016-04-151-0/+2
| | |_|/ / | |/| | | | | | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com>
* | | | | Update more librariesDominik Schürmann2016-04-291-39/+38
| | | | |
* | | | | Update build config, gitignore after testingDominik Schürmann2016-04-291-5/+4
| | | | |
* | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2016-04-295-43/+91
|\ \ \ \ \
| * | | | | api: allow caching of sessionKey in OpenPgpDecryptResultVincent Breitmoser2016-04-295-43/+91
| | | | | |
* | | | | | Update libraries, add proguard filters to be under 64K limitDominik Schürmann2016-04-293-67/+66
|/ / / / /
* | | | | Version 3.9.5Dominik Schürmann2016-04-291-2/+2
| | | | |
* | | | | New translations from transifexDominik Schürmann2016-04-2960-660/+2222
| | | | |
* | | | | Fix stringsDominik Schürmann2016-04-181-2/+2
| | | | |
* | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2016-04-1812-29/+48
|\ \ \ \ \
| * \ \ \ \ Merge pull request #1835 from nmikhailov/check_security_tokenDominik Schürmann2016-04-1612-29/+48
| |\ \ \ \ \ | | | | | | | | | | | | | | Check security token
| | * | | | | Check subkey id instead of masterkey id on security token operationsNikita Mikhailov2016-04-162-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename ambiguous getMasterKeyFingerprint -> getKeyFingerprint
| | * | | | | Check if security token keys match required once before signing/decryptionNikita Mikhailov2016-04-163-5/+22
| | | | | | |
| | * | | | | Update obsolete Nfc class prefixesNikita Mikhailov2016-04-169-24/+24
| | | | | | |
* | | | | | | Fix delete_failDominik Schürmann2016-04-182-2/+3
|/ / / / / /
* / / / / / Fix stringDominik Schürmann2016-04-161-1/+1
|/ / / / /
* | | | | OTG: Rename smartcard -> security tokenNikita Mikhailov2016-04-156-34/+34
| | | | |
* | | | | OTG: Skip TokenWaitFragmen when otg device is connectedNikita Mikhailov2016-04-153-11/+27
| | | | |
* | | | | OTG: Fix connection issuesNikita Mikhailov2016-04-153-24/+17
| | | | |
* | | | | OTG: Replace colons with dashes in usb error messagesNikita Mikhailov2016-04-141-8/+8
| | | | |
* | | | | OTG: rename Smartcard -> SecurityTokenNikita Mikhailov2016-04-1413-129/+127
| | | | |
* | | | | OTG: rescan devices before next operationNikita Mikhailov2016-04-143-19/+58
| | | | |
* | | | | OTG: Add copyrightNikita Mikhailov2016-04-141-0/+17
| | | | |
* | | | | OTG: fix icc powering methodNikita Mikhailov2016-04-141-1/+1
| | | | |
* | | | | OTG: Add/Update copyrightsNikita Mikhailov2016-04-1410-0/+143
| | | | |
* | | | | OTG: Remove obsolete Pin classes, reenable changeKey methodNikita Mikhailov2016-04-144-93/+24
| | | | |
* | | | | OTG: move UsbConnectionDispatcher to utls packageNikita Mikhailov2016-04-143-11/+7
| | | | |
* | | | | OTG: UsbTransport minor refactoringNikita Mikhailov2016-04-141-11/+22
| | | | |
* | | | | OTG: Add/update javadoc; rename methods, exceptionsNikita Mikhailov2016-04-148-115/+173
| | | | |
* | | | | OTG: refactor, change nfc prefix to smartcardNikita Mikhailov2016-04-148-72/+73
| | | | |
* | | | | OTG: Refactor persistent connections, namingNikita Mikhailov2016-04-149-118/+132
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 04:00:17 +0000