LimeSurvey: master 56ebad17
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| pstelling | pstelling | master | 2021-05-12 09:02:05 | master ef13ffdf |
| Changeset | Merge branch 'task/zoho-L41-T309-email-plain-password' Conflicts:application/config/version.phpapplication/helpers/update/updatedb_helper.php |
|||
| mod - application/config/version.php | Diff File | |||
| mod - application/controllers/UserManagementController.php | Diff File | |||
| mod - application/controllers/admin/authentication.php | Diff File | |||
| mod - application/core/LsDefaultDataSets.php | Diff File | |||
| mod - application/helpers/update/updatedb_helper.php | Diff File | |||
| mod - application/models/User.php | Diff File | |||
| add - application/models/services/PasswordManagement.php | Diff File | |||
| add - application/views/admin/authentication/newPassword.php | Diff File | |||
| mod - application/views/admin/globalsettings/_useradministration.php | Diff File | |||
| mod - application/views/userManagement/partial/addedituser.php | Diff File | |||
| mod - application/views/userManagement/partial/usernotificationemail.php | Diff File | |||
| mod - installer/create-database.php | Diff File | |||
| mod - tests/phpstan/phpstan_bootstrap.php | Diff File | |||
