Skip to content

Commit f74bcb2

Browse files
WillStrohlWillStrohl
authored
Merge pull request #101 from UpendoVentures/dev
Releasing 1.4.0
2 parents 800ca23 + 2b773a1 commit f74bcb2

16 files changed

+1275
-690
lines changed

‎Build/SolutionReferences.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2222
-->
2323
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2424
<PropertyGroup>
25-
<DnnVersion>09.09.00</DnnVersion>
25+
<DnnVersion>09.11.00</DnnVersion>
2626
<HccVersion>03.06.00</HccVersion>
2727
<ReferencesPath>..\..\References</ReferencesPath>
2828
<DnnReferencePath>$(ReferencesPath)\DNN\$(DnnVersion)</DnnReferencePath>

‎Modules/UserManager/App_LocalResources/BulkDelete.resx

+183
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,183 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<data name="AlreadyDeletedPreviously.Text" xml:space="preserve">
121+
<value>Already Deleted Previously:</value>
122+
</data>
123+
<data name="BulkDeleteUserAccounts.Text" xml:space="preserve">
124+
<value>Bulk Delete User Accounts</value>
125+
</data>
126+
<data name="DeleteUsers.Text" xml:space="preserve">
127+
<value>Delete Users</value>
128+
</data>
129+
<data name="DeletionResults.Text" xml:space="preserve">
130+
<value>Deletion Results</value>
131+
</data>
132+
<data name="EnterUserIDsCommaSeparated.Text" xml:space="preserve">
133+
<value>Enter User IDs (comma-separated):</value>
134+
</data>
135+
<data name="InvalidUserID.Text" xml:space="preserve">
136+
<value>Invalid User ID</value>
137+
</data>
138+
<data name="InvalidUserIDs.Text" xml:space="preserve">
139+
<value>Invalid User IDs:</value>
140+
</data>
141+
<data name="MarkedAsDeleted.Text" xml:space="preserve">
142+
<value>Marked as Deleted:</value>
143+
</data>
144+
<data name="MarkedDeleted.Text" xml:space="preserve">
145+
<value>marked as deleted.</value>
146+
</data>
147+
<data name="NotFound.Text" xml:space="preserve">
148+
<value>not found.</value>
149+
</data>
150+
<data name="NotFoundLog.Text" xml:space="preserve">
151+
<value>Not Found:</value>
152+
</data>
153+
<data name="OnlySuperusersCanPerformThisAction.Text" xml:space="preserve">
154+
<value>Only superusers can perform this action</value>
155+
</data>
156+
<data name="OperationSummary.Text" xml:space="preserve">
157+
<value>Operation Summary</value>
158+
</data>
159+
<data name="PermanentDelete.Text" xml:space="preserve">
160+
<value>Permanent Delete:</value>
161+
</data>
162+
<data name="PermanentlyDeleted.Text" xml:space="preserve">
163+
<value>permanently deleted.</value>
164+
</data>
165+
<data name="Reset.Text" xml:space="preserve">
166+
<value>Reset</value>
167+
</data>
168+
<data name="SummaryOfOperationsPermanentlyDeleted.Text" xml:space="preserve">
169+
<value>Summary of operations: Permanently Deleted:</value>
170+
</data>
171+
<data name="ThisUserAlreadyBeenDeletedPreviously.Text" xml:space="preserve">
172+
<value>has already been previously deleted.</value>
173+
</data>
174+
<data name="ToMaintainPerformanceControls.Text" xml:space="preserve">
175+
<value>To maintain performance controls, the number of user accounts that can be deleted at a time is 3000.</value>
176+
</data>
177+
<data name="User.Text" xml:space="preserve">
178+
<value>User</value>
179+
</data>
180+
<data name="WithID.Text" xml:space="preserve">
181+
<value>with ID:</value>
182+
</data>
183+
</root>

‎Modules/UserManager/App_LocalResources/Index.resx

+3
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,9 @@
126126
<data name="BtnCreateUser.Text" xml:space="preserve">
127127
<value>Create User</value>
128128
</data>
129+
<data name="BulkDeleteUser.Text" xml:space="preserve">
130+
<value>Bulk Delete User</value>
131+
</data>
129132
<data name="CreateRole.Text" xml:space="preserve">
130133
<value>Create Role</value>
131134
</data>

‎Modules/UserManager/App_LocalResources/Shared.resx

+6
Original file line numberDiff line numberDiff line change
@@ -174,4 +174,10 @@
174174
<data name="EditingSiteRoles.Text" xml:space="preserve">
175175
<value>Editing Site Roles</value>
176176
</data>
177+
<data name="Delete.Text" xml:space="preserve">
178+
<value>Delete</value>
179+
</data>
180+
<data name="OnlySuperUserIsAllowedBulkDeleteUserAccounts.Text" xml:space="preserve">
181+
<value>Only a superuser is allowed to bulk delete user accounts</value>
182+
</data>
177183
</root>

0 commit comments

Comments
 (0)