Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update develop branch with master after release #177

Merged
merged 2 commits into from
May 6, 2022
Merged

Update develop branch with master after release #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bba9acd
Prepare release version 3.3.2
mobile-tangem May 6, 2022
b4438f0
Merge pull request #176 from tangem/release/3.3.2
tureck1y May 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 13 additions & 53 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,57 +1,17 @@
* 8f70e3f - (HEAD -> release/3.3.1, tag: develop-141, origin/develop, develop) Merge pull request #169 from tangem/CSS-231_detached_batches_update
* 10f5fab - (HEAD -> release/3.3.2, tag: develop-144, origin/develop, develop) Merge pull request #175 from tangem/IOS-1612_update_files
|\
| * 0b5d09b - CSS-231 Update detached batches
| * 5e638d1 - IOS-1612 Update example's build
| * c8269b3 - IOS-1612 Update example's build
| * d7ee136 - IOS-1612 Update example to public files
| * 8743b1f - IOS-1612 Clean example
| * 06857e1 - IOS-1612 Update example
| * 8a4fdba - IOS-1612 Clean
| * 1ecf9e1 - IOS-1612 Refactoring
| * ca31333 - IOS-1612 Write named files support
|/
* b157dac - (tag: develop-140) Merge pull request #168 from tangem/CSS-320_crashfix
* 8e2741b - (tag: develop-143) Merge pull request #174 from tangem/master_to_develop
|\
| * 48de61f - CSS-320 Crashfix on rescanning after wrong card tapped
| * f066a47 - Merge branch 'master' into master_to_develop
|/
* e39338f - (tag: develop-139) Merge pull request #167 from tangem/CSS-319_fix_presentation_issues
|\
| * 0d193b3 - CSS-319 Presentation crashfix
|/
* 894a836 - (tag: develop-138) Merge pull request #166 from tangem/CSS-318_backup_batch_check
|\
| * c9eaa76 - Merge branch 'develop' into CSS-318_backup_batch_check
| |\
| |/
|/|
* | eb3714a - (tag: develop-137) Merge pull request #165 from tangem/CSS-317_bls_signing
|\ \
| | * 38c3a00 - CSS-318 Check batches during backup process
| |/
| * 7e49efb - CSS-317 Add BLS support for signing
|/
* 61d59b0 - (tag: develop-136) Merge pull request #164 from tangem/CSS-316_localizations
|\
| * 3cafecd - CSS-316 Minor localization fixes
* | e40ee1b - (tag: develop-135) Merge pull request #163 from tangem/CSS-313_distinguish_backup_wallet_error
|\|
| * af9349c - CSS-313 Add individual localization for backupFailedNotEmptyWallets
|/
* 7122b39 - (tag: develop-134) Merge pull request #162 from tangem/CSS-315_fix_defatlt_alert_message
|\
| * edf52ed - CSS-315 Fix default alert message after tag lost
|/
* d76f842 - (tag: develop-133) Merge pull request #161 from tangem/CSS-314_skip_default_pin_check
|\
| * 6d01dec - CSS-314 Skip pin length check for default pin
|/
* 878e14e - (tag: develop-132) Merge pull request #160 from tangem/CSS-312_ru_locale
|\
| * 9711e5a - CSS-312 Update localized strings
|/
* 06bf86e - (tag: develop-131) Merge pull request #159 from tangem/CSS-309_min_pin_length
|\
| * dd52f8a - CSS-309 Refactor constant and localization
| * bdab97a - CSS-309 Fix codecheck
| * bb097da - CSS-309 Extract constant
| * 7f4c72f - CSS-309 Add more trimming
| * 049fb9c - CSS-309 Rectrict code length
|/
* cef43e2 - (tag: develop-130) Merge pull request #158 from tangem/CSS-310-add-convenience-methods-for-signing-with-ed-25519-and-secp-256-r-1
|\
| * 6b489e2 - CSS-310 Add hashing for ed25519
| * 14a12ac - CSS-310 Added convenience methods to sign a piece of data
|/
* 40621e8 - (tag: develop-129) Merge pull request #157 from tangem/master
* 81acf7e - (tag: develop-142) Merge pull request #173 from tangem/IOS-1611-missing-commas
* 7c15e91 - Add missing commas to localizable string
2 changes: 1 addition & 1 deletion TangemSdk.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

Pod::Spec.new do |s|
s.name = 'TangemSdk'
s.version = '3.3.1'
s.version = '3.3.2'
s.summary = 'Use TangemSdk for Tangem cards integration'

# This description is used to generate tags and improve search results.
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.1
3.3.2