Merge changes back from main to this branch #152
Merged
Conversation
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
…ion (#150) * Potential fix for Incomplete URL substring sanitization question Only applies to detecting if it's onprem or online which leads to the presentation of a ribbon letting the user know it's onprem so it's very low risk however, using something that's more modern would be better. * Update logic for online/onprem root domain detection
* Updated new jquery backwards compatible libraries and removed json2 as it's no longer needed * Add files via upload * Updated js references * Delete mspfedyn_/OrgDbOrgSettings/Solution/Other/Relationships.xml * Delete mspfedyn_/OrgDbOrgSettings/Solution/WebResources/mspfedyn_/OrgDbOrgSettings/jquery1_11_0.js * Delete mspfedyn_/OrgDbOrgSettings/Solution/WebResources/mspfedyn_/OrgDbOrgSettings/jquery1_11_0.js.data.xml * Delete mspfedyn_/OrgDbOrgSettings/Solution/WebResources/mspfedyn_/OrgDbOrgSettings/json2.js.data.xml * Delete mspfedyn_/OrgDbOrgSettings/Solution/WebResources/mspfedyn_/OrgDbOrgSettings/json2.js * Update Solution.xml to remove two removed root components * update o$ reference as well as remove oJSON in favor of native JSON * Update orgDBOrgSettings.html * Update Solution.xml * remove trailing white spaces in files * Update XML structure in Customizations.xml
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.