m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2025-02-14 21:10:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mike Cao 2023-04-19 08:49:47 -07:00
commit 083a9ffc2c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/pages/settings/profile/PasswordEditForm.js
View File

@ -37,7 +37,7 @@ export default function PasswordEditForm({ onSave, onClose }) {
name="newPassword" name="newPassword"
rules={{ rules={{
required: 'Required', required: 'Required',
minLength: { value: 8, message: formatMessage(messages.minPasswordLength) }, minLength: { value: 8, message: formatMessage(messages.minPasswordLength, { n: 8 }) },
}} }}
> >
<PasswordField autoComplete="new-password" /> <PasswordField autoComplete="new-password" />
@ -48,7 +48,7 @@ export default function PasswordEditForm({ onSave, onClose }) {
name="confirmPassword" name="confirmPassword"
rules={{ rules={{
required: formatMessage(labels.required), required: formatMessage(labels.required),
minLength: { value: 8, message: formatMessage(messages.minPasswordLength) }, minLength: { value: 8, message: formatMessage(messages.minPasswordLength, { n: 8 }) },
validate: samePassword, validate: samePassword,
}} }}
> >

2
components/pages/settings/users/UserEditForm.js
View File

@ -48,7 +48,7 @@ export default function UserEditForm({ userId, data, onSave }) {
<FormInput <FormInput
name="newPassword" name="newPassword"
rules={{ rules={{
minLength: { value: 8, message: formatMessage(messages.minPasswordLength) }, minLength: { value: 8, message: formatMessage(messages.minPasswordLength, { n: 8 }) },
}} }}
> >
<PasswordField autoComplete="new-password" /> <PasswordField autoComplete="new-password" />

2
scripts/check-db.js
View File

@ -53,7 +53,7 @@ async function checkDatabaseVersion(databaseType) {
const query = await prisma.$queryRaw`select version() as version`; const query = await prisma.$queryRaw`select version() as version`;
const version = semver.valid(semver.coerce(query[0].version)); const version = semver.valid(semver.coerce(query[0].version));
const minVersion = databaseType === 'postgresql' ? '9.4.0' : '5.6.0'; const minVersion = databaseType === 'postgresql' ? '9.4.0' : '5.7.0';
if (semver.lt(version, minVersion)) { if (semver.lt(version, minVersion)) {
throw new Error( throw new Error(