Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
mikecao committed Dec 13, 2024
2 parents 5ecca3d + 62d9e0a commit 64b4af4
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
strategy:
matrix:
include:
- node-version: 18.17
- node-version: 18.18
db-type: postgresql
- node-version: 18.17
- node-version: 18.18
db-type: mysql

steps:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ A detailed getting started guide can be found at [umami.is/docs](https://umami.i

### Requirements

- A server with Node.js version 16.13 or newer
- A server with Node.js version 18.18 or newer
- A database. Umami supports [MariaDB](https://www.mariadb.org/) (minimum v10.5), [MySQL](https://www.mysql.com/) (minimum v8.0) and [PostgreSQL](https://www.postgresql.org/) (minimum v12.14) databases.

### Install Yarn
Expand Down
10 changes: 5 additions & 5 deletions src/lang/hi-IN.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"label.access-code": "Access code",
"label.access-code": "पहुंच कोड",
"label.actions": "कार्य",
"label.activity": "Activity log",
"label.add": "Add",
"label.add-description": "Add description",
"label.activity": "गतिविधि लॉग",
"label.add": "जोडो",
"label.add-description": "विवरण लिखें",
"label.add-member": "Add member",
"label.add-step": "Add step",
"label.add-website": "वेबसाइट",
Expand Down Expand Up @@ -155,7 +155,7 @@
"label.regions": "Regions",
"label.remove": "Remove",
"label.remove-member": "Remove member",
"label.reports": "Reports",
"label.reports": "प्रतिवेदन",
"label.required": "अपेक्षित",
"label.reset": "रीसेट",
"label.reset-website": "Reset statistics",
Expand Down
1 change: 1 addition & 0 deletions src/lib/__tests__/detect.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as detect from '../detect';
import { expect } from '@jest/globals';

const IP = '127.0.0.1';

Expand Down
1 change: 1 addition & 0 deletions src/lib/__tests__/format.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as format from '../format';
import { expect } from '@jest/globals';

test('parseTime', () => {
expect(format.parseTime(86400 + 3600 + 60 + 1)).toEqual({
Expand Down

0 comments on commit 64b4af4

Please sign in to comment.