Skip to content

Commit dcf777c

Browse files
WillStrohlWillStrohl
authored
Merge pull request #115 from UpendoVentures/dev
Syncing the branches
2 parents 9a3e794 + a95d444 commit dcf777c

File tree

5 files changed

+39
-16
lines changed

5 files changed

+39
-16
lines changed

‎Modules/UserManager/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@
2929
// Build Number
3030
// Revision
3131
//
32-
[assembly: AssemblyVersion("01.05.00")]
33-
[assembly: AssemblyFileVersion("01.05.00")]
32+
[assembly: AssemblyVersion("01.05.01")]
33+
[assembly: AssemblyFileVersion("01.05.01")]

‎Modules/UserManager/Upendo.UserManager.dnn

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<dotnetnuke type="Package" version="6.0">
33
<packages>
4-
<package name="Upendo.Modules.UserManager" type="Module" version="01.05.00">
4+
<package name="Upendo.Modules.UserManager" type="Module" version="01.05.01">
55
<friendlyName>Upendo DNN User Manager</friendlyName>
66
<description><![CDATA[<p>The Upendo DNN User Manager empowers authorized end-users in your DNN website to be able to manage user accounts and their assigned security roles.</p>]]></description>
77
<iconFile>DesktopModules/MVC/Upendo.Modules.UserManager/Images/logo.png</iconFile>
@@ -60,7 +60,7 @@
6060
<attributes>
6161
<businessControllerClass>Upendo.Modules.UserManager.Components.UserManagerController, Upendo.Modules.UserManager</businessControllerClass>
6262
<desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
63-
<upgradeVersionsList>01.00.00,01.01.00,01.01.01,01.02.00,01.03.00,01.04.00,01.04.01,01.05.00</upgradeVersionsList>
63+
<upgradeVersionsList>01.00.00,01.01.00,01.01.01,01.02.00,01.03.00,01.04.00,01.04.01,01.05.00,01.05.01</upgradeVersionsList>
6464
</attributes>
6565
</eventMessage>
6666
</component>
@@ -69,7 +69,7 @@
6969
<assembly>
7070
<name>Upendo.Modules.UserManager.dll</name>
7171
<path>bin</path>
72-
<version>01.05.00</version>
72+
<version>01.05.01</version>
7373
</assembly>
7474
</assemblies>
7575
</component>
@@ -92,7 +92,7 @@
9292
<script type="Install">
9393
<path>Providers\DataProviders\SqlDataProvider</path>
9494
<name>01.05.00.SqlDataProvider</name>
95-
<version>01.05.00</version>
95+
<version>01.05.01</version>
9696
</script>
9797
<script type="UnInstall">
9898
<path>Providers\DataProviders\SqlDataProvider</path>

‎Modules/UserManager/Upendo.UserManager_Symbols.dnn

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<dotnetnuke type="Package" version="6.0">
33
<packages>
4-
<package name="Upendo.Modules.UserManager_Symbols" type="Library" version="01.05.00">
4+
<package name="Upendo.Modules.UserManager_Symbols" type="Library" version="01.05.01">
55
<friendlyName>Upendo DNN User Manager Symbols</friendlyName>
66
<description><![CDATA[Upendo DNN User Manager Extension for DNN]]></description>
77
<owner>
@@ -14,7 +14,7 @@
1414
<releaseNotes src="ReleaseNotes.txt" />
1515
<azureCompatible>True</azureCompatible>
1616
<dependencies>
17-
<dependency type="managedPackage" version="1.5.0">Upendo.Modules.UserManager</dependency>
17+
<dependency type="managedPackage" version="1.5.1">Upendo.Modules.UserManager</dependency>
1818
</dependencies>
1919
<components>
2020
<component type="ResourceFile">

‎Modules/UserManager/Views/UserManage/Index.cshtml

+9-8
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
string srcLogo = DotNetNuke.Entities.Tabs.TabController.CurrentPage.Title + "/DesktopModules/MVC/Upendo.Modules.UserManager/Images/Upendo-logo-trans.png";
1010
string ResourceFile = "~/DesktopModules/MVC/Upendo.Modules.UserManager/App_LocalResources/Index.resx";
1111
string SharedResourceFile = "~/DesktopModules/MVC/Upendo.Modules.UserManager/App_LocalResources/Shared.resx";
12+
string ImpersonateResourceFile = "~/DesktopModules/MVC/Upendo.Modules.UserManager/App_LocalResources/Impersonate.resx";
1213

1314
double PageIndex = Model.PageIndex == 0 ? 1 : Model.PageIndex;
1415
var pageIndexMinus = (PageIndex - 1) <= 0 ? 0 : (Model.PageIndex - 1);
@@ -206,25 +207,25 @@
206207

