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

Meged latest changes from development into the resource manager feature branch #4006

Merged
merged 65 commits into from
Aug 23, 2020
Merged
Changes from 1 commit
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
622f695
Abstracted AllowIndex logic into TabInfo property
ajwaka Jul 9, 2020
edb7401
Fixes stylecop warnings in Foldermanager.cs
valadas Jul 13, 2020
4e90e24
Add InjectSvg property to Logo theme object
X3Technology Jul 6, 2020
39299ca
Move using statements inside namespace for DotNetNuke.Abstractions pr…
david-poindexter Jul 12, 2020
5ebc4b4
Delete 09.06.03.SqlDataProvider
valadas Jul 13, 2020
30d51f2
Update DNN Platform/Library/Services/FileSystem/FolderManager.cs
mitchelsellers Jul 13, 2020
8d89303
Update DNN Platform/Library/Services/FileSystem/FolderManager.cs
valadas Jul 13, 2020
877b9a8
Update DNN Platform/Library/Services/FileSystem/FolderManager.cs
valadas Jul 14, 2020
6e60d46
Update DNN Platform/Library/Services/FileSystem/FolderManager.cs
valadas Jul 14, 2020
263b0ef
Update DNN Platform/Library/Services/FileSystem/FolderManager.cs
valadas Jul 14, 2020
7cdedb9
Add IPortalSettings overloads to IEventLogController
bdukes Jul 14, 2020
9835b8a
Use new IPortalSettings overload in FolderManager
bdukes Jul 14, 2020
60b7187
fixed typo
Jul 15, 2020
d1754e7
Merge pull request #3909 from valadas/file-search
mitchelsellers Jul 15, 2020
5a39e65
Add TZ to page StartDate and EndDate
daguiler Jul 17, 2020
3e9d129
Merge pull request #3919 from daguiler/bugfix/DNN-33895
mitchelsellers Jul 18, 2020
91f0c7b
Visualizer not able to change settings in shared pages (#3917)
berkarslan-xo Jul 20, 2020
15c4f0a
Fix MVC NuGet package and improve devsite build script
donker Jul 11, 2020
034d3b7
Remove allowedVersions from packages.config
bdukes Jul 20, 2020
6d5d95b
Clean DotNetNuke.Web.Deprecated's NuGet pkgs
bdukes Jul 20, 2020
2a1aa85
Remove hardcoded dependency version numbers
bdukes Jul 20, 2020
7e31e57
Update Microsoft.AspNet.* from 3.1.1 to 3.1.2
bdukes Jul 20, 2020
63e3c2c
Fix improper System.Web.WebPages reference in DDR
bdukes Jul 21, 2020
faf11c4
Prevented unnecessary call to getCultureList method
tauqeer-haider Jul 22, 2020
0d3b931
Merge pull request #3898 from mathisjay/issue-3893
valadas Jul 23, 2020
936c994
inverted condition to reduce nesting
tauqeer-haider Jul 23, 2020
85530a2
Retry determining Globals.Status if it was Error
bdukes Jul 23, 2020
873fbcd
Merge pull request #3927 from bdukes/bug/issue-3926
valadas Jul 23, 2020
2c01c5e
Ensure DI services are disposed in WebForms
bdukes Jul 24, 2020
4309c61
Merge pull request #3930 from bdukes/di-webforms-dispose
mitchelsellers Jul 26, 2020
ac31b4b
Merge pull request #3923 from tauqeer-haider/bugfix/DNN-36092
mitchelsellers Jul 26, 2020
63ea5cd
Resolves a logging issue (#3936)
valadas Jul 27, 2020
9fd6b58
Add List-Services command to Prompt (#3932)
bdukes Jul 27, 2020
0415889
Merge pull request #3903 from ForemostMedia/develop
valadas Jul 27, 2020
a0efa45
Use Ordinal comparison for Boolean check (#3938)
bdukes Jul 27, 2020
89585f9
Deprecate TabInfo.TabPermissionsSpecified
bdukes Jul 28, 2020
da19702
Merge pull request #3941 from bdukes/deprecate-tab-permissions-specified
valadas Jul 28, 2020
abee49b
Address StyleCop warnings for TabInfo
bdukes Jul 28, 2020
c3ed984
Address StyleCop warnings for TabIndexer
bdukes Jul 28, 2020
cf09a4c
Merge pull request #3939 from bdukes/tabinfo-style-cop
valadas Jul 28, 2020
ba5145d
Updates versions as per release candidate creation
github-actions[bot] Jul 28, 2020
625645f
Update bug-report.md
valadas Jul 28, 2020
01dcbc3
Merge pull request #3943 from dnnsoftware/update-versions/patch-cf09a4c
valadas Jul 28, 2020
a648f35
Fixes a wrong merge conflict resolution that broke the pages module.
valadas Jul 29, 2020
d749960
DNN-42078 Password reset link does not expire after e-mail address ch…
mikebigun Jul 30, 2020
5d8147a
DNN-28527: prevent Role Groups dropdown expand on delete
daguiler Aug 1, 2020
07a3e51
Issue-3953 - Site alias URL edit fix
berkarslan-xo Aug 3, 2020
c7c5e72
Merge pull request #3952 from mikebigun/bugfix/DNN-42078
valadas Aug 4, 2020
541755b
Issue-3956 - Selected alias usage is respected now in SEO Url page
berkarslan-xo Aug 5, 2020
5c7d2b3
Issue-3956 - SQL file rename
berkarslan-xo Aug 5, 2020
7e165b6
DNN-42754: added retry to CompressionUtil.OpenCreate
daguiler Aug 7, 2020
10ed095
Merge pull request #3958 from dnnsoftware/release/9.7.0
valadas Aug 11, 2020
24ae60a
Merge branch 'develop' into bugfix/Issue-3956
berkarslan-xo Aug 14, 2020
59f5810
Issue-3982 - SEO Url redirect fix
berkarslan-xo Aug 14, 2020
dd4b618
Merge pull request #3957 from berkarslan-xo/bugfix/Issue-3956
valadas Aug 15, 2020
b098a16
Merge pull request #3950 from daguiler/bugfix/DNN-28527
valadas Aug 15, 2020
1642e97
Merge pull request #3965 from daguiler/bugfix/DNN-42754
mitchelsellers Aug 18, 2020
0bd8b22
Merge pull request #3983 from berkarslan-xo/bugfix/Issue-3982
mitchelsellers Aug 18, 2020
a2317ae
Created IApplicationInfo and IApplicationStatusInfo for Dependency In…
SkyeHoefling Aug 19, 2020
28ca797
Standardize on CR/LF line endings
bdukes Aug 19, 2020
1c80c06
Provide administrators role id to the test url page so it can be used…
donker Aug 19, 2020
7d4c9f4
Update mergeable to check for Status: On Hold label
david-poindexter Aug 19, 2020
02d369b
Merge pull request #4000 from david-poindexter/mergeable-status-on-hold
valadas Aug 19, 2020
61cd75c
Merge pull request #3998 from bdukes/end_of_line
mitchelsellers Aug 20, 2020
c151345
Merge branch 'develop' into mergedev
donker Aug 23, 2020
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
Prev Previous commit
Next Next commit
Issue-3953 - Site alias URL edit fix
  • Loading branch information
berkarslan-xo committed Aug 3, 2020
commit 07a3e511aaf02b300d0019547cc8532a5f6f4f6a
Original file line number Diff line number Diff line change
@@ -75,7 +75,10 @@ class EditUrl extends Component {
const {url, saving, pageHasParent, siteAliases, primaryAliasId, isOpened, onSave, onCancel} = this.props;
const aliases = this.getOptions(siteAliases);
const siteAliasUsageOptions = this.getSiteAliasUsageOptions(pageHasParent);
if (!this.state.hasChanges && url.siteAlias.Key !== primaryAliasId)
if (
!this.state.hasChanges &&
url.siteAlias.Key !== primaryAliasId &&
url.id == null)
{
this.props.onChange("siteAlias", primaryAliasId);
}