Skip to content
This repository has been archived by the owner on Jan 19, 2021. It is now read-only.

Commit

Permalink
merged conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
erwinvanhunen committed Apr 10, 2020
2 parents 40a0c30 + 7db4f8d commit 9c513c7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
- Connect-PnPOnline with clientid and certificate will now, if API permissions have been granted for the Graph work with the PnP Graph Cmdlets. [PR # 2515](https://github.com/SharePoint/PnP-PowerShell/pull/2515)
- Save-PnPProvisioningTemplate and Save-PnPTenantTemplate now support XML file as input without the need to first read them into a variable with Read-PnPProvisioningTemplate or Read-PnPTenantTemplate
- Added -Schema parameter to Save-PnPProvisioningTemplate and Save-PnPTenantTemplate to force a specific schema for the embedded template. If not specified it defaults always to the latest released template.
- Fixed using `Connect-PnPOnline -PnPO365ManagementShell` only working if your default system language is English [PR #2613](https://github.com/SharePoint/PnP-PowerShell/pull/2613)
- Updated help text of 'Get-PnPClientSidePage' and 'Get-PnPClientSideComponent' to indicate that the out of the box homepage of a modern site will not return its contents as designed [PR #2592]https://github.com/SharePoint/PnP-PowerShell/pull/2592)
- Fixed using `Connect-PnPOnline -PnPO365ManagementShell` not working in PowerShell ISE [PR # 2590](https://github.com/SharePoint/PnP-PowerShell/pull/2590)
- Uploading files using `Add-PnPFile` no longer requires Site Owner rights on the entire site. Read rights on the site and at least contribute rights on the document library where the file needs to be uploaded to will suffice as long as the target folder already exists. [PR # 2478](https://github.com/SharePoint/PnP-PowerShell/pull/2478)
Expand Down
2 changes: 1 addition & 1 deletion Commands/Utilities/BrowserHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public static void OpenBrowser(string url, Action<bool> success, System.Drawing.
};
browser.Navigated += (sender, args) =>
{
if(browser.DocumentText.Contains("You have signed in to the PnP Office 365 Management Shell application on your device. You may now close this window."))
if(browser.Url.AbsoluteUri.Equals("https://login.microsoftonline.com/common/login", StringComparison.InvariantCultureIgnoreCase) || browser.Url.AbsoluteUri.StartsWith("https://login.microsoftonline.com/common/reprocess", StringComparison.InvariantCultureIgnoreCase))
{
form.Close();
success(true);
Expand Down

0 comments on commit 9c513c7

Please sign in to comment.