mirror of
https://github.com/kremalicious/umami.git
synced 2025-02-14 21:10:34 +01:00
Merge branch 'master' into dev
This commit is contained in:
commit
64b4af4bf1
4
.github/workflows/ci.yml
vendored
4
.github/workflows/ci.yml
vendored
@ -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:
|
||||
|
@ -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
|
||||
|
@ -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": "वेबसाइट",
|
||||
@ -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",
|
||||
|
@ -1,4 +1,5 @@
|
||||
import * as detect from '../detect';
|
||||
import { expect } from '@jest/globals';
|
||||
|
||||
const IP = '127.0.0.1';
|
||||
|
||||
|
@ -1,4 +1,5 @@
|
||||
import * as format from '../format';
|
||||
import { expect } from '@jest/globals';
|
||||
|
||||
test('parseTime', () => {
|
||||
expect(format.parseTime(86400 + 3600 + 60 + 1)).toEqual({
|
||||
|
Loading…
x
Reference in New Issue
Block a user