jjimenez/safekat
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/safekat.git synced 2025-07-25 22:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 'dev/formateando2'

Browse Source 
# Conflicts:
#   ci4/app/Filters/LoginAuthFilter.php
#   ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupForm.php
#   ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupList.php
This commit is contained in:
Jaime Jimenez Ortega
2023-05-16 11:09:50 +00:00
parent f05ec163df a85f9c8688
commit d4c86212a7
55 changed files with 2941 additions and 461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ci4/app/Views/themes/_commonPartialsBs/datatables.php
View File

@ -160,7 +160,7 @@
"scrollX": true,
"stateSave": true,
"language": {
url: "//cdn.datatables.net/plug-ins/1.13.4/i18n/<?= config('Basics')->i18n ?>.json"
//url: "//cdn.datatables.net/plug-ins/1.10.25/i18n/languages[$currentLocale] ?? config('Basics')->i18n ?>.json"
},
"columnDefs": [
{