Merge pull request #101 from UpendoVentures/dev

Releasing 1.4.0
UpendoVentures · Oct 23, 2024 · f74bcb2 · f74bcb2
2 parents 800ca23 + 2b773a1
commit f74bcb2
Show file tree

Hide file tree

Showing 16 changed files with 1,275 additions and 690 deletions.
diff --git a/Build/SolutionReferences.targets b/Build/SolutionReferences.targets
@@ -22,7 +22,7 @@ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 -->
 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <DnnVersion>09.09.00</DnnVersion>
+    <DnnVersion>09.11.00</DnnVersion>
     <HccVersion>03.06.00</HccVersion>
     <ReferencesPath>..\..\References</ReferencesPath>
     <DnnReferencePath>$(ReferencesPath)\DNN\$(DnnVersion)</DnnReferencePath>

diff --git a/Modules/UserManager/App_LocalResources/BulkDelete.resx b/Modules/UserManager/App_LocalResources/BulkDelete.resx
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AlreadyDeletedPreviously.Text" xml:space="preserve">
+    <value>Already Deleted Previously:</value>
+  </data>
+  <data name="BulkDeleteUserAccounts.Text" xml:space="preserve">
+    <value>Bulk Delete User Accounts</value>
+  </data>
+  <data name="DeleteUsers.Text" xml:space="preserve">
+    <value>Delete Users</value>
+  </data>
+  <data name="DeletionResults.Text" xml:space="preserve">
+    <value>Deletion Results</value>
+  </data>
+  <data name="EnterUserIDsCommaSeparated.Text" xml:space="preserve">
+    <value>Enter User IDs (comma-separated):</value>
+  </data>
+  <data name="InvalidUserID.Text" xml:space="preserve">
+    <value>Invalid User ID</value>
+  </data>
+  <data name="InvalidUserIDs.Text" xml:space="preserve">
+    <value>Invalid User IDs:</value>
+  </data>
+  <data name="MarkedAsDeleted.Text" xml:space="preserve">
+    <value>Marked as Deleted:</value>
+  </data>
+  <data name="MarkedDeleted.Text" xml:space="preserve">
+    <value>marked as deleted.</value>
+  </data>
+  <data name="NotFound.Text" xml:space="preserve">
+    <value>not found.</value>
+  </data>
+  <data name="NotFoundLog.Text" xml:space="preserve">
+    <value>Not Found:</value>
+  </data>
+  <data name="OnlySuperusersCanPerformThisAction.Text" xml:space="preserve">
+    <value>Only superusers can perform this action</value>
+  </data>
+  <data name="OperationSummary.Text" xml:space="preserve">
+    <value>Operation Summary</value>
+  </data>
+  <data name="PermanentDelete.Text" xml:space="preserve">
+    <value>Permanent Delete:</value>
+  </data>
+  <data name="PermanentlyDeleted.Text" xml:space="preserve">
+    <value>permanently deleted.</value>
+  </data>
+  <data name="Reset.Text" xml:space="preserve">
+    <value>Reset</value>
+  </data>
+  <data name="SummaryOfOperationsPermanentlyDeleted.Text" xml:space="preserve">
+    <value>Summary of operations: Permanently Deleted:</value>
+  </data>
+  <data name="ThisUserAlreadyBeenDeletedPreviously.Text" xml:space="preserve">
+    <value>has already been previously deleted.</value>
+  </data>
+  <data name="ToMaintainPerformanceControls.Text" xml:space="preserve">
+    <value>To maintain performance controls, the number of user accounts that can be deleted at a time is 3000.</value>
+  </data>
+  <data name="User.Text" xml:space="preserve">
+    <value>User</value>
+  </data>
+  <data name="WithID.Text" xml:space="preserve">
+    <value>with ID:</value>
+  </data>
+</root>
diff --git a/Modules/UserManager/App_LocalResources/Index.resx b/Modules/UserManager/App_LocalResources/Index.resx
@@ -126,6 +126,9 @@
   <data name="BtnCreateUser.Text" xml:space="preserve">
     <value>Create User</value>
   </data>
+  <data name="BulkDeleteUser.Text" xml:space="preserve">
+    <value>Bulk Delete User</value>
+  </data>
   <data name="CreateRole.Text" xml:space="preserve">
     <value>Create Role</value>
   </data>

diff --git a/Modules/UserManager/App_LocalResources/Shared.resx b/Modules/UserManager/App_LocalResources/Shared.resx
@@ -174,4 +174,10 @@
   <data name="EditingSiteRoles.Text" xml:space="preserve">
     <value>Editing Site Roles</value>
   </data>
+  <data name="Delete.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="OnlySuperUserIsAllowedBulkDeleteUserAccounts.Text" xml:space="preserve">
+    <value>Only a superuser is allowed to bulk delete user accounts</value>
+  </data>
 </root>