Browse Source

Merge branch 'dev' of https://github.com/abpframework/abp into dev

pull/2695/head
mehmet-erim 7 years ago
parent
commit
ae910d9414
  1. 1
      modules/blogging/src/Volo.Blogging.Web/Pages/Admin/Blogs/index.js
  2. 1
      modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/index.js
  3. 1
      modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js
  4. 1
      modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/index.js
  5. 1
      modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js
  6. 3
      npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.scss

1
modules/blogging/src/Volo.Blogging.Web/Pages/Admin/Blogs/index.js

@ -9,6 +9,7 @@
serverSide: true,
paging: false,
info: false,
scrollX: true,
searching: false,
autoWidth: false,
scrollCollapse: true,

1
modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/index.js

@ -16,6 +16,7 @@
var _dataTable = $('#ProjectsTable').DataTable(abp.libs.datatables.normalizeConfiguration({
processing: true,
serverSide: true,
scrollX: true,
paging: true,
searching: false,
autoWidth: false,

1
modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js

@ -17,6 +17,7 @@
searching: false,
processing: true,
serverSide: true,
scrollX: true,
paging: true,
ajax: abp.libs.datatables.createAjax(_identityRoleAppService.getList),
columnDefs: [

1
modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/index.js

@ -15,6 +15,7 @@
order: [[1, "asc"]],
processing: true,
serverSide: true,
scrollX: true,
paging: true,
ajax: abp.libs.datatables.createAjax(_identityUserAppService.getList),
columnDefs: [

1
modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js

@ -19,6 +19,7 @@
order: [[1, "asc"]],
processing: true,
paging: true,
scrollX: true,
serverSide: true,
ajax: abp.libs.datatables.createAjax(_tenantAppService.getList),
columnDefs: [

3
npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.scss

@ -24,6 +24,9 @@
width: 450px;
min-height: 300px;
z-index: 1062 !important;
@media screen and (max-width: 500px) {
width: 90vw;
}
.icon-container {
display: flex;
align-items: center;

Loading…
Cancel
Save