cefe43800f
add alerta service
3 years ago
97a5b400db
Added log out button to nav bar
...
Implements Logout button in navbar #1209
Signed-off-by: Computroniks <mnickson@sidingsmedia.com>
3 years ago
ca89f84b9a
Added sign-out-alt icon
...
Signed-off-by: Computroniks <mnickson@sidingsmedia.com>
3 years ago
eaf370637e
Fixed dark mode checkbox
...
The border colour of the checkbox has been changed to make it more
visible to the user when the dark mode is in use.
Signed-off-by: Computroniks <mnickson@sidingsmedia.com>
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
5fda1f0f59
minor fixes (missing commas, spaces, translations)
3 years ago
0d3414c6d6
A complete maintenance planning system has been created
3 years ago
dd3992063e
Apply suggestions from code review
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
0313acd4c5
🐛 Fix bug where a condition was wrong-false
3 years ago
cd19b9fc49
💫 Improve hearbeat animation
3 years ago
c57b2c4d28
💄 Fix spacing to get pixel perfectness
3 years ago
3dda5938f2
💄 Add condition to div tag for styling reasons
3 years ago
74c584f544
Add Push by Techulus
3 years ago
c3c4db52ec
Merge pull request #1184 from Khord/patch-1
...
Rename 2FA/TOTP field ID for password manager filling compatibility
3 years ago
ff0e85737f
Merge pull request #1182 from sovushik/patch-4
...
Update ru-RU.js
3 years ago
4713820da7
first csy translation
3 years ago
a99e87c02c
cs-CZ
3 years ago
3f8ca82434
cs-CZ translation
3 years ago
60f1eb7b45
new cs-CZ.js
3 years ago
6961af005e
eslint
3 years ago
847a19afc1
Update zh-CN.js
3 years ago
7532e7fd3e
Merge pull request #1192 from drodmantras/master
...
Update sl-SI.js
3 years ago
63a3704836
Update sl-SI.js
3 years ago
3e87eb596f
change wording, according to PR suggestions
3 years ago
c679613f7e
Updates some DE translations, fix typo in resolverserverDescription, removes some duplicates in languages
3 years ago
812e80030b
revert Token because of language file
3 years ago
b89efa49aa
retain Token verbiage in display name
...
since "Token" is used in several places in the 2FA setup screen
3 years ago
6490ef3787
rename 2fa input element id and display name
3 years ago
329c8cbc2d
Update ru-RU.js
...
Add new string
3 years ago
2bf9764cec
Merge pull request #1175 from sovushik/patch-3
...
Update ru-RU.js
3 years ago
6272514820
[MQTT] Use existing fields instead of creating new ones (Server)
3 years ago
1c8407a433
[MQTT] Use existing fields instead of creating new ones (UI)
3 years ago
32ec4beda0
Merge branch 'master' into mqtt
3 years ago
076d6bdbb6
Merge branch 'master' into mqtt
...
# Conflicts:
# package-lock.json
# server/database.js
3 years ago
52e0d74a1e
Update ru-RU.js
...
Add new string
3 years ago
23532aaafe
Update pl.js
...
Addendum to ab61acab63
3 years ago
06aab3dee8
Added missing text and fix typos
3 years ago
9f063cf477
Merge branch 'master' into patch-2
3 years ago
b83c896d0c
Merge pull request #1150 from sovushik/patch-1
...
Update ru-RU.js
3 years ago
5e2c39eb4b
Merge pull request #1144 from alex3025/master
...
Fixed italian (it-IT) translations
3 years ago
2a1f011f05
Merge pull request #1153 from drodmantras/master
...
Update sl-SI.js
3 years ago
ea43422ccf
Implement gorush notifications
3 years ago
cdcdf377ec
Update sl-SI.js
...
Small langue updates
3 years ago
30a345d8b6
Update ru-RU.js
...
Updated language files and added new lines
3 years ago
83d60fea29
Update ru-RU.js
...
1. Updated the language lines (in the correct declension)
2. Added new lines for the "Create Incident" functionality
3 years ago
2304c53c8d
Fixed some translations
...
And made them more user-friendly.
3 years ago
bcc3cec7d6
extract translation for notification type
3 years ago
69dfc0c0d2
Update bg-BG.js
...
Fixed some typos.
3 years ago
590859a95b
Merge branch 'master' into add-wecom-notification
3 years ago
f9c0ff1841
Merge pull request #1109 from iomataani/master
...
Updated translation
3 years ago
4b07ec23fe
Update
3 years ago
0e50b71290
Merge branch 'louislam:master' into master
3 years ago
d7cb4fa331
Update bg-BG.js
...
- Updated Bulgarian language file
3 years ago
e18d4b6ad0
Merge pull request #1045 from bilipp/google-chat-notifications
...
Add support for Google Chat Notifications
3 years ago
f6fc3737fc
Change name from "Google Chat" to Google Chat (Google Workspace only)
3 years ago
40b70277c7
feat(*): support WeCom notification
3 years ago
3d002b3ce9
add status boolean parameter to push monitor
3 years ago
3d6c52fbea
Merge branch 'master' into customstatuspage
3 years ago
9ee591417d
Footer HTML support, updated german translation
3 years ago
a2bc74c4fd
updated
3 years ago
3a12e209da
Edit: editMode check before toggle
3 years ago
2c2a824f97
Add: en & de-DE language
3 years ago
931ca6a3ef
Add: customize status page (css and poweredby)
3 years ago
624cd862a5
Feat: Expose SMTP DKIM settings
3 years ago
d3c90df8a8
fixed edit monitor fields empty issues
3 years ago
0ca68f791f
Merge pull request #1060 from drodmantras/master
...
Added sl-SI language
3 years ago
0de7fb69f6
Update bg-BG.js
...
Added new fields.
Translated new fields.
3 years ago
475a466c7e
Add attribute to basicauth-pass to prevent browsers from autocompleting ( #1063 )
3 years ago
b10cecb362
Added sl-SI language
...
Added sl-SI language
3 years ago
6d6cb2ad49
Merge pull request #1047 from dhfhfk/master
...
Update Ko-KR.js
3 years ago
aa92727a61
Updated de-De
3 years ago
56dfa05642
Update Ko-KR.js
3 years ago
8ad6bd31d4
Revert "order notification types by name"
...
This reverts commit 8398466860
3 years ago
8398466860
order notification types by name
3 years ago
8050cb8e99
implement google chat notification type
3 years ago
a09b97f778
Merge pull request #1032 from titiscan/patch-1
...
Update fr-FR.js
3 years ago
e0a08e6b5d
Merge pull request #1038 from iomataani/master
...
Updated italian translation
3 years ago
6f5cbbdf69
Merge pull request #1018 from Lrss/master
...
Update Danish translation
3 years ago
34ee342d3e
eslint
3 years ago
38f8a8ac2f
Merge branch 'louislam:master' into logging
3 years ago
f793aa5264
better translations
3 years ago
728485d686
updated translations
3 years ago
cb3429d3c7
Update fr-FR.js
...
typo fix
3 years ago
0d69b4426e
Merge pull request #1017 from SiderealArt/patch-1
...
update zh-TW translation
3 years ago
a4841eb8aa
Fix #1016 , .at() is not support in Safari
3 years ago
2ef2a42e87
Fixed string enclosure as suggested by update-language-files
3 years ago
9473cd6919
Update da-DK.js translation
3 years ago
74f18a2b3f
update zh-TW translation
3 years ago
e684712a77
Merge branch 'louislam:master' into logging
3 years ago
a041a7964a
Fix typos
3 years ago
5afc6a41e3
removed https requirement for url
3 years ago
f802154456
updated
3 years ago
9fb461976d
Merge branch 'louislam:master' into master
3 years ago
f331f1a63e
Merge pull request #873 from Saibamen/fix_871
...
Fix Telegram Bot Token displayed in notification setup view
3 years ago
d645e29455
mask telegram api url with asterisk
3 years ago
b4507f9706
Merge pull request #992 from jlbrt/stackfield-notifications
...
Add support for Stackfield notifications
3 years ago
19d2db6c8c
better translation
3 years ago
dcc7856b5d
Merge branch 'louislam:master' into logging
3 years ago
984a3704e0
HU lang
3 years ago
5434e2da4f
Merge pull request #993 from Saibamen/patch-1
...
Fix typos in markdown files
3 years ago
b3d348dcea
Translation Update ( #994 )
...
* Better translation
* better translation
* aggiornato
3 years ago
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>
3 years ago
76cbef85d5
Update README.md
3 years ago
67849a9e84
add support for stackfield notifications
3 years ago
4b3fae53d4
HU language typo
3 years ago
a796f80018
Merge pull request #902 from ivanbratovic/improve-translatables
...
Fix untranslatable parts of the UI
3 years ago
c9b0a81cdc
Update MonitorHistory.vue
3 years ago
2f97f44086
Update MonitorHistory.vue
3 years ago
a13bdaac84
Merge branch 'master' into logging
3 years ago
40cb22e671
Merge pull request #963 from kffl/feat/serwersms-provider
...
Add SerwerSMS.pl notification provider
3 years ago
d95258e7db
Merge remote-tracking branch 'upstream/master' into improve-translatables
3 years ago
baae4b5a5e
Remove unused translation keys from hr-HR
3 years ago
c1b118a0f6
Use existing Example translation for HTTP headers and body placeholders
3 years ago
9c5466890e
Revert "Replace body and header placeholder functions with translations"
...
This reverts commit 2c85491ee0
3 years ago
6cd130de38
minor
3 years ago
5070927478
Merge pull request #980 from MrEddX/bulgarian
...
Update bg-BG.js
3 years ago
077f3837d9
update language guide
3 years ago
aea128a85b
make settings' menu reactive
3 years ago
c50b2b636a
[lazy load lang] load the language file on create
3 years ago
a284703d9e
Update bg-BG.js
...
- Fixed existing field
- Added new field
- Translated new field
3 years ago
64ec766423
translate(serwersms): fix pl translation capitalization
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
186c11540f
style(serwersms): add missing trailing commas
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
50593f3edf
[wip] lazy load language file
3 years ago
c1267e9b3b
feat: add SerwerSMS notification provider
3 years ago
2ca7a5b962
Merge branch 'master' into improve-translatables
3 years ago
a1f9a82537
Merge pull request #884 from thomasleveil/ux/add-group-at-the-top
...
🚸 Status page - add group action adds the new group at the top
3 years ago
e3745da986
Merge branch 'master' into master
3 years ago
3a32fd6f42
aggiornata la traduzione
3 years ago
97cb060cf5
another typo
3 years ago
5afb29f8f9
typo
3 years ago
f9b8dbf4db
Merge branch 'louislam:master' into master
3 years ago
92a5f18bf5
Merge pull request #864 from ivanbratovic/http-basicauth
...
Implement explicit HTTP "basic" authentication support
3 years ago
4155f84eec
improve basic auth style
3 years ago
bd3d34400d
Merge branch 'master' of https://github.com/iomataani/uptime-kuma
3 years ago
ed96757b24
Merge branch 'louislam:master' into logging
3 years ago
a2de9e4e36
Fixed export-function signature being scrambled.
3 years ago
df813fbdee
Fix: Add save in monitor history
3 years ago
07742799ed
Test: Fix tests
...
Test: Add clear stats test
Test: Attempt to fix tests
Test: Add test for disable auth
Update README
3 years ago
f65cc655c0
Fix: Fix nav highlight in settings sub-page
3 years ago
1a218aaa17
Fix: Fix page transition & improve active handling
...
Fix: Fix current route parsing
3 years ago
369cad90c1
WIP: Convert to use vue-router & improve layout
...
WIP: Fix security page & improve layout
WIP: Fix displaying current page
UI: Improve spacing
Chore: Improve styling
3 years ago
f9bb48de13
WIP: Convert Settings to components
3 years ago
3f5133d1ba
Added authentication logic
3 years ago
74d2b38cb6
Merge pull request #925 from iomataani/italian-language-update
...
Translation update
3 years ago
be3a791e6e
Update ja.js
...
日本語を最適化
3 years ago
9747048890
correzioni e miglioramenti
3 years ago
6f2dcc6dd7
using provided tsc config
3 years ago
57bed4d672
Merge branch 'louislam:master' into logging
3 years ago
df36a4bb3c
console.info for level "info"
3 years ago
e5913c5abc
separate log functions
3 years ago
d5d957b748
update vi.js ( #853 )
...
* update vi.js
* Update vi.js
* Update vi.js
3 years ago
5cdb5edeb3
corretto
3 years ago
73c18b6ff0
correzione
3 years ago
567ea346fe
Add missing translations for placeholders in EditMonitor page
3 years ago
453f6fbadf
Add more missing translations
3 years ago
dd79042128
Add translation for "Info" in Settings
3 years ago
583e6bf978
Update croatian language for testing new translation
3 years ago
b1fca7c1a7
Add translation of toast success message
3 years ago
19dd11d624
Add translation for incident error message
3 years ago
42ce34b6c7
Add more Status page tranlations
3 years ago
b7a9d1474f
Fix translation of selected incident style
3 years ago
31fa67452e
Delint English language file
3 years ago
9ef3727c91
Backed out of commit `be1933614`
...
Running update-language-files will just confuse translators
3 years ago
ed39485af9
Merge with upstream `master`
...
Signed-off-by: Ivan Bratović <ivanbratovic4@gmail.com>
3 years ago
daef238a70
Updated Italian Language ( #911 )
...
Co-authored-by: Paride Barison <paride.barison@lantechlongwave.it>
3 years ago
d21f7971b5
missed settings
3 years ago
bdcdf47e52
introduce consistent logging
3 years ago
4cc433166e
Add missing translation for SMTP security option
3 years ago
28f530394e
Add missing translation lookup for ClickSendSMS
3 years ago
b0615d347b
Add incident creation translations
3 years ago
be19336149
Run `update-language-files` for all languages
3 years ago
94508cae2f
Add some missing translations
3 years ago
265cca9ed1
Replace "Default" notification badge with translation
3 years ago
267654c987
Replace hard-coded names for groups in Status page with translations
3 years ago
2c85491ee0
Replace body and header placeholder functions with translations
3 years ago
ba46fb6b1c
Clickable URL
3 years ago
f55350bebc
Generated documentation :)
3 years ago
3721d11259
changed table column names for more specifity
3 years ago
5df34cd137
Merge pull request #885 from ZegertBoele/patch-1
...
Update to dutch translations
3 years ago
95bae8289d
Fix setting page when disabled auth
3 years ago
dff1056bb1
Update nl-NL.js
...
@deefdragon noticed a flaw, fixed in here
3 years ago
62222c0336
Update src/languages/nl-NL.js
...
@koen20 added this correction.
Co-authored-by: Koen Habets <6172623+koen20@users.noreply.github.com>
3 years ago
734762b773
Merge with `master`
...
Signed-off-by: Ivan Bratović <ivanbratovic4@gmail.com>
3 years ago
34d8984e3a
Merge branch 'master' into http-basicauth
3 years ago
ad82ab0305
Merge pull request #883 from andreasbrett/patch-7
...
24h tooltip on status page
3 years ago
f952d283c6
Merge pull request #815 from Fallstop/tags-on-status
...
Display Monitor Tags on Status Page
3 years ago
e164fabf81
Merge pull request #849 from Minvinea/master
...
Adding missing translations
3 years ago
bc69a331ee
eslint
3 years ago
e4506963d9
Merge branch 'louislam:master' into tags-on-status
3 years ago
222540898b
Some translations were not translated
...
Some translations were not translated yet. I have added them and can be contacted if you want more English-Dutch translations.
3 years ago
baf3612ece
🚸 Status page - add group action adds the new group at the top of the page
3 years ago
8f44b9f618
24h tooltip on status page
3 years ago
149015556b
server url changes
3 years ago
2bcbeba384
update review suggestions
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
0481a241f3
Add translated placeholders for editing basic auth
3 years ago
179ca232bc
Minor refactor - change variable names and add commas to object definitions
3 years ago
0dcb7aed21
Delinting
3 years ago
23736549f9
Implement HTTP basic auth feature
3 years ago
6828e8ef6d
Merge branch 'master' of https://github.com/tarun7singh/uptime-kuma
3 years ago
670754b697
added MQTT monitor type
3 years ago
314fa18bdc
Fix #871
3 years ago
ee2c54cfd1
Update bg-BG.js
...
- Added New Fields
- Fixed Existing Fields
3 years ago
dee131c25d
fix table hover color not working after updated bootstrap to 5.1.3
3 years ago
e5d6410caf
Apply formatting suggestions from code review
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
1fb9b25d13
Improve hr-HR translations
3 years ago
9a135deac2
Add new translation for 'Uptime'
3 years ago
8e6173c05e
Fix and add new hr-HR translations
3 years ago
191b81ee07
Fix grammer in comment
...
Co-authored-by: Nelson Chan <chakflying@hotmail.com>
3 years ago
12ef9f39c5
Merged buttons, cleaned up SS tag retrieval and made tagsVisible a bool.
...
Also to note: due to the transition of tagsVisible this breaks compatibility with the previous commits, delete the tagsVisible setting in the database to fix.
3 years ago
4004926e64
Small formatting changes from code-review
...
Co-authored-by: deef <deef551@gmail.com>
3 years ago
4d3d6d6e25
Missing this...
3 years ago
d06e5ef6fa
More small letters
3 years ago
b12b848d97
One more typo...
3 years ago
bb96a577ca
Fix typos + translate `wayToGetTeamsURL`
3 years ago
8840ca618b
Update `pl.js`
3 years ago
8ec858fd14
Add missing translation
...
Line 282 to 306
3 years ago
741ed548da
Merge branch 'master' into use_hideCount_option
3 years ago
bc615c2dd8
Merge pull request #832 from ivanbratovic/croatian-language
...
Clarity and grammar fixes to hr-HR languange file
3 years ago
1dbf1c3dea
fix logout
3 years ago
b32bfb3ff1
Added toggle for tag visibility
3 years ago
24664cde2c
Smarter CSS to fix Mobile alignment
3 years ago
348c5ec995
Match lint settings
3 years ago
9143b73f84
Styling for tags
3 years ago
5e6d945095
Most hacked in POC
3 years ago
036218f711
Add badges to favicon
3 years ago
69aa60d1fb
Add missing i18n key + translate 2 keys for polish
3 years ago
eaecd6e571
Clarity and grammar fixes to hr_HR languange file
3 years ago
f2a27a2cf1
Use `hideCount` option for pagination
3 years ago
5311bef3eb
Merge pull request #809 from Saibamen/pagination_no_text
...
Don't display "count" text for pagination
3 years ago
c400595f67
Merge pull request #825 from SiderealArt/patch-1
...
Add Traditional Chinese (Taiwan) translation
3 years ago
67a22399bc
Update i18n.js
3 years ago
947fc6001e
Update Settings.vue
3 years ago
c87e67ad1b
Add Traditional Chinese (Taiwan) translation
3 years ago
6f92774a8f
ESLint pass on hr-HR.js file
3 years ago
6e76ab7426
Import hr-HR language in i18n.js
3 years ago
b2fbd7e263
Add confirmDisableAuth tranlation for hr-HR
3 years ago
199e6ec82b
Add initial version of Croatian language
3 years ago
18a99c2016
Revert deleting `records` and `"One record"` keys
3 years ago
de5cce9d90
Steam API Key to HiddenInput
3 years ago
71884cf42a
Merge pull request #772 from andreasbrett/patch-6
...
show logged in user on settings page
3 years ago
cb3da50e7e
Update bg-BG.js
...
Small fixes
3 years ago
2e7ad1b7b2
Don't display "count" text for pagination
3 years ago
a9e319517a
add auto vacuum and shrink database button
3 years ago
8fb8cbdaf3
use auth0/jwt-decode
3 years ago
3f3d8b4eb3
fixes
3 years ago
77addfebc8
Merge branch 'tarun7singh_master'
...
# Conflicts:
# src/languages/vi.js
3 years ago
16846c7c6d
Merge pull request #790 from Saibamen/pl_update+fixes
...
PL update + fixes
3 years ago
d1c4d13903
Merge pull request #782 from Co2333/dev-lakr233-bark_notification
...
Support for Bark (APN) notifications
3 years ago
78424b4f2d
add simple loading chart effect
3 years ago
f8055ed03d
minor css
3 years ago
fe4724fc53
Merge branch 'master' into feat/chart-period
3 years ago
43791ee97e
Merge branch 'master' into dev-lakr233-bark_notification
3 years ago
6362ef6a9c
removed other langauge translation data
3 years ago
9d3a4e9d1e
Remove dot from `needPushEvery`
3 years ago
ba1e025353
added click send to number
3 years ago
4fc2603818
Merge branch 'patch-6' of https://github.com/andreasbrett/uptime-kuma into patch-6
3 years ago
7bc38d4231
remove unused vars
3 years ago
daad63d70b
Merge branch 'master' into patch-6
3 years ago
9ddd2c7365
use jwt
3 years ago
fa5ba12e14
Missing this
3 years ago
85053f865e
Fix typo
3 years ago
1239f6d1a2
PL update + fixes
3 years ago
fed611d1b9
Merge branch 'master' of https://github.com/louislam/uptime-kuma
3 years ago
bc68088350
Click send sms integration for notifications
3 years ago
90200958cd
Merge pull request #780 from kry008/patch-4
...
Update pl.js
3 years ago
d82f305f6e
Updated german language file
3 years ago
665bae0806
UI: Simplify dropdown design
3 years ago
e4be28a9e7
Fix: Validate beat time before appending
3 years ago
445674aacb
Chore: Improve code formatting & comments
3 years ago
2f7b60f5e5
Feat: Use separate storage for custom chart period
...
Fix: Fix import error
3 years ago
b83c59e308
WIP: Add options for chart period
...
Fix: Fix callback, add toast on error
Fix: Improve styling
Fix: Restore default chart behavior
Fix: Replace 1h with 3h
draft only
3 years ago
ce852dfa02
Support for Bark (APN) notifications
...
Update bark.js
3 years ago
c9549c0de2
change body and header placeholders, less misleading.
3 years ago
b5eb17ed93
Update pl.js
3 years ago
4becb97a5d
Update en.js
3 years ago
85e2b36424
Update en.js
3 years ago
abdf1ae90a
Update en.js
3 years ago
606c967985
Merge branch 'master' into patch-6
3 years ago
9ad8e5f56a
show logged in user
3 years ago
8a481a1be0
Merge pull request #769 from andreasbrett/patch-5
...
show beat.msg only if available
3 years ago
657987a013
fix: show beat.msg only if available
3 years ago
d74577608b
Merge pull request #766 from DX37/translation-ru
...
Update notifications area in ru-RU.js
3 years ago
060dde9827
Merge branch 'louislam:master' into master
3 years ago
1d1601cf24
Update notifications area in ru-RU.js
3 years ago
29e4e41215
Update ru-RU.js
3 years ago
6463d4b209
Fix: Integration Link Text
...
Maybe left there from the Slack template.
3 years ago
d0b0c64b81
Update bg-BG.js
...
- Fixed existing fields
- Added new fields
- Translated new fields
3 years ago
5a05d135b8
Add steam translation in spanish
3 years ago
e03ee593e2
Merge pull request #716 from NeuralMiner/textchanges
...
Text update
3 years ago
7def9dcec7
Merge branch 'louislam:master' into patch-1
3 years ago
a35569481d
Updates
3 years ago
572a5300aa
Recommended updates.
3 years ago
e1f1d4a959
Merge branch 'louislam:master' into textchanges
3 years ago
182597944d
fix #721
3 years ago
f74b2662c5
Fixed values for sms type
3 years ago
300a95d779
recompile util.js with tsconfig.json
3 years ago
16b44001e7
Merge remote-tracking branch 'andreasbrett/patch-1' into andreasbrett_patch-1
...
# Conflicts:
# src/util.js
3 years ago
f2f8f33b86
Merge branch 'master' into andreasbrett_patch-1
...
# Conflicts:
# src/util.js
3 years ago
20d59e5a13
fix and move the steam api key to settings page
3 years ago
ae31eb6ba9
Merge branch 'master' into Revyn112_master
...
# Conflicts:
# server/model/monitor.js
# src/languages/en.js
# src/pages/EditMonitor.vue
3 years ago
Alvin Pergens
Computroniks
Karel Krýda
Raphael Bernhart
Raphael Bernhart
Arjun Komath
Louis Lam
Buchtič
Roy Feng
Erik
Hans Mayer
Dylan Khor
sovushik
Adam Stachowicz
Łukasz Szczepański
Zack Elia
Matteo D
Philipp Bischoff
MrEddX
Leslie Leung
Minvinea
Ioma Taani
Jakub Blažej
Patrick Hafner
Patrick Hafner
Nelson Chan
Tarun Singh
Ivan Bratović
Erik
Ponkhy
dhfhfk
Andreas Brett
titiscan
Lars Sørensen
SiderealArt
iooner
Balázs Csaba
Jonas Liebert
kffl
Fluency
MultiGamer8853
Andreas Brett
Phuong Nguyen Minh
Adam Stachowicz
Calum Bird
Zegert Boele
Jasper Miller-Waugh
Thomas LEVEIL
Jasper Miller-Waugh
Your Name
Willian Rodrigues Barbosa
Lakr Aream
kry008
DX37
Daniel Patrón Gómez
NeuralMiner
NeuralMiner
Lukas