11243a6ca1
Merge pull request #1222 from NETivism/issue-1201
...
Show some pure text body in notification when keyword not found
2 years ago
54548e34ed
Added label to status badge
3 years ago
2c0180f323
Fix: Fix error when status page desc. is null
3 years ago
4fdaa1abb6
[Push API] Response 404 if error, fix #1721
3 years ago
cc258dce14
Merge pull request #1674 from philippdormann/feature/ntfy-support
...
feat: ntfy push support
3 years ago
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
3 years ago
091158cfe7
[Status Page] Preload data
3 years ago
e4ad8cbfc8
Remove unused variables
3 years ago
a674caa520
[Status Page] Add og meta tags
3 years ago
fa777c5bc0
Update server/server.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
6d0683b055
Update server/routers/api-router.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
25262cfb91
Update server/model/monitor.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
c095767f4a
[Status Page] SSR
3 years ago
ffb7ba176c
Merge remote-tracking branch 'origin/master' into status-page-inject-html
3 years ago
ea10d89f51
show correct down message for first tick
3 years ago
7f46223d68
Fix another log.debug call
3 years ago
df4ce811d9
Merge remote-tracking branch 'origin/master' into kaysond_master
...
# Conflicts:
# server/model/monitor.js
3 years ago
e9e78c26e5
Merge branch 'master' into master
3 years ago
ab4edf2092
Fix log.debug calls
3 years ago
5830f1e0b5
[feat] Adding PagerDuty notification
3 years ago
35b8e89457
Merge pull request #1473 from Computroniks/#1059-specify-dns-resolver-port
...
Added #1059 : Allow to specify Resolver Port for DNS Monitor
3 years ago
f23baf9c22
Added Push Monitor to Discord Notifications
3 years ago
54184350a4
fix: missing semicolons
3 years ago
14dbe7c334
clean up + default ntfs.sh server url
3 years ago
71f031c14e
add ntfy support
...
ref https://github.com/louislam/uptime-kuma/issues/1622
3 years ago
32cfd411f8
Fixed style & code errors
3 years ago
a9f3142cee
Merge branch 'master' into master
3 years ago
b7ba6330db
Feat: Add cert exp. settings
3 years ago
da99a57560
Merge remote-tracking branch 'fxgh/radius-check' into radius-check
3 years ago
42d68edab0
(style) add trailing comma
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
019d638767
Merge remote-tracking branch 'ghupstream/master' into radius-check
3 years ago
7a46b44d25
Merge remote-tracking branch 'origin/master' into karelkryda_master
...
# Conflicts:
# src/components/HeartbeatBar.vue
3 years ago
8ede6d888f
Merge remote-tracking branch 'origin/master' into fix-1448-discord-service-url
3 years ago
cec0521834
[Discord] Fix ping type should no port, update better naming
3 years ago
73b603dd10
Merge pull request #1627 from karelkryda/wrong-uptime-for-push
...
Fixed incorrect uptime calculation for push monitors
3 years ago
ef73af391f
added option for ntlm authorization
3 years ago
44f6fca945
added finally to close connection pool
3 years ago
c346ea7864
updated name on export
3 years ago
f0ad32a252
merged
3 years ago
5720017fb4
updated name on import
3 years ago
5bba19f866
updated format
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
e198f2f1ab
updated format
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
87f933df4f
added sqlserver monitor
3 years ago
398ecb7666
add radius check
3 years ago
66971deaf4
Merge remote-tracking branch 'origin/master' into fix-1448-discord-service-url
3 years ago
59be9bb971
working
3 years ago
8077744c60
Merge pull request #1604 from c-w/fix-apprise-zulip
...
Fix apprise integration for Zulip Streams
3 years ago
c5faf709b8
Merge branch 'master' into fix-1448-discord-service-url
3 years ago
7da9f139c1
Bug fix
3 years ago
42f931f6cf
Merge branch 'master' into master
3 years ago
2fe5c090aa
small fixes
3 years ago
b680371746
Make apprise notification title configurable in UI
3 years ago
4e3258579d
Merge branch 'master' into uptime-badges
...
# Conflicts:
# server/util-server.js
3 years ago
cd3fbc80b4
Add first parameter back to logging in api router
3 years ago
bb7d67f717
Apply suggestions from code review
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
9a35386841
Merge branch 'master' into master
3 years ago
429ad384d0
Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()
3 years ago
93050208bb
Merge database changes into single patch file
3 years ago
98ee9caf2c
Add variable for currentTime
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
8e99cbf426
Merge branch 'master' into introduce-resend-interval
3 years ago
cbfecab850
switch to the more-up-to-date esm-wallaby
...
https://github.com/wallabyjs/esm
3 years ago
4b9dc2890d
Convert let to const
3 years ago
f9004bcbed
Add optional title to apprise notification
3 years ago
bc174c3325
Extract child process args into variable
3 years ago
4c2753af46
Remove an unused variable
3 years ago
c6ba5b621c
Remove isPublished, checkPublished which had been removed in upstream.
3 years ago
2b14bdae62
Merge branch 'master' into master
3 years ago
d962ab7a1c
Merge branch 'master' into uptime-badges
...
# Conflicts:
# package-lock.json
# server/routers/api-router.js
3 years ago
53b98ad3e4
Add more comment for aliyun-sms fix
3 years ago
d0546afe71
fix esm require: no ugly warnings
3 years ago
31b90d12a4
Added the ability to choose on which status pages maintenance information should be displayed
3 years ago
b4ffcc5555
Added JSDoc
3 years ago
42ea3fb412
Update server/util-server.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
9f8b3151d8
Update server/util-server.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
73e38a13d2
Update server/notification-providers/aliyun-sms.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
f78d01d770
Resolve lint errors
3 years ago
7532acc95d
Resolve conflicts
3 years ago
f4515ad8c5
add axios cached dns resolve to monitor
3 years ago
ed84e56a85
Merge remote-tracking branch 'origin_kuma/master'
...
# Conflicts:
# package-lock.json
# server/database.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# src/components/MonitorList.vue
# src/components/PingChart.vue
# src/icon.js
# src/pages/DashboardHome.vue
# src/pages/StatusPage.vue
# src/router.js
# src/util.js
3 years ago
369477b4b9
Update aliyun-sms.js
3 years ago
2347a01f7c
Update aliyun-sms.js
...
Add comments for the changed code.
3 years ago
ae2c49a729
Update aliyun-sms.js
3 years ago
b9e72b9645
Update aliyun-sms.js
...
aliyun-sms.js: escape more characters than encodeURIComponent
see https://help.aliyun.com/document_detail/315526.html
字符A~Z、a~z、0~9以及字符-、_、.、~不编码。对其它ASCII码字符进行编码。
3 years ago
60538036c6
[ #1108 ] Change "true" to "up"
3 years ago
0ba5d031d0
Merge branch 'master' into push-status-param
...
# Conflicts:
# server/routers/api-router.js
3 years ago
023db1450d
Fix #1577
3 years ago
3c01e8732c
Merge branch 'master' into #1059-specify-dns-resolver-port
3 years ago
1687de163c
Merge pull request #1565 from Saibamen/eslint
...
Fix some of ESLint warnings
3 years ago
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
3 years ago
1e595eaa76
Update linters
3 years ago
5fbfacf5ce
Fix ESlint warnings
3 years ago
d1a3cd047a
Merge branch 'master' into #1059-specify-dns-resolver-port
3 years ago
587faecf87
Made value nullable in apicache JSDoc
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
46da5e51be
Fix JSDoc grammar
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
1eecdec2d9
Update JSDoc for better clarity
...
Co-authored-by: Nelson Chan <chakflying@hotmail.com>
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
64a33d7455
Update server/util-server.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
09e61d9d63
Changed Array<T> to type[]
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
9996ba1636
Add JSDoc to server/modules/apicache/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
c2f6c5b42e
Added JSDoc docs for mqttAsync
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
0083485d4c
Updated server/model/* JSDoc to match new methods
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
7ed8ae9f7c
Fix trailing space warning
3 years ago
4ddbf71920
Fixed trailing spaces in database.js
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
068b920553
Add JSDoc to server/socket-handlers/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
d6b591a513
Make comment more readable
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
3d04befc1f
Add JSDoc to server/routers/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
6d22ebedca
Merge branch 'master' into add-JSDoc-comments
3 years ago
19933bbd99
Improve backwards compatibility
3 years ago
60f8ab7285
Use new logging mechanism
3 years ago
b7e2489d22
Merge branch 'master' into introduce-resend-interval
3 years ago
03b2d8d521
Add JSDoc to server/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
e103ac8335
Merge branch 'master' of https://github.com/louislam/uptime-kuma into uptime-badges
3 years ago
10f6a3c4f5
Merge pull request #1229 from Computroniks/#1209-Logout-button-in-navbar
...
Add #1209 : logout button in navbar
3 years ago
200fdfb808
Merge code manually since some code moved to another file
3 years ago
29d2d95c71
Merge branch '1.14.X'
...
# Conflicts:
# package.json
# server/server.js
3 years ago
919393cac9
Partially change the server core into a class, remove all require("./server") #1520
3 years ago
17d4003e5c
Add dropdown menu
3 years ago
e2c45f93bf
Merge pull request #1509 from chakflying/feat/mqtt-optional-message
...
Feat: Allow MQTT successMessage to be optional
3 years ago
addf75daa7
Fix MQTT password do not save
3 years ago
359a490ae3
Fix #1510
3 years ago
cd38dd3f68
Feat: Allow MQTT successMessage to be optional
3 years ago
5fa62a888c
Merge branch 'master' into mqtt2
...
# Conflicts:
# server/database.js
# server/util-server.js
3 years ago
e6a8a84278
Include only nessacary data in webhook
3 years ago
47c72192e1
[eslint] Enable yoda and eqeqeq
3 years ago
d71c086447
Standardize array bracket spacing
3 years ago
8eb83394f7
Refine UI/UX for custom css / footer text. Add switch for show/hide powered by
3 years ago
45f44b183d
Add JSDoc to server/model/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
5a209c74e1
Add JSDoc to server/notification-providers/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
07c474db0b
Merge remote-tracking branch 'origin/master'
3 years ago
8d8c38b1a8
Allow unused vars in args and fix more eslint issues
3 years ago
e34420368b
Remove try-catch and fix username/password/port not working for mqtt
3 years ago
60c63cc18e
Add JSDoc to server/jobs/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
566133e350
Domain Name Expiry Notification for https monitor only
3 years ago
30e113755e
Add HIDE_LOG and catch error if cannot subscribe topic
3 years ago
083e8355b7
Change debug to log.debug
3 years ago
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
3 years ago
a680331dd7
Fixes issue with ::1 port 5300 requests
...
Now the address is wrapped in `[]` in order to prevent ::1 port 5300
being interpreted as ::1:5300. Wrapping the IPv4 address in `[]` does
seem to have any effect on correct domain name resolution. In order to
prevent issues if a user inputs an address with brackets, they are
removed from the string if present before being re-added when it is
passed to `setServers`. I have also removed the JSDoc comment as this
will be added in a seperate PR
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
288ed1e3ca
Merge branch 'master' into fix-1448-discord-service-url
3 years ago
fb0064082e
Change Pushdeer to PushDeer
3 years ago
93c51504f9
fixes: formatting and security issues
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
fb059f5e91
Add support for Pushdeer notifications
3 years ago
d0b5f147e2
Fix spelling and merge mistake
3 years ago
ddf8a7a692
Fix camelCase
3 years ago
bd9df09f87
Apply suggestions from code review, fix style
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
4656ab3d57
Add OneBot notification service
3 years ago
0a5db0cecb
Fix #1478
3 years ago
8c8eeaf627
Merge branch 'master' into #1059-specify-dns-resolver-port
3 years ago
b893d50e45
Implement specify Port for DNS Monitor #1059
...
This commit should fully implement #1059 . When the user selects the DNS
monitor option, a new input box has been added below the resolver
address allowing the user to implement the port to access the resolver
on. This uses the same `monitor.port` as the TCP monitor but a monitor
has been added to prefill the port value to the default of `53` if the
value in this field has not already been set. This is then cleared if
the user selects a different monitor type and has not changed the port
value. A translation has also been added explaining what this field
does in order to reduce any confusion. JSDoc documentation has also been
added to the `dnsResolve` function in `util-server.js`.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
649f3106e1
Enforce semicolon, fix format globally
3 years ago
17dcf6d3a2
Merge pull request #910 from andreasbrett/logging
...
introduce consistent logging
3 years ago
e9ce1433cd
Change log_info to log.info by making it into an object
3 years ago
361e44ad6a
Merge branch 'louislam:master' into master
3 years ago
4053b9db1f
Merge remote-tracking branch 'origin/master'
3 years ago
772d009f43
Merge branch 'master' into fluencydoc_master
...
# Conflicts:
# extra/update-version.js
# server/client.js
# server/server.js
3 years ago
6179f6c982
Merge branch 'master' into issue/1138
...
# Conflicts:
# server/server.js
3 years ago
94770cf865
Resolve log message null reference
3 years ago
279e2eb3f6
Merge branch 'master' into logging
...
# Conflicts:
# server/database.js
# server/jobs.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# server/socket-handlers/status-page-socket-handler.js
# server/util-server.js
3 years ago
2638d68c97
Cover dns and steam types in Discord notifs
3 years ago
0961c6d9b3
Check for ping and port type in discord notifs
3 years ago
c9fa183712
Manage domain names
3 years ago
0afa0be5c2
Merge branch 'master' into status-page-domain
...
# Conflicts:
# server/database.js
3 years ago
6a30dbd71a
Fix Mattermost when channel is empty #1468
3 years ago
7bbaeffd3e
Fix reset-password (issue caused by 5027fcd320)
3 years ago
008dc27f52
Reload proxy settings for monitors in the monitorList
3 years ago
5027fcd320
Export server using an object class
3 years ago
d5e68f8453
Export monitor list
3 years ago
082c2dd32d
Remove restartMonitors() and move proxy socket events to a socket handler file
3 years ago
c4e74c9943
Render <StatusPage> if domain matched
3 years ago
fee88b32e3
Set PRAGMA synchronous = FULL
3 years ago
c9deea9fdf
Merge pull request #1456 from Arubinu/alerta
...
Fix "API key parameter 'undefined' is invalid"
3 years ago
70311f7a5a
Add an option to enable/disable the domain name expiry notification #1364
3 years ago
4b99160b1f
Fix "Check Update" is not checked by default
3 years ago
48d679234a
Stop bree and cloudflared while the server shutting down
3 years ago
d3d1656625
Fix "API key parameter 'undefined' is invalid"
3 years ago
af44b0beab
Merge branch 'master' into master
3 years ago
84a0b24448
Update server/model/monitor.js
...
As per recommendation of @Computroniks
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
a4be651118
Update server/model/monitor.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
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
3 years ago
6674005e8b
Fix storing cloudflared token while start cloudflared
3 years ago
b72a2d350f
Set cloudflared token from env var or arg
3 years ago
82ea896bbc
Improve the workflow of cloudflared
3 years ago
f1f4b3b377
Add reverse proxy setting page for controlling cloudflared
3 years ago
a6b52b7ba6
Merge branch 'master' into cloudflared
3 years ago
b8dea3a823
Merge remote-tracking branch 'origin/master'
3 years ago
0da6e6b1fb
Some improvements
3 years ago
44fb2a88f2
Add cloudflared socket handler
3 years ago
d8013f31e8
Update version after merging new master branch
3 years ago
91366ff565
Merge branch 'master' into introduce-resend-interval
3 years ago
be88351eb3
Merge pull request #1136 from chakflying/fix/prometheus-on-delete
...
Fix: Remove prometheus metrics on delete [Test needed]
3 years ago
28d72fcd08
Fix #1409 , slug cannot be empty
3 years ago
71af08189e
Clear useless code
3 years ago
d32ba7cadd
Fix #1318 , basic auth is completely disabled if the auth is disabled
3 years ago
775d1696fa
Fix pushover device not working #1114
3 years ago
ad2130b7b5
[Status Page] Fix monitors are deleted unexpectedly #1399
3 years ago
3adda48f3a
Load the status page list earlier
3 years ago
d7a839aa52
[Status Page] Fix reset entry page
3 years ago
aef0a66205
[Status Page] Simplify show tags logic
3 years ago
37be7df9b0
[Status Page] Delete status page
3 years ago
8d981c8f0b
[Status Page] Fix migration and unpin incident
3 years ago
27bfae67af
[Status Page] Add a new status page
3 years ago
719a136d1e
[Status Page] Improved entry page
3 years ago
e87cdf4d09
[Status Page] wip, upload logo and status page listing
3 years ago
1033ca5cf4
[Status Page] wip, combine api, add status_page_id into group and incident tables
3 years ago
18ec42b060
[Status Page] wip
3 years ago
7c7dbf68c1
[Status Page] wip, sidebar for editor
3 years ago
50d6e888c2
[new status page] wip
3 years ago
72ce28a541
Migrate status page table
3 years ago
1e2a8453c6
Merge branch 'master' into restructure-status-page
3 years ago
1fa4a16663
Check beta release
3 years ago
8078d0618d
Add socks proxy support to proxy feature
...
- Socks proxy support implemented.
- Monitor proxy agent create flow refactored
and moved under proxy class.
Thanks for suggestion @thomasleveil
3 years ago
78d76512ba
Add http and https proxy feature
...
Added new proxy feature based on http and https proxy agents.
Proxy feature works like notifications, there is many proxy
could be related one proxy entry.
Supported features
- Proxies can activate and disable in bulk
- Proxies auto enabled by default for new monitors
- Proxies could be applied in bulk to current monitors
- Both authenticated and anonymous proxies supported
- Export and import support for proxies
3 years ago
8bbf55777e
Merge pull request #1205 from arjunkomath/master
...
Add notification provider - Push
3 years ago
fa490d0bf1
[Alerta] Handle general message
3 years ago
c52c8a4206
Merge branch 'master' into alerta
...
# Conflicts:
# server/notification.js
# src/components/notifications/index.js
# src/languages/en.js
3 years ago
9789d8cde8
Merge branch 'master' into alerta
3 years ago
ccb3d85a48
Merge pull request #1157 from zackelia/master
...
Implement gorush notifications
3 years ago
b62d94184a
Merge branch 'master' into restructure-status-page
3 years ago
595cd93220
Check invalid interval
3 years ago
258d93be72
Fix mattermost couldn't find channel issue
3 years ago
244a7b3671
Update server/model/monitor.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
8febff9282
fix comments
3 years ago
90f2497548
change data for Alerta
3 years ago
28be32fc68
Merge branch 'master' of https://github.com/louislam/uptime-kuma into uptime-badges
3 years ago
cefe43800f
add alerta service
3 years ago
b49e5d5c39
The SQL query to determine if the monitor is under maintenance is now in its own method.
3 years ago
ee90d2713f
refs issue-1201 in upstream.
...
Add 100 characters from response body to bean.msg after keyword not match.
3 years ago
e7b2832967
The start and end dates of the maintenance are now stored in UTC, which allows it to be converted between time zones
3 years ago
f390a8caf1
Fix missing DB patch and use DATETIME as column format
3 years ago
f931e709e6
Add database patch
3 years ago
5fda1f0f59
minor fixes (missing commas, spaces, translations)
3 years ago
11e9eee09d
Change seconds to minutes
3 years ago
b69a8b8493
Fix formatting
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
1ac904d6d6
Introduce resend interval if down
3 years ago
0d3414c6d6
A complete maintenance planning system has been created
3 years ago
29df70949d
Add ability to connect to daemon via http / tcp for windows compatibility
3 years ago
23796723dd
Address code review
...
Add missing comma
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
51b7a2badb
remove log
3 years ago
74c584f544
Add Push by Techulus
3 years ago
0345719e53
added cleartimeout in case client is already ended
3 years ago
22256dfcd2
added timeout for removing the dead loop state
3 years ago
aba6cb2c52
Merge pull request #1169 from jbenguira/patch-1
...
Fixed #1024
3 years ago
d1a99b0a22
Check Node.js version, better error message
3 years ago
4818bb67d6
Added trailing comma, fixed spelling & translation
3 years ago
3b9fac2942
Update server/prometheus.js
...
removed useless spaces
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
c5cc42272f
Fixing the editing of docker container & adding english translation
3 years ago
b0259b5592
Added docker container monitor
3 years ago
227bbdea2f
[MQTT] Try to improve error handling
3 years ago
6272514820
[MQTT] Use existing fields instead of creating new ones (Server)
3 years ago
32ec4beda0
Merge branch 'master' into mqtt
3 years ago
482b3f9233
Update server/util-server.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
076d6bdbb6
Merge branch 'master' into mqtt
...
# Conflicts:
# package-lock.json
# server/database.js
3 years ago
Louis Lam
Wooferz
Nelson Chan
Karel Krýda
Aram Akhavan
Moritz R
Marc Hagen
DasCanard
Philipp Dormann
c0derMo
Sascha Kruse
Sascha Kruse
Christopher Pickering
Christopher Pickering
Jordan Bertasso
Karel Krýda
Clemens Wolff
OidaTiftla
OidaTiftla
Greg Smith
GOGOsu
Matthew Nickson
Adam Stachowicz
Jens Neuber
Jens Neuber
ngc7331
ColdThunder11
ColdThunder11
Alvin Pergens
Jimmy Huang
Uğur Erkan
Ananth Kamath
Alvin Pergens
Jimmy Huang
Arjun Komath
Tarun Singh
Joseph Benguira