ric/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-11-27 16:54:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
4677 commits 30 branches 115 tags 66 MiB
Commit graph

472 commits

Author SHA1 Message Date
Louis Lam
cf10e26aff Update to 1.18.0 2022-09-05 17:43:42 +08:00
Louis Lam
fd2df562b1 Add checkout pr logic 2022-09-03 18:37:31 +08:00
Louis Lam
e0cdc3e7c5 Update dockerfile for pr-test 2022-08-29 22:06:47 +08:00
Muhammed Hussein Karimi
82dd9a7c16 golaert req fix and axios update for formdata 2022-08-24 10:36:29 +04:30
minhhn3
6bb79597e8 fix: resolve merge conflict 2022-08-13 13:26:05 +07:00
Louis Lam
af94424283 Update to 1.18.0-beta.0 2022-08-13 14:04:17 +08:00
Louis Lam
a6007adce3 Update to 1.18.0-beta.1 2022-08-13 13:32:16 +08:00
Louis Lam
3b3763351b Merge remote-tracking branch 'origin/master' into radius-check 
# Conflicts:
#	server/database.js
#	server/model/monitor.js
#	server/server.js
#	server/util-server.js
#	src/pages/EditMonitor.vue
 2022-08-11 21:08:06 +08:00
minhhn3
2232236a7a [empty commit] pull request for add gRPC protocol 2022-08-03 13:39:31 +07:00
Minh Hoàng
dcecd10c88
Feat/add gRPC protocol (#1) 
* feat: added monitor with gRPC

Co-authored-by: minhhn3 <minhhn3@vng.com.vn>
 2022-08-03 12:00:39 +07:00
Louis Lam
88afd662db Merge remote-tracking branch 'origin/master' into postgres 
# Conflicts:
#	package-lock.json
#	package.json
 2022-07-24 14:07:30 +08:00
tamasmagyar
986c03aecd test cypress run 2022-07-18 20:51:17 +02:00
tamasmagyar
31c388a6e3 added cypress framework and tests for setup page 2022-07-18 20:51:13 +02:00
Louis Lam
17ed051401 Add CacheableDnsHttpAgent.install() 2022-07-18 23:32:45 +08:00
Louis Lam
9cd060c6c3 socks-proxy-agent 6.2.X is a breaking change, freeze to 6.1.1. 2022-07-18 23:27:05 +08:00
Louis Lam
1999541802 Merge remote-tracking branch 'origin/master' into dns 2022-07-18 23:25:14 +08:00
Louis Lam
624678826d Move all frontend dependencies to devDependencies, as it is not used in the production environment 2022-07-04 03:59:20 +08:00
Louis Lam
e8c3807594 Move all frontend dependencies to devDependencies, as it is not used in the production environment 2022-07-04 03:54:56 +08:00
Louis Lam
e5e8db6c38 Add cacheable-lookup 2022-06-29 22:17:47 +08:00
Louis Lam
8542e6cbb9 Drop npm-check-updates due to security vulnerability of got, and it is unlikely to be fixed shortly 
Read more:
https://github.com/raineorshine/npm-check-updates/pull/1147#event-6880466174
 2022-06-27 10:50:38 +08:00
Louis Lam
9650418ef7 Fix dependencies warning 2022-06-25 20:55:14 +08:00
Louis Lam
0ecaa2cbd7 Update to 1.17.1 2022-06-23 16:05:42 +08:00
Louis Lam
1f5466a3e8 Revert #1598 2022-06-23 15:54:33 +08:00
Louis Lam
d5da5af174 Update to 1.17.0 2022-06-22 20:13:39 +08:00
Louis Lam
dd09351c8e Update to 1.17.0-beta.1 2022-06-16 19:34:47 +08:00
Christopher Pickering
edcdedcaae
Added check for blank password. 2022-06-15 13:00:14 -05:00
Christopher Pickering
945288f0c0
Added postgres monitor 2022-06-15 12:12:47 -05:00
Louis Lam
8abbc9fd15 Update to 1.17.0-beta.0 2022-06-14 11:00:55 +08:00
Louis Lam
6682839ec8 Merge remote-tracking branch 'origin/master' into ntml-auth 
# Conflicts:
#	package-lock.json
#	package.json
#	server/database.js
#	server/model/monitor.js
#	server/server.js
#	server/util-server.js
 2022-06-14 10:36:29 +08:00
Louis Lam
a28ef56553 Merge remote-tracking branch 'gregdev/feature/axios-cached-dns-resolve' into feature/axios-cached-dns-resolve 
# Conflicts:
#	package-lock.json
#	package.json
 2022-06-13 18:53:19 +08:00
Louis Lam
7f432bd916 Remove axios-cached-dns-resolve-test 2022-06-13 18:52:08 +08:00
Louis Lam
f570d41142 Merge remote-tracking branch 'origin/master' into feature/axios-cached-dns-resolve 
# Conflicts:
#	package-lock.json
#	package.json
 2022-06-13 18:50:43 +08:00
Louis Lam
04e22f17a9 Merge remote-tracking branch 'origin/master' into christopherpickering_master 
# Conflicts:
#	package-lock.json
#	src/languages/en.js
 2022-06-11 20:59:58 +08:00
Louis Lam
a707b51053
Page Loading Speed Optimization (#1711) 
* Update Vite.js to 2.9.9 and add Rollup Plugin Visualizer
* Prebuild gzip and brotli for assets

Original: ~1.2MB
Optimized: ~370KB
 2022-06-05 23:43:25 +08:00
Louis Lam
ffb7ba176c Merge remote-tracking branch 'origin/master' into status-page-inject-html 2022-05-30 14:00:39 +08:00
Louis Lam
857e88b27e Update to 1.16.1 2022-05-29 12:47:07 +08:00
Louis Lam
df4ce811d9 Merge remote-tracking branch 'origin/master' into kaysond_master 
# Conflicts:
#	server/model/monitor.js
 2022-05-28 23:19:58 +08:00
Louis Lam
334cb57fed Update to 1.16.0 2022-05-26 19:32:52 +08:00
Sascha Kruse
019d638767 Merge remote-tracking branch 'ghupstream/master' into radius-check 2022-05-18 15:54:10 +02:00
Louis Lam
398219f847 Update to 1.16.0-beta.0 2022-05-17 01:03:51 +08:00
Christopher Pickering
ef73af391f
added option for ntlm authorization 2022-05-13 12:58:23 -05:00
Christopher Pickering
87f933df4f
added sqlserver monitor 2022-05-12 12:48:03 -05:00
Sascha Kruse
398ecb7666 add radius check 2022-05-12 15:21:13 +02:00
Louis Lam
59be9bb971 working 2022-05-11 00:51:11 +08:00
Louis Lam
4e3258579d Merge branch 'master' into uptime-badges 
# Conflicts:
#	server/util-server.js
 2022-05-07 13:26:47 +08:00
Greg Smith
cbfecab850 switch to the more-up-to-date esm-wallaby 
https://github.com/wallabyjs/esm
 2022-05-04 15:45:18 +09:30
Louis Lam
25cc54bf72 Try to give more time for axios-cached-dns-resolve test 2022-05-04 13:24:18 +08:00
Louis Lam
3700b16c5b Copy and add axios-cached-dns-resolve test 2022-05-04 13:16:22 +08:00
Louis Lam
15820c6937 Update SQLite 2022-05-01 19:45:00 +08:00
Louis Lam
d962ab7a1c Merge branch 'master' into uptime-badges 
# Conflicts:
#	package-lock.json
#	server/routers/api-router.js
 2022-05-01 17:03:11 +08:00
Louis Lam
63c8d24d6f As legacy-peer-deps is specified in .npmrc, install-legacy and update-legacy are not actually needed. 2022-05-01 12:32:06 +08:00
Greg Smith
f4515ad8c5 add axios cached dns resolve to monitor 2022-04-30 21:40:47 +09:30
Louis Lam
26230a3d3a Update to 1.15.1 2022-04-29 13:52:14 +08:00
Louis Lam
752415dae6
Merge pull request #1566 from Saibamen/fix_duplicated_PR_comments 
Fix duplicated PR comments
 2022-04-27 15:01:52 +08:00
Aram Akhavan
39df4eea92 Ssynchronize push monitor heartbeats to api calls 
Includes a 1s buffer time to allow the push url to be called before the monitor is checked
 2022-04-26 13:48:44 -07:00
Adam Stachowicz
dcdbb7be8b Use separate job for linters 2022-04-26 01:57:49 +02:00
Adam Stachowicz
b874ea8b28 Add missing lint-fix:style command 2022-04-26 01:37:20 +02:00
Adam Stachowicz
1e595eaa76 Update linters 2022-04-26 01:26:57 +02:00
Louis Lam
4114f43b48 Start both dev servers in one command 2022-04-26 02:18:14 +08:00
Louis Lam
751924b335 Update to 1.15.0 2022-04-24 22:57:42 +08:00
Jens Neuber
e103ac8335 Merge branch 'master' of https://github.com/louislam/uptime-kuma into uptime-badges 2022-04-20 10:10:14 +02:00
Louis Lam
7c13b1b6cb Update to 1.15.0-beta.1 2022-04-19 20:07:18 +08:00
Louis Lam
29d2d95c71 Merge branch '1.14.X' 
# Conflicts:
#	package.json
#	server/server.js
 2022-04-19 16:43:13 +08:00
Louis Lam
b782b25e17 Update to 1.14.1 2022-04-19 16:01:08 +08:00
Louis Lam
f712fe85e5 Update node-sqlite, sqlite from 3.36 to 3.38 2022-04-18 12:44:32 +08:00
Louis Lam
c28b90feb4 Update to 1.15.0-beta.0 2022-04-17 20:07:32 +08:00
Louis Lam
5fa62a888c Merge branch 'master' into mqtt2 
# Conflicts:
#	server/database.js
#	server/util-server.js
 2022-04-17 19:46:33 +08:00
Louis Lam
d71c086447 Standardize array bracket spacing 2022-04-17 15:27:35 +08:00
Louis Lam
8eb83394f7 Refine UI/UX for custom css / footer text. Add switch for show/hide powered by 2022-04-17 14:53:13 +08:00
Louis Lam
03bcf5c766 Add a simple mqtt server for testing 2022-04-17 01:07:54 +08:00
Louis Lam
b1c7915bc1 Merge branch 'master' into mqtt2 
# Conflicts:
#	package-lock.json
#	package.json
#	server/database.js
#	server/model/monitor.js
#	server/server.js
#	src/pages/EditMonitor.vue
 2022-04-16 13:28:39 +08:00
Louis Lam
8d0446dc38 Add lint as part of test 2022-04-14 01:20:54 +08:00
Louis Lam
3436e26ed4 Fix styleline, fix css format issues globally 2022-04-14 01:20:54 +08:00
Louis Lam
1ba92d803e Update to 1.14.0 2022-04-12 14:17:13 +08:00
Louis Lam
316e65d35a Update to 1.14.0-beta.2 2022-04-10 00:46:34 +08:00
Louis Lam
8b45a95cc3 Merge branch '1.13.X' 
# Conflicts:
#	package.json
 2022-04-06 23:20:22 +08:00
Louis Lam
02becfd113 Update to 1.13.2 2022-04-06 22:54:03 +08:00
Louis Lam
99042e6991 Update to 1.14.0-beta.1 2022-04-03 22:06:39 +08:00
Louis Lam
4738581c66 Update dependencies 2022-04-02 11:34:00 +08:00
Louis Lam
04e3394d02 Merge branch 'master' into feature/request-with-http-proxy 
# Conflicts:
#	package-lock.json
#	package.json
#	server/database.js
#	src/languages/en.js
#	src/mixins/socket.js
 2022-04-01 14:57:35 +08:00
Louis Lam
f02e9c44ec Update to 1.14.0-beta.0 2022-03-30 23:37:23 +08:00
Louis Lam
b72a2d350f Set cloudflared token from env var or arg 2022-03-30 20:08:26 +08:00
Louis Lam
82ea896bbc Improve the workflow of cloudflared 2022-03-30 11:59:49 +08:00
Louis Lam
f1f4b3b377 Add reverse proxy setting page for controlling cloudflared 2022-03-30 01:49:45 +08:00
Louis Lam
7d3cbff794 [Cloudflared] Install into base docker 2022-03-29 02:24:10 +08:00
Louis Lam
623d03dc6f Fix release process 2022-03-25 00:03:25 +08:00
Louis Lam
f52e527850 Update to 1.13.1 2022-03-24 23:47:03 +08:00
Louis Lam
6c7a0ff7d3 Fix release script 2022-03-24 22:44:22 +08:00
Louis Lam
2abdf2efad Update to 1.13.0 2022-03-24 22:21:19 +08:00
Louis Lam
668dffc2c5 Simplify final release 2022-03-22 16:45:07 +08:00
Louis Lam
909618a29a Update to 1.13.0-beta.2 2022-03-22 14:30:54 +08:00
Louis Lam
4a4ffc96dd Fix setup 2022-03-22 12:00:13 +08:00
Louis Lam
76f991ecd8 Update beta process 2022-03-22 11:30:45 +08:00
Louis Lam
b0bda9f9d2 Fix beta release script 2022-03-22 01:00:35 +08:00
Louis Lam
cafa61e3af Add beta tag 2022-03-21 14:32:55 +08:00
Louis Lam
58ee071fae Release process for beta 2022-03-21 14:31:29 +08:00
Louis Lam
4e95e9ea51 Add process for beta release 2022-03-20 11:08:33 +08:00
Louis Lam
5f778b9763
Merge pull request #835 from willianrod/feat/add-favicon-badges 
Add badges to favicon
 2022-03-12 15:39:18 +08:00
Louis Lam
04d93c2747 Merge branch 'master' into willianrod_feat/add-favicon-badges 
# Conflicts:
#	package-lock.json
#	src/mixins/socket.js
 2022-03-12 11:17:32 +08:00
Mark Vicente
95a2c967c6 check-password-strength new version 2.0.5 that support additional symbols/special characters referenced from owasp list. 2022-03-11 23:48:35 +08:00
Uğur Erkan
9e27acb511 Add socks proxy agent 2022-03-06 19:34:51 +03:00
Uğur Erkan
2cc7a990ff Add http and https agents 2022-03-06 19:29:28 +03:00
Louis Lam
b31af8a15c update to 1.12.1 2022-02-26 17:05:13 +08:00
Louis Lam
d5d63474d8 update to 1.12.0 2022-02-26 15:41:32 +08:00
Louis Lam
3a5b413af4 Update axios to 0.26.0 due to vulnerability 2022-02-26 14:36:38 +08:00
Jens Neuber
454c1687cf Merge branch 'master' of https://github.com/louislam/uptime-kuma into uptime-badges 2022-02-13 11:12:22 +01:00
Louis Lam
e7e30bf497 update to 1.11.4 2022-02-09 21:54:33 +08:00
Louis Lam
742ad083e5 Fix security vulnerabilities 2022-02-03 12:26:50 +08:00
Louis Lam
41f1686147 Fix security vulnerabilities 2022-02-03 12:20:15 +08:00
Jens Neuber
28be32fc68 Merge branch 'master' of https://github.com/louislam/uptime-kuma into uptime-badges 2022-01-28 08:36:05 +01:00
Louis
a0d51a15cf Fix security vulnerabilities 2022-01-18 01:24:07 +08:00
Louis Lam
bfee63452d Merge branch 'master' into mqtt 2022-01-13 11:16:58 +08:00
Louis Lam
fd1fce0143 Update stylelint from 13.13.x to 14.2.x 2022-01-13 11:15:38 +08:00
Louis Lam
076d6bdbb6 Merge branch 'master' into mqtt 
# Conflicts:
#	package-lock.json
#	server/database.js
 2022-01-13 11:09:16 +08:00
Louis Lam
ec5037f30d update to 1.11.3 2022-01-06 14:51:20 +08:00
Louis Lam
8f3ec33591 update to 1.11.2 2022-01-05 16:40:50 +08:00
Jens Neuber
35360e2069 add badges 2022-01-03 15:48:52 +01:00
Louis Lam
4005856ba6 run build dist when building docker image 2021-12-27 19:09:51 +08:00
Louis Lam
5ee5ea909d Add Github Action: close-incorrect-issue.yml 2021-12-11 20:59:31 +08:00
Louis Lam
8bb8b0a53c update to 1.11.1 2021-12-09 01:23:49 +08:00
Louis Lam
f9cd0eb084 fix upload-artifacts 2021-12-08 15:35:44 +08:00
Louis Lam
7899707582 update to 1.11.0 2021-12-08 15:17:37 +08:00
Louis
b62f1475ee 🐍 2021-12-05 16:28:59 +08:00
Balázs Csaba
5a8162747c Upgrade qrcode to 1.5.0 2021-12-03 22:47:40 +01:00
Balázs Csaba
220108ebc6 Upgrade bree to 7.1 2021-12-03 22:39:38 +01:00
Csaba Balázs
0aca0455ab
HU language typo and missing items (#996) 
* HU language

* run eslint on hu.js

* Last HU typo

* package.json valid required node engine syntax

Package.json required node engine version can contain multiple rules separated with ||. With this mode package-lock.json will be valid and error codes does not diplay.

Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
 2021-12-03 15:47:35 +08:00
Louis Lam
8f3ef734bc disable e2e test, as it is getting unstable recently on GitHub action 2021-12-03 01:31:19 +08:00
Balázs Csaba
c36190bba6 Node engine version 2021-12-01 15:40:22 +01:00
Louis Lam
9f0c66d775 fix node-sqlite3 security issues 2021-11-24 14:53:15 +08:00
Louis Lam
94ffeeeab6 update dependencies 2021-11-23 13:32:24 +08:00
Louis Lam
c811c1ccde
Merge pull request #753 from chakflying/settings-redesign 
UI: Redesign/organize settings page
 2021-11-23 12:46:59 +08:00
Louis Lam
5d3bf68123 add remove-2fa command 2021-11-18 18:22:03 +08:00
Nelson Chan
07742799ed Test: Fix tests 
Test: Add clear stats test

Test: Attempt to fix tests

Test: Add test for disable auth

Update README
 2021-11-17 10:45:19 +08:00
Louis Lam
bf64095cea update to 1.10.2 2021-11-09 22:42:13 +08:00
Louis Lam
733d0af75f update to 1.10.1 2021-11-08 18:03:00 +08:00
Tarun Singh
6828e8ef6d Merge branch 'master' of https://github.com/tarun7singh/uptime-kuma 2021-11-03 21:47:44 -04:00
Tarun Singh
670754b697 added MQTT monitor type 2021-11-03 21:46:43 -04:00
Louis Lam
1ba2034701 freeze bootstrap to 5.1.3 to prevent breaking changes 2021-11-03 13:03:36 +08:00
Louis Lam
124c98ce76 update to 1.10.0 2021-10-31 13:48:05 +08:00
Louis Lam
741ed548da Merge branch 'master' into use_hideCount_option 2021-10-31 13:09:50 +08:00
Louis
ba93129b18 Merge branch '1.9.X' 
# Conflicts:
#	server/server.js
 2021-10-30 10:05:08 +08:00
Willian Rodrigues Barbosa
036218f711 Add badges to favicon 2021-10-29 22:25:32 -03:00
Louis
cf548df15f update to 1.9.2 2021-10-30 02:36:40 +08:00
Adam Stachowicz
f2a27a2cf1 Use hideCount option for pagination 2021-10-29 13:37:38 +02:00
Louis
3e5ae00d25 update dependencies 2021-10-29 18:04:58 +08:00
Andreas Brett
8fb8cbdaf3 use auth0/jwt-decode 2021-10-26 13:15:31 +02:00
Louis Lam
ff5f2e8dfb add limiter 2021-10-21 23:03:40 +08:00
Louis Lam
56094a43d7 add passwordStrength 2021-10-21 22:54:04 +08:00
Louis Lam
c6fc385289 update to 1.9.1 2021-10-19 00:20:27 +08:00
Louis Lam
5f36d2acda fix upload artifacts 2021-10-18 20:02:50 +08:00
Louis Lam
cc36ff5210 update to 1.9.0 2021-10-18 19:46:15 +08:00
Louis Lam
c363d3374e fix "build-docker-nightly-alpine" wrong path 2021-10-18 19:45:50 +08:00
Louis Lam
cb43ecb46e Merge branch 'master' into background-jobs 
# Conflicts:
#	package-lock.json
#	package.json
#	src/languages/en.js
 2021-10-16 15:06:59 +08:00
Louis Lam
e2dbacb383 Fix encoding problem of ping result for non-English Windows 2021-10-14 00:22:49 +08:00
Adam Stachowicz
281671b938
Fix build 
Add `cross-env` deleted in 11c3c636e0
 2021-10-13 01:10:17 +02:00
Louis Lam
407581ee07 move jest config files to config dir 2021-10-13 02:53:59 +08:00
Louis Lam
11c3c636e0 move dockerfile, docker-compose.yml to docker folder 2021-10-13 02:32:02 +08:00
Louis Lam
911d4ea37b move vite.config.js to config folder 2021-10-13 02:27:25 +08:00
Louis
2286f78f57 update to 1.8.0 2021-10-10 16:37:53 +08:00
Louis
d9eab90a69 Merge branch 'no-need-build' 
# Conflicts:
#	.dockerignore
#	.gitignore
 2021-10-10 16:34:13 +08:00
Nelson Chan
656a4d6270 WIP: Enable background jobs 
WIP: Remove better-sqlite3
 2021-10-09 21:46:59 +08:00
LouisLam
01812cc446 [test] add test for i18n currentLocale 2021-10-08 15:11:50 +08:00
LouisLam
11abc1f1e0 [test] add test for i18n currentLocale 2021-10-08 13:35:04 +08:00
LouisLam
c0846124c2 update vite to 1.6.4, since it fixed the issue 2021-10-07 21:23:28 +08:00
LouisLam
20af179a82 [test] try to auto test Windows and MacOS 2021-10-07 20:01:33 +08:00
Louis Lam
8c63536eb8
Merge pull request #451 from zsxeee/notification_form_i18n 
Notification form i18n
 2021-10-07 14:13:08 +08:00
LouisLam
a8badb027d update modded node-sqlite3 to 6.0.0 2021-10-07 14:09:50 +08:00
zsxeee
7f1edb49bc
Fix i18n 
Upgrade vue-i18n to 9.1.9.
Fix wrong tag name.
 2021-10-07 00:04:13 +08:00
zsxeee
7002a778f0
Rollback vue-i18n version to 9.1.7 2021-10-06 19:12:23 +08:00
LouisLam
4ded0c073a [test] fix timeout issue 2021-10-06 13:26:43 +08:00
LouisLam
49720c709c improve the test with a single command only "npm test" 2021-10-05 19:13:57 +08:00
LouisLam
e71f5bf314 update dependencies 2021-10-05 17:53:17 +08:00
LouisLam
79e0c9e1f1 setup unit test for setup 2021-10-05 17:39:44 +08:00
LouisLam
d25603e629 update jest test 2021-10-05 16:03:35 +08:00
LouisLam
37d1e50ff1 fix data path for test 2021-10-03 18:18:47 +08:00
LouisLam
a2a4c70cf5 setup jest-puppeteer 2021-10-03 18:16:55 +08:00
LouisLam
2625cbe0d2 add script for downloading the dist files from github 2021-10-02 14:43:31 +08:00
LouisLam
7b4c70860c split the base images in order to prevent recompile the base part 2021-10-01 17:28:00 +08:00
LouisLam
6513c3e75f allow update minor version only, to prevent the breaking change in the future like vite 2.6 2021-10-01 16:48:23 +08:00
Louis Lam
9d079eeec0
Merge pull request #487 from cmandesign/feature/fa-lang-rtl 
Feature/fa lang rtl
 2021-10-01 16:28:20 +08:00
LouisLam
8d8d5987e7 update to 1.7.3 2021-09-30 14:44:37 +08:00
LouisLam
1fa90bffaa freeze vite version to 2.5.* (2.6.* is broken when build the project) 2021-09-30 14:43:29 +08:00
LouisLam
67f221d3c7 update to 1.7.2 2021-09-30 13:04:49 +08:00
Soroosh
f2c7308c96 Fixed Change Language Direction In Setting Page 2021-09-29 10:44:34 +03:30
LouisLam
3677aa639f update to 1.7.1 2021-09-29 14:26:30 +08:00
Soroosh
04b7a4a423 Merge Conflict Resolved 
Farsi Lang Updated
Some hardcoded words has been replaced with translations
 2021-09-26 19:56:25 +03:30
Soroosh
56d8f585fd Add postcss-rtlcss and postcss-scss 2021-09-26 18:54:51 +03:30
LouisLam
ce9a97a107 update to 1.7.0 2021-09-24 19:17:29 +08:00
LouisLam
0afa3a2c21 Merge branch '1.6.X' 
# Conflicts:
#	server/database.js
#	server/server.js
 2021-09-24 19:12:57 +08:00
LouisLam
51512b6f5f update dependencies 2021-09-24 19:00:06 +08:00
LouisLam
70fbe9a2d9 fix alpine nightly build 2021-09-24 16:00:08 +08:00
Adam Stachowicz
5fa9b33c79 Install cross-env as dev dependency for now 2021-09-23 12:49:15 +02:00
Adam Stachowicz
f6a984b671 start-server-dev. Fixes #460 2021-09-23 12:45:30 +02:00
LouisLam
a71814c80b add util.ts comments 2021-09-21 21:28:45 +08:00
LouisLam
469e8f6fd6 Merge branch 'master' into public-dashboard 
# Conflicts:
#	package-lock.json
 2021-09-21 17:05:13 +08:00
LouisLam
780cb0a145 install-legacy-peer-deps to install-legacy 2021-09-21 17:03:37 +08:00
LouisLam
1c8b3ce451 no need to build sqlite and add nightly for alpine 2021-09-21 10:47:55 +08:00
LouisLam
4591adc05e second attempt: prebuilt node-sqlite3 and update SQLite to 3.36 2021-09-21 01:15:20 +08:00
LouisLam
76a39f1388 update to 1.6.3 2021-09-20 16:56:03 +08:00
LouisLam
6681f49a58 Merge branch 'master' into public-dashboard 
# Conflicts:
#	.dockerignore
 2021-09-19 15:16:13 +08:00