207208
</td>
208209
<td class="text-center">
209-
<a data-hint="Edit" class="AM-btn AM-btn-primary AM-btn-sm edit warning" href="@Url.Action("Edit", "UserManage", new {ctl = "Edit", itemId = item.UserId})"
210-
data-toggle="tooltip" data-placement="top" title="@Localization.GetString("Edit", @SharedResourceFile)">
210+
<a class="AM-btn AM-btn-primary AM-btn-sm edit warning" href="@Url.Action("Edit", "UserManage", new {ctl = "Edit", itemId = item.UserId})"
211+
data-toggle="tooltip" title="@Localization.GetString("Edit", @SharedResourceFile)">
211212
<span class="fa fa-edit color-white" aria-hidden="true"></span>
212213
</a>
213-
<a data-hint="User Roles" class="AM-btn AM-btn-info AM-btn-sm edit " href="@Url.Action("UserRoles", "UserManage", new {itemId = item.UserId})"
214-
data-toggle="tooltip" data-placement="top" title="@Localization.GetString("UserRoles", @ResourceFile)">
214+
<a class="AM-btn AM-btn-info AM-btn-sm edit " href="@Url.Action("UserRoles", "UserManage", new {itemId = item.UserId})"
215+
data-toggle="tooltip" title="@Localization.GetString("UserRoles", @ResourceFile)">
215216
<span class="fa fa-tasks color-white" aria-hidden="true"></span>
216217
</a>
217218
<span id="dialogs-delete" class="dnnActions" style="display: initial;">
218-
<a data-hint="Delete" class="confirm AM-btn AM-btn-danger AM-btn-sm delete" data-placement="top" data-singleton="true" href="@Url.Action("Delete", "UserManage", new {itemId = item.UserId})"
219-
data-toggle="tooltip" data-placement="top" title="@Localization.GetString("DeleteUser", @ResourceFile)">
219+
<a class="confirm AM-btn AM-btn-danger AM-btn-sm delete" data-placement="top" data-singleton="true" href="@Url.Action("Delete", "UserManage", new {itemId = item.UserId})"
220+
data-toggle="tooltip" title="@Localization.GetString("Delete", @SharedResourceFile)">
220221
<span class="fa fa-trash color-white" aria-hidden="true"></span>
221222
</a>
222223
</span>
223224
@if (ViewBag.IsCurrentUserSuperUser)
224225
{
225226
<span id="dialogs-impersonate" class="dnnActions" style="display: initial;">
226-
<a data-hint="Delete" class="confirm AM-btn AM-btn-primary AM-btn-sm" data-placement="top" data-singleton="true" href="@Url.Action("ImpersonateUserById", "UserManage", new {itemId = item.UserId})"
227-
data-toggle="tooltip" data-placement="top" title="@Localization.GetString("ImpersonateUser", @ResourceFile)">
227+
<a class="AM-btn AM-btn-primary AM-btn-sm confirm" href="@Url.Action("ImpersonateUserById", "UserManage", new {itemId = item.UserId})"
228+
data-toggle="tooltip" title="@Localization.GetString("Impersonate", @ImpersonateResourceFile)">
228229
<span class="fas fa-eye color-white" aria-hidden="true"></span>
229230
</a>
230231
</span>

‎Modules/UserManager/releasenotes.txt

+22
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,28 @@
3333
<li><strong>SI:</strong> Support Inquiry - This issue was reported by a <a href="https://upendoventures.com/Support" target="_blank">support customer</a> and, as such, was prioritized above all other tasks.</li>
3434
</ul>
3535

36+
<h2>Release Notes: 01.05.01</h2>
37+
38+
<h3><strong>Enhancements</strong></h3>
39+
<ul>
40+
<li>None at this time.</li>
41+
<!--
42+
<li><strong></strong> - . (<a href="https://github.com/UpendoVentures/Upendo-Dnn-UserManager/issues/" target="_blank">Issue </a>), Thanks <a href="https://github.com/" target="_blank">@</a></li>
43+
<li>None at this time.</li>
44+
-->
45+
</ul>
46+
47+
<h3><strong>Maintenance Updates &amp; Bug Fixes</strong></h3>
48+
<ul>
49+
<li><a href="https://github.com/UpendoVentures/Upendo-Dnn-UserManager/issues/109" target="_blank">Issue 109</a> - UX: Tooltips missing for recently released features. Thanks <a href="https://github.com/alejoroman0605" target="_blank">@alejoroman0605</a></li>
50+
<!--
51+
<li><a href="https://github.com/UpendoVentures/Upendo-Dnn-UserManager/issues/" target="_blank">Issue </a> - . Thanks <a href="https://github.com/" target="_blank">@</a></li>
52+
<li>(no issue) - .</li>
53+
<li>None at this time.</li>
54+
-->
55+
</ul>
56+
<hr />
57+
3658
<h2>Release Notes: 01.05.00</h2>
3759

3860
<h3><strong>Enhancements</strong></h3>

0 commit comments

Comments
 (0)