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.

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

SP-8555 tv os native message logo #358

Merged
merged 18 commits into from
Jan 27, 2022
Merged

Conversation

Nevazhnovu
Copy link
Collaborator

No description provided.

….swift; DocumentType changed to plain text in htmlToAttributedString in order to return text with no html markdown
…ssage_logo

* SP-8330_appletv_html_crash:
  linter-suggested minor fixes
  unit test implemented
  NSAttributedString file removed
  NSAttributedString extension changes reversed
  replaceHTMLTag(withAttributes) added to NSAttributedString extension
  stripOutHtml method which deletes any css/html tags added to SPString.swift; DocumentType changed to plain text in htmlToAttributedString in order to return text with no html markdown
@Nevazhnovu
Copy link
Collaborator Author

@andresilveirah applied linter-suggested fixes. This is the blocker branch. Pls check it out!

* develop:
  [SP-8236] "https://" is not included in SPPropertyName if it is already there (#357)
  SP-8288 ott unexpected response message endpoint (#353)
  SP-8346 fix old unit tests (#356)
  SP-8330 appletv html crash (#352)

# Conflicts:
#	ConsentViewController/Classes/SourcePointClient/GDPRPrivacyManagerViewResponse.swift
#	ConsentViewController/Classes/SourcePointClient/SPPrivacyManagerRequestResponse.swift
@Nevazhnovu
Copy link
Collaborator Author

Hey @andresilveirah ! I've merged develop branch in here so now PR has no conflicts & is consistent. Pls review!

Copy link
Member

@andresilveirah andresilveirah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀

@Nevazhnovu Nevazhnovu merged commit e615399 into develop Jan 27, 2022
@andresilveirah andresilveirah deleted the SP-8555_tvOS_native_message_logo branch February 1, 2022 15:51
Nevazhnovu added a commit that referenced this pull request Feb 4, 2022
* develop:
  SP-7877 ott UI testing (#355)
  update CHANGELOG
  update XCFramework
  bump version to 6.4.1
  move Objc project to cocoapods
  update spm version for SPMBuild Target
  add build SPM step to github test workflow
  import UIKit on Constants to fix SPM build
  namespace URL constants
  fix linting and namespace UI constants
  create SPMBuild app
  update XCFramework
  run pod install
  bump version to 6.4.0
  run pod install
  update CHANGELOG
  SP-8555 tv os native message logo (#358)

# Conflicts:
#	ConsentViewController/Classes/Constants.swift
#	ConsentViewController/Classes/SourcePointClient/GDPRPrivacyManagerViewResponse.swift
#	ConsentViewController/Classes/SourcePointClient/SPNativeUI.swift
#	ConsentViewController/Classes/SourcePointClient/SPPrivacyManagerRequestResponse.swift
#	ConsentViewController/Classes/Views/tvOS/NativePrivacyManager/Common/SPNativeScreenViewController.swift
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants