Nhances/nhance-enrollment
Nhances/nhance-enrollment
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
velz 2026-05-27 17:16:26 +05:30
commit ceac1d7352
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controllers/EmployeeController.php
View File

@ -2906,7 +2906,7 @@ class EmployeeController extends AdminController
} }
$emp_history['created_at'] = date("d-m-Y H:i:s", strtotime($emp_history['created_at'])); $emp_history['created_at'] = date("d/m/Y H:i:s", strtotime($emp_history['created_at']));
} }
unset($emp_history); unset($emp_history);

4
app/Controllers/SamlController.php
View File

@ -91,7 +91,7 @@ class SamlController extends BaseController
'status' => 'failed', 'status' => 'failed',
'code' => 404, 'code' => 404,
'data' => '', 'data' => '',
'message' => 'SAML not configured for this domain', 'message' => 'This email is not configured with Microsoft. Please try other login options.',
]); ]);
} }
@ -147,7 +147,7 @@ class SamlController extends BaseController
'code' => 404, 'code' => 404,
'data' => '', 'data' => '',
'post_enrollment' => ['status' => 'failed', 'code' => 404, 'data' => ''], 'post_enrollment' => ['status' => 'failed', 'code' => 404, 'data' => ''],
'message' => 'SAML not configured for this domain', 'message' => 'This email is not configured with Microsoft. Please try other login options.',
]); ]);
} }