Update to 12 - #3891
Closed
HEBPartnerNetDeveloper wants to merge 38 commits into
Closed
Conversation
…ere with a view that shows jSon text response
…re/MergeLatestUpdate_7_3 # Conflicts: # libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFOAuthCoordinator.m
…date_7_3 Chore/merge latest SF sdk update 7.3
…alesforce-sdk PNETM-416: Upgrade Salesforce SDK to 8.1
…config Adding the ability to provide a config file on sdk initialization.
…ileSDK-iOS # Conflicts: # libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SalesforceSDKManager.m # libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFOAuthCoordinator.m
…nelogin-app-scheme PMA 792 - Allowed for OneLogin app scheme to be handled by the OS
…repo-changes PMA 1312 - Sync PNet Repo Changes
pma-705: Fixing a crash issue on the sdk.
# Conflicts: # libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SalesforceSDKManager.m
removing line of code that doesn't allow for a custom config
Forgot to commit a change to fix the import #import "SalesforceSDKCore/SalesforceSDKCore-Swift.h"
…ceSDKCore-import Fix SalesforceSDKCore Import
PMA 2270 - Patching access token bug
# Conflicts: # libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFOAuthCoordinator.m # libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Views/SFSDKWindowManager.m # libs/SalesforceSDKCore/SalesforceSDKCoreTests/SFSDKWindowManagerTests.m
Rebasing master
# Conflicts: # libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SalesforceSDKManager.m # libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFOAuthCoordinator.m
# Conflicts: # libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFOAuthCoordinator.m
|
Thanks for the contribution! Before we can merge this, we need @rlisle @jo-heb to sign the Salesforce Inc. Contributor License Agreement. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.