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

Merges latest changes from 9.4.x into development #3366

Merged
merged 54 commits into from
Dec 3, 2019
Merged
Changes from 1 commit
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
6d758e3
Do not store these portal settings when setting their property on the…
donker Sep 27, 2019
c634984
Merge branch 'release/9.4.x' into refactorps
donker Oct 2, 2019
0d0d4ac
Removed DnnHttpControllerActivator and added DependencyResolver imple…
SkyeHoefling Oct 23, 2019
f104d23
Added xml comments for the new DnnDependencyResolver
SkyeHoefling Oct 23, 2019
05ca850
Added DnnDependencyResolver Unit Tests
SkyeHoefling Oct 23, 2019
6d5b0b9
Replaced IServiceProvider mock with full IServiceProvider implementat…
SkyeHoefling Oct 23, 2019
9c9051c
Added more unit tests for the DnnDependencyResolver to cover GetServi…
SkyeHoefling Oct 23, 2019
588a005
Do not show "No Search results" message when no search is performed. …
Oct 25, 2019
6cec560
Revision of build process part 1 (#3137)
donker Oct 25, 2019
7e74fa6
Make white-space visible in log viewer (#3198)
bdukes Oct 27, 2019
4937d6c
DNN-34236: check the url with case insensitive.
zyhfish Oct 25, 2019
2f0bd6a
Merge pull request #3208 from zyhfish/bug/DNN-34236-v9.4.x
mitchelsellers Oct 28, 2019
68aea30
Merge pull request #3033 from donker/refactorps
mitchelsellers Oct 29, 2019
ecfef18
DNN-29417 Username is changed to email address in the user profile if…
mikebigun Mar 12, 2019
ce3feb7
Fix to installer and the dependencies of the HTML and DA modules
donker Oct 30, 2019
2fcc926
DNN-24945 - Always redirect to the source portal page after creating …
tingung Nov 1, 2019
ae55b6c
Fix Typo (#3234)
thabaum Nov 4, 2019
ee69192
Improve querystring parse (#3242)
donker Nov 5, 2019
8151da2
Improve input checking of sites (#3243)
donker Nov 5, 2019
213bb26
Fixes an upgrade issue that affects 9.4.1 => 9.4.2 upgrades (#3282)
valadas Nov 12, 2019
0dd5bad
Further reorganization of build process (#3236)
donker Nov 13, 2019
ea34bfa
Fixes #3168 Test Sending Email Issues (#3237)
thabaum Nov 13, 2019
44a90f4
DNN-29110 Site Assets > Select All is not working (#3251)
mikebigun Nov 13, 2019
1dc7504
Moves Remember Login above Login Button: referenced in issue #2471 #…
thabaum Nov 13, 2019
6a935af
DNN-34250 Search is not working even after re-Indexing Search for All…
mikebigun Nov 13, 2019
6a95aa4
DNN-32474 - Recursive delete option is added (#3249)
berkarslan-xo Nov 14, 2019
1542329
Move Country Above Region in UserProfile.cs
thabaum Nov 5, 2019
87873db
spacing issue resolved.
thabaum Nov 10, 2019
0538739
I keep saving but github is moving it on its own.
thabaum Nov 10, 2019
f2da547
Fixed tab for spaces to resolve spacing issues
valadas Nov 14, 2019
130e751
Add PortalSettings overloads back (#3295)
bdukes Nov 14, 2019
772a165
Updates issue templates as per 9.4.2 release
valadas Nov 15, 2019
f3f2062
Move Email Above Username in User.ascx #3305 (#3306)
thabaum Nov 17, 2019
17ee31e
Fix NuGet warning NU5048 (#3304)
bdukes Nov 17, 2019
30bfa5f
Word-Break added to Journal P (#3307)
thabaum Nov 18, 2019
42c3d97
Set core object versions to core version (#3287)
donker Nov 18, 2019
a272b1c
Third installment of build reorganization (#3285)
donker Nov 18, 2019
47fd4da
Fix ModuleSettings > Added to Pages grid, pager wasn't working
Jul 18, 2019
05e5ada
Allow only alphanumeric characters to be used when forming url from w…
donker Nov 19, 2019
ed01969
Ensure UpdateDnnManifests doesn't run for building dev site (#3314)
donker Nov 20, 2019
37ed73f
Reload page when the code tells you to (#3315)
donker Nov 20, 2019
f455856
Google Analytics TrackingID is stored in lowercase #3318 (#3322)
coretoco Nov 20, 2019
a613be2
Update sums.resources
valadas Nov 21, 2019
89c96f4
Fix casing mismatch errors in security analyzer file compare
donker Nov 21, 2019
5cdf428
Merge pull request #3325 from valadas/issue/3324
mitchelsellers Nov 22, 2019
7d47298
Update Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensio…
donker Nov 22, 2019
5215a67
Registered IPersonaBarContainer with DI (#3329)
daguiler Nov 22, 2019
271e735
Document approval process and group
donker Nov 22, 2019
f214e17
Merge branch 'release/9.4.x' into fix-sec-analyzer
donker Nov 22, 2019
c0e836a
Fix typo
donker Nov 22, 2019
94543b5
Merge pull request #3334 from donker/doc
mitchelsellers Nov 22, 2019
4c62b14
Merge pull request #3326 from donker/fix-sec-analyzer
mitchelsellers Nov 22, 2019
dbeb24c
Relaxed nuget.cake wildcard (#3331)
daguiler Nov 22, 2019
034c272
Merge remote-tracking branch 'dnnsoftware/release/9.4.x' into develop…
bdukes Dec 3, 2019
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
Move Country Above Region in UserProfile.cs
  • Loading branch information
thabaum authored and bdukes committed Nov 14, 2019
commit 1542329d535d4c7e9613b39a07654dd7c707973c
4 changes: 2 additions & 2 deletions DNN Platform/Library/Entities/Users/Profile/UserProfile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ public class UserProfile : IIndexable
public const string USERPROFILE_Unit = "Unit";
public const string USERPROFILE_Street = "Street";
public const string USERPROFILE_City = "City";
public const string USERPROFILE_Region = "Region";
public const string USERPROFILE_Country = "Country";
public const string USERPROFILE_PostalCode = "PostalCode";
public const string USERPROFILE_Region = "Region";
public const string USERPROFILE_PostalCode = "PostalCode";

//Phone contact
public const string USERPROFILE_Telephone = "Telephone";
Expand Down