Compare commits

...

6 Commits

Author SHA1 Message Date
Daniel 125f6ac619 Merge pull request #856 from linkwarden/dev
update version
2024-11-14 08:51:33 -05:00
daniel31x13 89ecf5c529 update version 2024-11-14 08:50:52 -05:00
Daniel fa78d6057f Merge pull request #855 from linkwarden/dev
bug fix
2024-11-14 08:50:10 -05:00
daniel31x13 cfc28be898 bug fix 2024-11-14 08:48:18 -05:00
Daniel c8efd4f9db Merge pull request #852 from linkwarden/dev
created check-branch.yml
2024-11-14 02:43:50 -05:00
daniel31x13 ada4e53b46 created check-branch.yml 2024-11-14 02:42:01 -05:00
3 changed files with 20 additions and 2 deletions
+18
View File
@@ -0,0 +1,18 @@
name: Check pull request source branch
on:
pull_request_target:
types:
- opened
- reopened
- synchronize
- edited
jobs:
check-branches:
runs-on: ubuntu-latest
steps:
- name: Check branches
run: |
if [ ${{ github.head_ref }} != "dev" ] && [ ${{ github.base_ref }} == "main" ]; then
echo "Merge requests to main branch are only allowed from dev branch. Please rebase your changes to dev branch."
exit 1
fi
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "linkwarden",
"version": "v2.8.1",
"version": "v2.8.2",
"main": "index.js",
"repository": "https://github.com/linkwarden/linkwarden.git",
"author": "Daniel31X13 <daniel31x13@gmail.com>",
+1 -1
View File
@@ -87,7 +87,7 @@ export default function Account() {
const emailSchema = z.string().trim().email().toLowerCase();
const emailValidation = emailSchema.safeParse(user.email || "");
if (!emailValidation.success) {
if (emailEnabled && !emailValidation.success) {
return toast.error(t("email_invalid"));
}