-
Notifications
You must be signed in to change notification settings - Fork 43
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
8820042
commit 8f0a5c3
Showing
2 changed files
with
213 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,216 @@ | ||
| * 35b3a393 - (HEAD -> release/3.6.2, tag: develop-151, origin/develop, develop) Merge pull request #164 from tangem/CSK-311-fix_build_of_the_jvm-demo | ||
| * 8820042f - (HEAD -> release/3.7.0, tag: develop-184, origin/develop, develop) Merge pull request #211 from tangem/task/AND-2835-Add_Mandarinian_language_for_cardSdk | ||
| |\ | ||
| | * cf937734 - Merge branch 'develop' into CSK-311-fix_build_of_the_jvm-demo | ||
| | * 513d9f7a - Merge branch 'develop' into task/AND-2835-Add_Mandarinian_language_for_cardSdk | ||
| | |\ | ||
| | |/ | ||
| |/| | ||
| * | 79fa2395 - (tag: develop-150) Merge pull request #163 from tangem/master | ||
| / | ||
| * b6be5181 - CSK-311 fixed build of the jvm-demo | ||
| * | 5d5a50fc - (tag: develop-183) Merge pull request #208 from tangem/AND-2826-refactor_for_cross_platforms | ||
| |\ \ | ||
| | * | d2899442 - AND-2826 refactored for restore supporting cross platform projects | ||
| |/ / | ||
| | * ec1d45c7 - AND-2835 Add Mandarinian language for cardSdk | ||
| |/ | ||
| * 742c6b4a - (tag: develop-182) Merge pull request #209 from tangem/bugfix/AND-2846_codes_and_encryption | ||
| |\ | ||
| | * f8dea1dc - AND-2846: fix encryption for cards with user codes | ||
| |/ | ||
| * f0ce69e6 - (tag: develop-181) Merge pull request #207 from tangem/task/AND-2828-Sync_cardSdk_strings_with_Lokalise | ||
| |\ | ||
| | * 077502b9 - AND-2828 Sync cardSdk strings with Lokalise | ||
| |/ | ||
| * 1bf022b6 - (tag: develop-180) Merge pull request #206 from tangem/task/AND-2785_add_fields_file | ||
| |\ | ||
| | * 1eade98b - AND-2785: add fields to File and sync names | ||
| |/ | ||
| * a416f840 - (tag: develop-179) Merge pull request #205 from tangem/task/AND-2691_secp_sum | ||
| |\ | ||
| | * 90ac5333 - AND-2691 Add a method for a keys summarizing on the Secp256k1 curve | ||
| |/ | ||
| * f40a5b24 - (tag: develop-178) Merge pull request #204 from tangem/bugfix/AND-2686_increase_key_timeout | ||
| |\ | ||
| | * 31d2da60 - AND-2686 Increase the RSA key timeout | ||
| |/ | ||
| * df8b273b - (tag: develop-177) Merge pull request #203 from tangem/task/AND-2655_add_delete_access_codes_method | ||
| |\ | ||
| | * 15df0209 - AND-2655 By default, disallow requesting access codes from the repository | ||
| | * bb89b089 - AND-2655 Add the ability to delete user codes from the demo application | ||
| | * c77cf517 - AND-2655 Add a method to delete saved user codes | ||
| |/ | ||
| * 2e0e2f38 - (tag: develop-176) Merge pull request #202 from tangem/bugfix/AND-2647-handler-npe-fix | ||
| |\ | ||
| | * 0d891095 - Merge branch 'develop' into bugfix/AND-2647-handler-npe-fix | ||
| | |\ | ||
| | |/ | ||
| |/| | ||
| * | dd2cfbcf - (tag: develop-175) Merge pull request #201 from tangem/bugfix/AND-2634_set_allowed_authenticators | ||
| |\ \ | ||
| | * | 348e315c - AND-2634 Set allowed biometric authenticators | ||
| |/ / | ||
| | * e66e1e39 - AND-2647 handler NPE fix | ||
| |/ | ||
| * 9be026f6 - (tag: develop-174) Merge pull request #200 from tangem/bugfix/AND-2607_add_translations | ||
| |\ | ||
| | * 13b06a5e - AND-2608 Add translations for biometric prompt title | ||
| | |\ | ||
| * | \ ddbda29c - (tag: develop-173) Merge pull request #199 from tangem/task/AND-2545_asymmetric_cipher | ||
| |\ \ \ | ||
| | |/ / | ||
| |/| / | ||
| | |/ | ||
| | * 16ba2246 - AND-2545 Remove unused and refactoring | ||
| | * d11660d7 - AND-2545 Use asymmetric cipher for data keys | ||
| | * e7b4c3d8 - AND-2545 Disable access code requesting in backup tasks | ||
| |/ | ||
| * ca3e9dfc - (tag: develop-172) Merge pull request #198 from tangem/AND-2566-Sync_card_sdk_table | ||
| |\ | ||
| | * 80497030 - AND-2566 Sync card sdk table | ||
| |/ | ||
| * a5bcd6db - (tag: develop-171) Merge pull request #194 from tangem/AND-2433_check_whether_biometrics_can_be_enabled | ||
| |\ | ||
| | * 72b7467a - AND-2433 Check whether biometrics can be enabled | ||
| |/ | ||
| * d0b2ffa5 - (tag: develop-170) Merge pull request #181 from tangem/AND-1731_store_pin | ||
| |\ | ||
| | * 14c23082 - AND-1731 Review fixes | ||
| | * 6d91b603 - AND-1731 Add the ability to work with multiple biometric authorized keys | ||
| | * 1721949e - AND-1731 Review fixes | ||
| | * 8e5f764f - AND-2417 Logic for saving/deleting card access codes from SDK | ||
| | * e786ae54 - AND-2416 CompletionResult improvements | ||
| | * c7ace3e0 - AND-2416 TangemError refactoring | ||
| | * d2743222 - AND-1731 Fix after merge | ||
| | * 5add7904 - AND-2104 Lock the biometric storage after the end of the card session | ||
| | * de34fdee - AND-2106 Store card passcodes under biometric storage | ||
| | * 2b723d24 - AND-1731 Decrease a secret key timeout | ||
| | * fbf72822 - AND-1731 Do not save cards without access code | ||
| | * ea0f24bb - AND-1731 Add an access code request policy selector | ||
| | * 5b2e1ab4 - AND-1731 Use a fixed secret key timeout | ||
| | * 10409d38 - AND-1731 Fix tests | ||
| | * 40ca0ed9 - AND-1731 Store access codes in the biometric storage | ||
| |/ | ||
| * d94b53c9 - (tag: develop-169) Merge pull request #196 from tangem/bugfix/AND-2388-Change_PIN_there_is_no_error_messages | ||
| |\ | ||
| | * 0c369080 - AND-2388 Change PIN: there is no error messages if trying the set too short pin or if pins are different | ||
| |/ | ||
| * c7f57edd - (tag: develop-168) Merge pull request #195 from tangem/feature/AND-2474-Step1/Change_formatting_error_message | ||
| |\ | ||
| | * e6c2ba89 - AND-2474 Step 1 / Change formatting error message | ||
| |/ | ||
| * fc668d6e - (tag: develop-167) Merge pull request #193 from tangem/AND-2359-removed-dependency-with-legacy-support-library | ||
| |\ | ||
| | * e6ead60d - Merge branch 'develop' into AND-2359-removed-dependency-with-legacy-support-library | ||
| | |\ | ||
| | |/ | ||
| |/| | ||
| * | 7e36712b - (tag: develop-166) Merge pull request #192 from tangem/AND-2360_duplicate_values_in_tlvTag | ||
| |\ \ | ||
| | * | 54be2225 - AND-2360 removed jcenter | ||
| | * | 62b18acb - AND-2360 fixed: removed duplicate TlvTag.WriteFileMode(0x23) that overlaps with TlvTag.InteractionMode | ||
| |/ / | ||
| | * b8650a12 - AND-2360 removed jcenter | ||
| | * f61dbf65 - AND-2359 removed dependency with legacy support library | ||
| |/ | ||
| * 6a8d03ab - (tag: develop-165) Merge pull request #189 from tangem/AND-2148-add_more_customisation_options_3 | ||
| |\ | ||
| | * c91c4bc6 - AND-2284 add ability to hide cardId | ||
| | * e8243be1 - AND-2148 fixed cardId filters | ||
| | * c257766f - AND-2148 added more customisation options v2 | ||
| |/ | ||
| * 3e889119 - (tag: develop-164) Merge pull request #188 from tangem/AND-2148-add_more_customisation_options_3 | ||
| |\ | ||
| | * b4426b06 - AND-2148 added more customisation options | ||
| |/ | ||
| * 49f153db - (tag: develop-163) Merge pull request #186 from tangem/AND-2192-extend_attest_wallet | ||
| |\ | ||
| | * 8ef73fce - Merge branch 'develop' into AND-2192-extend_attest_wallet | ||
| | |\ | ||
| | |/ | ||
| |/| | ||
| * | ee8e9df1 - (tag: develop-162) Merge pull request #185 from tangem/AND-2191-implement_initOTP_command | ||
| |\ \ | ||
| | * | 0155c3de - AND-2191 added a GenerateOTPCommand | ||
| |/ / | ||
| | * edb9c5f1 - AND-2191 added confirmation to wallet attestation | ||
| |/ | ||
| * bfe143d0 - (tag: develop-161) Merge pull request #184 from tangem/AND-2101-add_NFC_location-samsug_a50 | ||
| |\ | ||
| | * 48711819 - Merge branch 'develop' into AND-2101-add_NFC_location-samsug_a50 | ||
| | |\ | ||
| | |/ | ||
| |/| | ||
| * | d7f98d19 - (tag: develop-160) Merge pull request #183 from tangem/AND-2077-incorrect_text_for_the_error_40502 | ||
| |\ \ | ||
| | * | 402629f0 - AND-2077 sync 40502 error message with ios | ||
| |/ / | ||
| | * 3c73f5e0 - AND-2101 added a nfc location for the samsung a50 | ||
| |/ | ||
| * 49addc76 - (tag: develop-159) Merge pull request #178 from tangem/AND-1918_progress_bar_not_showing_after_entering_access_pass_code | ||
| |\ | ||
| | * c6a72cdb - Merge branch 'develop' into AND-1918_progress_bar_not_showing_after_entering_access_pass_code | ||
| | |\ | ||
| | |/ | ||
| |/| | ||
| * | 6e222392 - (tag: develop-158) Merge pull request #179 from tangem/AND-1980-modify_text_for_the_error_WalletNotFound | ||
| |\ \ | ||
| | * | 27c29e59 - AND-1980 fixed text for the error WalletNotFound | ||
| |/ / | ||
| * | 1f4e7a8e - (tag: develop-157) Merge pull request #177 from tangem/AND-1916-improve_logs_readability | ||
| |\ \ | ||
| | * | 72740b1c - AND-1916 remove error logs if typeCheck failed for Card.SettingsMask and Card.Status | ||
| | * | b15b220b - AND-1916 fixed import | ||
| | * | fc0cd277 - AND-1916 improved logs readability | ||
| |/ / | ||
| | * 9bc1f720 - AND-1918 fixed typo upadteWidget... -> updateWidget... | ||
| | * a62add09 - AND-1918 fixed display of progress if the user entered the wrong pinCode several times | ||
| | * e6b256b6 - AND-1918 add a delay for the normal end animation of the SecurityDelay before displaying the PinRequested state | ||
| | * b84c8677 - AND-1918 show indeterminate progress on tagConnected if a previous state was PinRequested | ||
| | * f7179fa9 - AND-1918 fixed HapticFeedback | ||
| |/ | ||
| * 27ce9410 - (tag: develop-156) Merge pull request #174 from tangem/AND-1905-make_cardId_optional | ||
| |\ | ||
| | * e532ba82 - Merge branch 'develop' into AND-1905-make_cardId_optional | ||
| | |\ | ||
| | |/ | ||
| |/| | ||
| * | 9e033a1d - (tag: develop-155) Merge pull request #173 from tangem/AND-1897-demo-sign-custom-hash-with-selected-wallet | ||
| |\ \ | ||
| | * | a0884d20 - AND-1897 demo: simplify sign | ||
| | * | 42656bed - AND-1897 demo: user can sign only hashes in HEX format; added the ability to copy wallet publicKey to clipboard | ||
| | * | 1335691a - AND-1897 demo: added ability to sign custom/random hash/hashes; added ability to select a wallet | ||
| |/ / | ||
| | * 8cf0bcd9 - AND-1726 changed translation for error WalletNotFound | ||
| | * 24c90e56 - AND-1726 removed redundant line formatting | ||
| | * 2d545c10 - Imports fixed | ||
| | * 3f12697b - Imports fixed | ||
| | * 362e8302 - Imports fixed | ||
| | * aa933ea3 - Imports fixed | ||
| | * 44050c37 - Imports fixed | ||
| | * e0437fda - Imports fixed | ||
| | * f0c6dbf5 - Deleted tabulation | ||
| | * 19e074ea - Deleted tabulation | ||
| | * ecfc5810 - Deleted tabulation | ||
| | * e79c5b6c - Deleted tabulation | ||
| | * 1941eb7b - Changed files by comments by developers | ||
| | * d59dfd47 - Changed files by comments by developers | ||
| | * 55324b6e - Changed files by comments by developers | ||
| | * 7627f53a - Changed files by comments by developers | ||
| | * c7def5d4 - Changed files by comments by developers | ||
| | * d8fe234f - Merge branch 'develop' into feature/AND-1726_add_posibility_to_sign_by_any_cards | ||
| | |\ | ||
| | |/ | ||
| |/| | ||
| * | 3da4688e - (tag: develop-154) Merge pull request #167 from tangem/AND-1548_add_pin_lenght_check | ||
| |\ \ | ||
| | * | ddc5381e - AND-1548 Add PIN code length check | ||
| |/ / | ||
| | * 817f210e - AND-1726 Add posibility to sign by any cards of wallet | ||
| | * f9965850 - AND-1726 Add posibility to sign by any cards of wallet | ||
| |/ | ||
| * 711b2a95 - (tag: develop-153) Merge pull request #169 from tangem/feature/CSK-312_create_abstraction_of_tangem_sdk | ||
| |\ | ||
| | * 656a52fc - — TangemSdk.kt implementation is given to agreement | ||
| | * 19d91910 - — TangemSdk.kt implementation is given to agreement | ||
| | * 0840c917 - Fixed imports | ||
| | * d19a43ef - Fixed imports | ||
| | * d6e812f1 - CSK-312 Create abstraction for TangemSdkImpl.kt | ||
| |/ | ||
| * 7a507433 - (tag: develop-152) Merge pull request #166 from tangem/master |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 3.6.2 | ||
| 3.7.0 |