Skip to content

Commit

Permalink
Fixed an issue where users module would not show user picture
Browse files Browse the repository at this point in the history
dnnsoftware#5630 Fixed a backend issue for a feature that was not available on Platform. This PR adds that display into the Users module

Additionally `Updates versions as per release candidate creation` github action stopped working somehow (I'll take a look into this) so running a build here caused all those versions to update too.

And finally `--colors` was removed from all the `watch` tasks as that option is no longer available in Webpack 5.
  • Loading branch information
valadas committed Jun 15, 2023
1 parent 998d052 commit f80eda8
Show file tree
Hide file tree
Showing 59 changed files with 153 additions and 125 deletions.
2 changes: 1 addition & 1 deletion Build/Symbols/DotNetNuke_Symbols.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DotNetNuke_Symbols" type="Library" version="09.11.02" >
<package name="DotNetNuke_Symbols" type="Library" version="09.12.00" >
<friendlyName>DNN Platform Symbols</friendlyName>
<description>This package contains Debug Symbols and Intellisense files for DNN Platform.</description>
<owner>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DotNetNuke.Console" type="Module" version="09.11.02">
<package name="DotNetNuke.Console" type="Module" version="09.12.00">
<friendlyName>Console</friendlyName>
<description>Display children pages as icon links for navigation.</description>
<iconFile>~/DesktopModules/Admin/Console/console.png</iconFile>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Connectors/Azure/AzureConnector.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="Dnn.AzureConnector" type="Connector" isSystem="false" version="09.11.02">
<package name="Dnn.AzureConnector" type="Connector" isSystem="false" version="09.12.00">
<friendlyName>Dnn Azure Connector</friendlyName>
<description>The Azure Connector allows you to integrate Azure as your commenting solution with the Publisher module.</description>
<iconFile>~/DesktopModules/Connectors/Azure/Images/icon-azure-32px.png</iconFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DNN.Connectors.GoogleAnalytics" type="Connector" isSystem="false" version="09.11.02">
<package name="DNN.Connectors.GoogleAnalytics" type="Connector" isSystem="false" version="09.12.00">
<friendlyName>Google Analytics Connector</friendlyName>
<description>Configure your sites Google Analytics settings.</description>
<iconFile>~/DesktopModules/Connectors/GoogleAnalytics/Images/GoogleAnalytics_32X32_Standard.png</iconFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DNN.Connectors.GoogleAnalytics4" type="Connector" isSystem="false" version="09.11.02">
<package name="DNN.Connectors.GoogleAnalytics4" type="Connector" isSystem="false" version="09.12.00">
<friendlyName>Google Analytics 4 Connector</friendlyName>
<description>Configure your sites Google Analytics 4 settings.</description>
<iconFile>~/DesktopModules/Connectors/GoogleAnalytics4/Images/GoogleAnalytics4_32X32_Standard.png</iconFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DNN.Connectors.GoogleTagManager" type="Connector" isSystem="false" version="09.11.02">
<package name="DNN.Connectors.GoogleTagManager" type="Connector" isSystem="false" version="09.12.00">
<friendlyName>Google Tag Manager Connector</friendlyName>
<description>Configure your sites Google Tag Manager settings.</description>
<iconFile>~/DesktopModules/Connectors/GoogleTagManager/Images/GoogleTagManager_32X32_Standard.png</iconFile>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DNNJWT" type="Provider" version="09.11.02">
<package name="DNNJWT" type="Provider" version="09.12.00">
<friendlyName>DNN JWT Auth Handler</friendlyName>
<description>DNN Json Web Token Authentication (JWT) library for cookie-less Mobile authentication clients</description>
<dependencies/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DotNetNuke.ClientAPI" type="Library" version="09.11.02" >
<package name="DotNetNuke.ClientAPI" type="Library" version="09.12.00" >
<friendlyName>DotNetNuke ClientAPI</friendlyName>
<description>The DotNetNuke Client API is composed of both server-side and client-side code that works together to enable a simple and reliable interface for the developer to provide a rich client-side experience.</description>
<dependencies/>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Modules/CoreMessaging/CoreMessaging.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="6.0">
<packages>
<package name="DotNetNuke.Modules.CoreMessaging" type="Module" isSystem="true" version="09.11.02">
<package name="DotNetNuke.Modules.CoreMessaging" type="Module" isSystem="true" version="09.12.00">
<friendlyName>Message Center</friendlyName>
<description>Core Messaging module allows users to message each other.</description>
<iconFile>~/DesktopModules/CoreMessaging/Images/messaging_32X32.png</iconFile>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Modules/DDRMenu/DDRMenu.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DDRMenu" type="Module" isSystem="true" version="09.11.02">
<package name="DDRMenu" type="Module" isSystem="true" version="09.12.00">
<friendlyName>DDR Menu</friendlyName>
<description>DotNetNuke Navigation Provider.</description>
<owner>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="SiteExportImport" type="Library" isSystem="false" version="09.11.02">
<package name="SiteExportImport" type="Library" isSystem="false" version="09.12.00">
<friendlyName>Site Export Import</friendlyName>
<description>DotNetNuke Corporation Site Export Import Library</description>
<iconFile>Images/Files_32x32_Standard.png</iconFile>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Modules/Groups/SocialGroups.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="Social Groups" type="Module" isSystem="true" version="09.11.02">
<package name="Social Groups" type="Module" isSystem="true" version="09.12.00">
<friendlyName>Social Groups</friendlyName>
<description>DotNetNuke Corporation Social Groups module</description>
<iconFile>~/DesktopModules/SocialGroups/Images/Social_Groups_32X32.png</iconFile>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Modules/HTML/dnn_HTML.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DNN_HTML" type="Module" version="09.11.02">
<package name="DNN_HTML" type="Module" version="09.12.00">
<friendlyName>HTML</friendlyName>
<description>This module renders a block of HTML or Text content. The Html/Text module allows authorized users to edit the content either inline or in a separate administration page. Optional tokens can be used that get replaced dynamically during display. All versions of content are stored in the database including the ability to rollback to an older version.</description>
<iconFile>DesktopModules\HTML\Images\html.png</iconFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="6.0">
<packages>
<package name="DotNetNuke.HtmlEditorManager" type="Module" version="09.11.02" >
<package name="DotNetNuke.HtmlEditorManager" type="Module" version="09.12.00" >
<friendlyName>Html Editor Management</friendlyName>
<iconFile>Images/HtmlEditorManager_Standard_32x32.png</iconFile>
<description>A module used to configure toolbar items, behavior, and other options used in the DotNetNuke HtmlEditor Provider.</description>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Modules/Journal/Journal.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="Journal" type="Module" isSystem="true" version="09.11.02">
<package name="Journal" type="Module" isSystem="true" version="09.12.00">
<friendlyName>Journal</friendlyName>
<description>DotNetNuke Corporation Journal module</description>
<iconFile>DesktopModules/Journal/Images/journal_32X32.png</iconFile>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Modules/MemberDirectory/MemberDirectory.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="6.0">
<packages>
<package name="DotNetNuke.Modules.MemberDirectory" type="Module" isSystem="true" version="09.11.02">
<package name="DotNetNuke.Modules.MemberDirectory" type="Module" isSystem="true" version="09.12.00">
<friendlyName>Member Directory</friendlyName>
<description>The Member Directory module displays a list of Members based on role, profile property or relationship.</description>
<iconFile>~/DesktopModules/MemberDirectory/Images/member_list_32X32.png</iconFile>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Modules/RazorHost/Manifest.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="{0}" type="Module" isSystem="true" version="09.11.02">
<package name="{0}" type="Module" isSystem="true" version="09.12.00">
<friendlyName>{0}</friendlyName>
<description>{1}</description>
<owner>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Modules/RazorHost/RazorHost.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DNNCorp.RazorHost" type="Module" version="09.11.02" >
<package name="DNNCorp.RazorHost" type="Module" version="09.12.00" >
<friendlyName>Razor Host</friendlyName>
<description>The Razor Host module allows developers to host Razor Scripts.</description>
<owner>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dnn-resource-manager",
"version": "9.11.2",
"version": "9.12.0",
"description": "Resource Manager",
"private": true,
"main": "dist/index.cjs.js",
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Modules/ResourceManager/ResourceManager.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="6.0">
<packages>
<package name="ResourceManager" type="Module" version="09.11.02">
<package name="ResourceManager" type="Module" version="09.12.00">
<friendlyName>Resource Manager</friendlyName>
<description>This module allows you to manage files on the server</description>
<iconFile>~/Images/icon_filemanager_32px.gif</iconFile>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Modules/TelerikRemoval/TelerikRemoval.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="6.0">
<packages>
<package name="TelerikRemoval" type="Module" version="09.11.02">
<package name="TelerikRemoval" type="Module" version="09.12.00">
<friendlyName>Telerik Removal</friendlyName>
<description>This module allows you to remove the DotNetNuke Telerik Web Components library from your site.</description>
<owner>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DNN_FacebookAuthentication" type="Auth_System" version="09.11.02" >
<package name="DNN_FacebookAuthentication" type="Auth_System" version="09.12.00" >
<friendlyName>DotNetNuke Facebook Authentication Project</friendlyName>
<description>The DotNetNuke Facebook Authentication Project is an Authentication provider for DotNetNuke that uses
Facebook authentication to authenticate users.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DNN_GoogleAuthentication" type="Auth_System" version="09.11.02" >
<package name="DNN_GoogleAuthentication" type="Auth_System" version="09.12.00" >
<friendlyName>DotNetNuke Google Authentication Project</friendlyName>
<description>The DotNetNuke Google Authentication Project is an Authentication provider for DotNetNuke that uses
Google authentication to authenticate users.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DNN_LiveAuthentication" type="Auth_System" version="09.11.02" >
<package name="DNN_LiveAuthentication" type="Auth_System" version="09.12.00" >
<friendlyName>DotNetNuke Live Authentication Project</friendlyName>
<description>
The DotNetNuke Live Authentication Project is an Authentication provider for DotNetNuke that uses
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DNN_TwitterAuthentication" type="Auth_System" version="09.11.02" >
<package name="DNN_TwitterAuthentication" type="Auth_System" version="09.12.00" >
<friendlyName>DotNetNuke Twitter Authentication Project</friendlyName>
<description>
The DotNetNuke Twitter Authentication Project is an Authentication provider for DotNetNuke that uses
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider" type="Provider" isSystem="true" version="09.11.02">
<package name="DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider" type="Provider" isSystem="true" version="09.12.00">
<friendlyName>DotNetNuke Simple Web Farm Caching Provider</friendlyName>
<description>DotNetNuke Simple Web Farm Caching Provider</description>
<dependencies/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="AspNetClientCapabilityProvider" type="Provider" version="09.11.02">
<package name="AspNetClientCapabilityProvider" type="Provider" version="09.12.00">
<friendlyName>DotNetNuke ASP.NET Client Capability Provider</friendlyName>
<description>ASP.NET Device Detection / Client Capability Provider</description>
<iconFile>~/Providers/ClientCapabilityProviders/AspNetClientCapabilityProvider/Images/mobiledevicedet_32X32.png</iconFile>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Providers/FolderProviders/FolderProviders.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DotNetNuke.Providers.FolderProviders" type="Provider" isSystem="true" version="09.11.02">
<package name="DotNetNuke.Providers.FolderProviders" type="Provider" isSystem="true" version="09.12.00">
<friendlyName>DotNetNuke Folder Providers</friendlyName>
<description>Azure Folder Providers for DotNetNuke.</description>
<dependencies/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<dotnetnuke type="Package" version="5.0">
<packages><package name="DNNConnect.CKEditorProvider" type="Provider" version="09.11.02">
<packages><package name="DNNConnect.CKEditorProvider" type="Provider" version="09.12.00">
<friendlyName>CKEditor Provider</friendlyName>
<description>CKEditor Provider for DNN</description>
<iconFile>~/Providers/HtmlEditorProviders/DNNConnect.CKE/LogoCKEditor.png</iconFile>
Expand Down
4 changes: 2 additions & 2 deletions DNN Platform/Skins/Xcillion/DNN_Skin_Xcillion.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="1.0">
<packages>
<package name="Skin.Xcillion" type="Skin" version="09.11.02">
<package name="Skin.Xcillion" type="Skin" version="09.12.00">
<friendlyName>Xcillion</friendlyName>
<iconFile></iconFile>
<description><![CDATA[A new default DNN skin]]></description>
Expand Down Expand Up @@ -29,7 +29,7 @@
</component>
</components>
</package>
<package name="Container.Xcillion" type="Container" version="09.11.02">
<package name="Container.Xcillion" type="Container" version="09.12.00">
<friendlyName>Xcillion</friendlyName>
<iconFile></iconFile>
<description><![CDATA[DNN container]]></description>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/************************************************************/
/***** SqlDataProvider *****/
/***** *****/
/***** *****/
/***** Note: To manually execute this script you must *****/
/***** perform a search and replace operation *****/
/***** for {databaseOwner} and {objectQualifier} *****/
/***** *****/
/************************************************************/
6 changes: 3 additions & 3 deletions Dnn.AdminExperience/ClientSide/AdminLogs.Web/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "admin-logs",
"version": "9.11.2",
"version": "9.12.0",
"private": true,
"scripts": {
"build": "set NODE_ENV=production&&webpack --mode production",
"debug": "set NODE_ENV=debug&&webpack --mode production",
"watch": "set NODE_ENV=debug & webpack --mode=development --progress --colors --watch",
"watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch",
"lint": "eslint --fix"
},
"devDependencies": {
Expand All @@ -14,7 +14,7 @@
"@babel/plugin-transform-object-assign": "^7.0.0",
"@babel/preset-env": "^7.1.6",
"@babel/preset-react": "^7.0.0",
"@dnnsoftware/dnn-react-common": "9.11.2",
"@dnnsoftware/dnn-react-common": "9.12.0",
"array.prototype.find": "2.0.4",
"array.prototype.findindex": "2.0.2",
"babel-loader": "8.0.6",
Expand Down
6 changes: 3 additions & 3 deletions Dnn.AdminExperience/ClientSide/Bundle.Web/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "export-bundle",
"version": "9.11.2",
"version": "9.12.0",
"private": true,
"scripts": {
"build": "set NODE_ENV=production&&webpack --mode production --progress",
"debug": "set NODE_ENV=debug&&webpack --mode production --progress",
"watch": "set NODE_ENV=debug & webpack --mode=development --progress --colors --watch",
"watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch",
"analyze": "set NODE_ENV=production&&webpack --config webpack.config.js --profile --json > stats.json&&webpack-bundle-analyzer stats.json",
"lint": "eslint --fix"
},
Expand Down Expand Up @@ -66,6 +66,6 @@
"webpack-dev-server": "4.11.1"
},
"dependencies": {
"@dnnsoftware/dnn-react-common": "9.11.2"
"@dnnsoftware/dnn-react-common": "9.12.0"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dnnsoftware/dnn-react-common",
"version": "9.11.2",
"version": "9.12.0",
"description": "DNN React Component Library",
"main": "dist/dnn-react-common.min.js",
"repository": {
Expand Down
6 changes: 3 additions & 3 deletions Dnn.AdminExperience/ClientSide/Extensions.Web/package.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"name": "extensions",
"version": "9.11.2",
"version": "9.12.0",
"private": true,
"scripts": {
"build": "set NODE_ENV=production&&webpack --mode production",
"debug": "set NODE_ENV=debug&&webpack --mode production",
"watch": "set NODE_ENV=debug & webpack --mode=development --progress --colors --watch",
"watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch",
"analyze": "set NODE_ENV=production&&webpack --mode production --json | webpack-bundle-size-analyzer"
},
"devDependencies": {
"@babel/core": "^7.2.0",
"@babel/preset-env": "^7.2.0",
"@babel/preset-react": "^7.0.0",
"@dnnsoftware/dnn-react-common": "9.11.2",
"@dnnsoftware/dnn-react-common": "9.12.0",
"babel-loader": "8.0.6",
"babel-plugin-transform-object-assign": "6.22.0",
"babel-plugin-transform-object-rest-spread": "6.26.0",
Expand Down
6 changes: 3 additions & 3 deletions Dnn.AdminExperience/ClientSide/Licensing.Web/package.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"name": "licensing",
"version": "9.11.2",
"version": "9.12.0",
"private": true,
"scripts": {
"build": "set NODE_ENV=production&&webpack --mode production",
"debug": "set NODE_ENV=debug&&webpack --mode production",
"watch": "set NODE_ENV=debug & webpack --mode=development --progress --colors --watch",
"watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch",
"analyze": "set NODE_ENV=production&&webpack --mode production --json | webpack-bundle-size-analyzer"
},
"devDependencies": {
"@babel/core": "^7.1.6",
"@babel/preset-env": "^7.1.6",
"@babel/preset-react": "^7.0.0",
"@dnnsoftware/dnn-react-common": "9.11.2",
"@dnnsoftware/dnn-react-common": "9.12.0",
"array.prototype.find": "2.0.4",
"array.prototype.findindex": "2.0.2",
"babel-loader": "8.0.6",
Expand Down
6 changes: 3 additions & 3 deletions Dnn.AdminExperience/ClientSide/Pages.Web/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "pages",
"version": "9.11.2",
"version": "9.12.0",
"private": true,
"scripts": {
"start": "npm run webpack",
"test": "jest",
"test:watch": "jest --watch",
"build": "set NODE_ENV=production&&webpack --mode production",
"debug": "set NODE_ENV=debug&&webpack --mode production",
"watch": "set NODE_ENV=debug & webpack --mode=development --progress --colors --watch",
"watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch",
"analyze": "set NODE_ENV=production&&webpack --mode production --json | webpack-bundle-size-analyzer",
"lint": "eslint --fix"
},
Expand All @@ -23,7 +23,7 @@
"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
"@babel/preset-env": "^7.1.6",
"@babel/preset-react": "^7.0.0",
"@dnnsoftware/dnn-react-common": "9.11.2",
"@dnnsoftware/dnn-react-common": "9.12.0",
"@types/knockout": "^3.4.66",
"@types/redux": "3.6.31",
"babel-eslint": "^10.0.1",
Expand Down
Loading

0 comments on commit f80eda8

Please sign in to comment.