Infra-Mirrors/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-10-01 01:25:45 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,828 Commits 30 Branches 114 Tags 95 MiB
0223f86a2a
Commit Graph

1375 Commits

Author SHA1 Message Date
Louis Lam
670ea415b2
Merge pull request #1488 from c0derMo/update-german-translation 
updating german translation
 2022-04-14 00:03:53 +08:00
Louis Lam
17dcf6d3a2
Merge pull request #910 from andreasbrett/logging 
introduce consistent logging
 2022-04-13 23:47:08 +08:00
Louis Lam
e9ce1433cd Change log_info to log.info by making it into an object 2022-04-13 23:33:37 +08:00
c0derMo
f5d006add8 updating german translation 2022-04-13 14:45:41 +00:00
AnnAngela-work
5aa747a301 New translation 2022-04-12 20:41:25 +08:00
Louis Lam
81de2eedfb Fix template can contain one tag only, disable vue/require-component-is eslint rule 2022-04-12 20:23:11 +08:00
Louis Lam
4a6d7207ef Merge branch 'master' into customstatuspage 
# Conflicts:
#	src/languages/de-DE.js
#	src/languages/en.js
#	src/pages/StatusPage.vue
 2022-04-12 19:39:42 +08:00
Louis Lam
772d009f43 Merge branch 'master' into fluencydoc_master 
# Conflicts:
#	extra/update-version.js
#	server/client.js
#	server/server.js
 2022-04-12 17:44:04 +08:00
Louis Lam
9ec29c1bc4 Add back debug() for safe, but it is marked as deprecated 2022-04-12 16:37:05 +08:00
Louis Lam
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
 2022-04-12 16:32:14 +08:00
Louis Lam
a0d1ae2cce Better alignment of monitor list item 2022-04-11 18:02:18 +08:00
Louis Lam
f030487f7d Fix theme color that do not apply to status page with a custom domain 2022-04-10 13:46:00 +08:00
Louis Lam
c9fa183712 Manage domain names 2022-04-10 00:25:27 +08:00
Louis Lam
0b9b5102ec Minor 2022-04-09 17:23:22 +08:00
Louis Lam
c399984b7f Improve status page sidebar 2022-04-09 17:03:10 +08:00
Louis Lam
0afa0be5c2 Merge branch 'master' into status-page-domain 
# Conflicts:
#	server/database.js
 2022-04-09 16:07:09 +08:00
Louis Lam
a2d9474e85 Copy some keys from zh-TW to zh-HK 2022-04-09 14:51:26 +08:00
Louis Lam
8479e772cd
Merge pull request #1463 from JohnnyChiang/update-zh-TW-translation 
Update zh-TW translation
 2022-04-09 14:44:44 +08:00
Louis Lam
2e50ef0e8f
Merge pull request #1450 from AnnAngela/1.14.0-zh_cn 
1.14.0 translation improvement
 2022-04-09 14:40:38 +08:00
JohnnyChiang
25b5edea7f Update zh-TW translation 2022-04-08 01:47:01 +08:00
Louis Lam
fcb577097b [Proxy] Change to radio button 2022-04-07 15:26:00 +08:00
Louis Lam
e89356b283 Show proxy option for http monitor only 2022-04-07 14:37:33 +08:00
Louis Lam
c4e74c9943 Render <StatusPage> if domain matched 2022-04-06 22:43:22 +08:00
Louis Lam
355aec46dc Merge branch 'master' into status-page-domain 2022-04-05 22:59:39 +08:00
Louis Lam
70311f7a5a Add an option to enable/disable the domain name expiry notification #1364 2022-04-05 21:27:50 +08:00
Louis Lam
4b99160b1f Fix "Check Update" is not checked by default 2022-04-05 19:43:23 +08:00
AnnAngela-work
8e78e62eee Make translation better 2022-04-04 17:24:22 +08:00
AnnAngela
706d6cee07
Update some components to use i18n function, update en & zh-CN translation 2022-04-04 11:33:02 +08:00
AnnAngela-work
43eed45bae first part of zh-CN.js translation 2022-04-03 22:08:24 +08:00
AnnAngela-work
19b7e2ba5e Using grep to search $t("foo")-like pattern to fill up the missing part of en i18n file 2022-04-03 22:08:03 +08:00
Louis Lam
3218a0eee8 Merge remote-tracking branch 'origin/master' 2022-04-02 11:26:24 +08:00
Louis Lam
87ee3c20bd Update proxy password field 2022-04-02 11:25:27 +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
Balázs Csaba
53cea7f8d3 fix: update hu lang 2022-03-31 22:25:22 +02:00
Louis Lam
aef7719426
Merge pull request #1435 from LoaderB0T/favico 
feat: Favicon is updated based on satus page logo
 2022-03-31 21:32:13 +08:00
Louis Lam
514b9fb68a Add remark 2022-03-31 21:30:07 +08:00
Louis Lam
da32a1aa19 Add uk-UA to the languageList 2022-03-31 16:24:28 +08:00
Louis Lam
7a69f9f56f
Merge pull request #1438 from Deni7/master 
Add ukrainian translation
 2022-03-31 16:22:29 +08:00
Louis Lam
c50c20faa4 Minor fix for uk-UA 2022-03-31 16:19:04 +08:00
Louis Lam
cb6eeaef34 Bring connection error bar to the top 2022-03-31 16:15:34 +08:00
Denis Stepanov
ee3d7d8b42
Add ukrainian translation 2022-03-30 23:21:09 +03:00
Denis Stepanov
a277cfe9e8
Add ukrainian translation 2022-03-30 23:16:04 +03:00
Denis Stepanov
95b0df0270
Add ukrainian translation 2022-03-30 23:15:28 +03:00
Louis Lam
71be030733 Add package-lock.json and minor words 2022-03-30 18:52:10 +08:00
Janik Schumacher
73b338bba6 feat: Favicon is updated based on satus page logo 2022-03-30 12:09:38 +02: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
b8dea3a823 Merge remote-tracking branch 'origin/master' 2022-03-29 17:39:12 +08:00
Louis Lam
0da6e6b1fb Some improvements 2022-03-29 17:38:48 +08:00
DX37
61d0a0abce
update russian translation 2022-03-28 21:16:13 +07:00
Matthew Nickson
88604845e6
Merge branch 'master' into #1209-Logout-button-in-navbar 2022-03-27 13:48:50 +01:00
sovushik
e11ea7b061
Update ru-RU.js 
Add new string for 1.13.1
 2022-03-26 10:46:07 +05:00
Louis Lam
12237dec6e Merge remote-tracking branch 'origin/master' 2022-03-26 02:09:25 +08:00
Louis Lam
f6272155af Show page not found for invalid routes 2022-03-26 02:09:12 +08:00
Louis Lam
1ecd2e45d0 [Status Page] Plan to support domain names for status pages 2022-03-25 18:59:06 +08:00
Ivan Bratović
5922771909 Update croatian (hr-HR) translation file 
Signed-off-by: Ivan Bratović <ivanbratovic4@gmail.com>
 2022-03-25 11:05:51 +01:00
Louis Lam
28d72fcd08 Fix #1409, slug cannot be empty 2022-03-24 23:43:07 +08:00
Louis Lam
40991fbc28 Show reverse proxy guide along with websocket error 2022-03-22 23:46:13 +08:00
Louis Lam
bf20f9d290 Merge remote-tracking branch 'origin/master' 2022-03-22 21:37:18 +08:00
Louis Lam
5fa14161c4 Minor css 2022-03-22 21:37:04 +08:00
Louis Lam
5a2a59250d
Merge pull request #1405 from sovushik/patch-9 
Update ru-RU.js
 2022-03-22 17:17:37 +08:00
sovushik
210eebe144
Update ru-RU.js 
Add some fix for 1.13
 2022-03-22 13:00:16 +05:00
sovushik
4b04a9c214
Update ru-RU.js 
Add new string for version 1.13
 2022-03-22 12:58:38 +05:00
MrEddX
f65d0654a6
Update bg-BG.js 
Added new field.
 2022-03-21 21:12:15 +02:00
Louis Lam
4545eec3fe Better sticky monitor list 2022-03-21 23:53:55 +08:00
burakurer
73d904952d
Update tr-TR.js 
spelling correction "Sağlık Dırımları" => "Sağlık Durumları"
 2022-03-20 17:03:32 +03:00
Louis Lam
c22cc4d794
Merge pull request #1385 from jtagcat/patch-1 
Update et-EE.js
 2022-03-20 10:56:24 +08:00
Kyungyoon Kim
2f5beefa37
Update ko-KR.js 2022-03-19 03:19:02 -06:00
jtagcat
dae5ff690a
Update et-EE.js 2022-03-18 13:56:45 +00:00
Louis Lam
fb9a206542 [Status Page] Fix - show no status page 2022-03-18 21:47:14 +08:00
jtagcat
dc3da45dd6
Update et-EE.js 2022-03-18 11:27:33 +00:00
Louis Lam
aef0a66205 [Status Page] Simplify show tags logic 2022-03-18 17:56:46 +08:00
Louis Lam
37be7df9b0 [Status Page] Delete status page 2022-03-18 15:19:52 +08:00
Louis Lam
8d981c8f0b [Status Page] Fix migration and unpin incident 2022-03-18 14:14:22 +08:00
Louis Lam
220e46bc83 [Status Page] Fix theme bug 2022-03-18 12:57:37 +08:00
Louis Lam
59cdacc052 [Status Page] Enable Edit Mode only if the token is presented 2022-03-18 12:39:48 +08:00
Louis Lam
00738edbe7 [Status Page] Add ?edit 2022-03-18 00:00:56 +08:00
Louis Lam
27bfae67af [Status Page] Add a new status page 2022-03-17 23:38:43 +08:00
Louis Lam
719a136d1e [Status Page] Improved entry page 2022-03-17 22:44:47 +08:00
Louis Lam
502c7f87e7 [Status Page] Listing: Better loading effect 2022-03-17 19:07:05 +08:00
Louis Lam
78a732409b [Status Page] Fix translations 2022-03-17 18:56:59 +08:00
Louis Lam
c0c6419980 [Status Page] align icon and title using flexbox 2022-03-17 17:07:23 +08:00
Louis Lam
e87cdf4d09 [Status Page] wip, upload logo and status page listing 2022-03-17 16:42:26 +08:00
Louis Lam
1033ca5cf4 [Status Page] wip, combine api, add status_page_id into group and incident tables 2022-03-16 15:38:10 +08:00
Louis Lam
18ec42b060 [Status Page] wip 2022-03-16 14:14:47 +08:00
Louis Lam
7c7dbf68c1 [Status Page] wip, sidebar for editor 2022-03-15 12:00:29 +08:00
Louis Lam
d765b1c57a Merge branch 'master' into restructure-status-page 
# Conflicts:
#	src/pages/StatusPage.vue
 2022-03-12 15:50:42 +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
c68f7944e3 [Favicon] minor 2022-03-12 15:31:01 +08:00
Louis Lam
a9efdabcec [Favicon] Prevent error when no heartbeat 2022-03-12 15:30:02 +08:00
Louis Lam
b9dfcd1291 [Favicon] Code refactoring 2022-03-12 15:10:45 +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
Louis Lam
c65d771fad
Merge pull request #1358 from BCsabaEngine/master 
fix: .hu lang
 2022-03-12 10:38:37 +08:00
Louis Lam
50d6e888c2 [new status page] wip 2022-03-10 21:34:30 +08:00
Louis Lam
ae14ad5a84 Add a word "Status Pages" 2022-03-09 22:14:07 +08:00
MrEddX
edd9202de9
Update bg-BG.js 
Translation fix.
 2022-03-08 22:14:07 +02:00
MrEddX
a97d2a5498
Update bg-BG.js 
Added new fields.
 2022-03-08 22:10:17 +02:00
Louis Lam
1fa4a16663 Check beta release 2022-03-07 16:24:24 +08:00
Louis Lam
6a57c443fd Set telegram as the default notification type 2022-03-07 15:52:17 +08:00
Uğur Erkan
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
 2022-03-06 19:34:51 +03:00
Uğur Erkan
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
 2022-03-06 19:34:49 +03:00
Balázs Csaba
157f0de61a fix: .hu lang 2022-03-05 21:24:50 +01:00
Louis Lam
88c3d952d3 Improve settings page's UI/UX on mobile 2022-03-04 23:20:42 +08:00
Louis Lam
e3a0eaf6af Sort notification types in case-insensitive 2022-03-04 21:48:35 +08:00
Louis Lam
8bbf55777e
Merge pull request #1205 from arjunkomath/master 
Add notification provider - Push
 2022-03-04 21:39:59 +08:00
Louis Lam
c0e0698c21
Merge pull request #1225 from Computroniks/fix-checkbox-css 
Fixed dark mode checkbox
 2022-03-04 14:35:15 +08:00
Louis Lam
c52c8a4206 Merge branch 'master' into alerta 
# Conflicts:
#	server/notification.js
#	src/components/notifications/index.js
#	src/languages/en.js
 2022-03-04 14:10:37 +08:00
Louis Lam
9789d8cde8 Merge branch 'master' into alerta 2022-03-04 14:09:01 +08:00
Louis Lam
ccb3d85a48
Merge pull request #1157 from zackelia/master 
Implement gorush notifications
 2022-03-03 22:03:09 +08:00
Louis Lam
333505b039 Merge remote-tracking branch 'origin/master' 2022-03-03 20:49:13 +08:00
Louis Lam
602da565eb Sort notification types 2022-03-03 20:49:00 +08:00
deluxghost
b3a690f3b1
Update zh-CN.js 2022-03-02 23:12:30 +08:00
Louis Lam
7bc8c447cd Merge branch 'MikMuellerDev_master' 
# Conflicts:
#	src/languages/de-DE.js
 2022-03-02 17:17:15 +08:00
DX
0dba06e48b Update zh-CN translations 2022-03-02 15:34:11 +08:00
Louis Lam
0671e4ea2b Merge remote-tracking branch 'AnnAngela/master' 
# Conflicts:
#	src/languages/zh-CN.js
 2022-03-02 13:43:34 +08:00
Louis Lam
cd8eaef903
Merge pull request #1187 from pfandie/translations-de 
Updates some DE translations
 2022-03-02 13:39:19 +08:00
Louis Lam
51f5c009e3 Merge remote-tracking branch 'PrikolMen/patch-1' 
# Conflicts:
#	src/languages/ru-RU.js
 2022-03-02 13:37:21 +08:00
Louis Lam
3bf62c9ceb Merge branch 'patch-7-ru' 
# Conflicts:
#	src/languages/ru-RU.js
 2022-03-02 13:33:37 +08:00
Louis Lam
7b11539cff Merge branch 'patch-62' 
# Conflicts:
#	src/languages/ru-RU.js
 2022-03-02 13:31:43 +08:00
PrikolMen:-b
b4a3d68356
More correct Russian translation 
I tried to fix most of the shortcomings of the Russian translation...
 2022-02-28 14:55:23 +04:00
Louis Lam
60f67ccb35 Revert commit: a6fd626f 2022-02-26 16:57:13 +08:00
Louis Lam
a6fd626fb8 Locked Russian language, ask Putin to stop the war and unlock it 2022-02-26 14:56:57 +08:00
Balázs Csaba
f3112c0b85 fix: hu lang 2022-02-23 09:35:56 +01:00
Louis Lam
af07850ddf
Merge pull request #1287 from sovushik/patch-5 
Update ru-RU.js
 2022-02-21 15:12:27 +08:00
Louis Lam
7638b73645 Fix #1300 2022-02-15 23:30:07 +08:00
Mik Mueller
a997f8e4f9 Update de-DE.js 2022-02-15 12:58:02 +01:00
Mik Mueller
09dbb143ea
Merge branch 'louislam:master' into master 2022-02-15 12:51:21 +01:00
Hans Mayer
f19e983818
Merge remote-tracking branch 'origin/master' into translations-de 2022-02-14 14:39:21 +01:00
Louis Lam
986ddd92ff
Merge pull request #1198 from Buchtic/master 
CSY translation
 2022-02-13 14:11:00 +08:00
AnnAngela
c75c6c5640
Update zh-CN.js 
Update DingDing and AliyunSms setting dialogs for better translations and document links
 2022-02-11 22:50:46 +08:00
AnnAngela
5aed36b470
Update zh-CN 
----
关于 smtpDkimKeySelector：
Google Workspace 的帮助里用词为
[前缀选择器](https://annangela.page.link/smtpDkimKeySelector)
 2022-02-10 22:45:24 +08:00
sovushik
76b9fb967f
Update ru-RU.js 
Add new string
 2022-02-09 21:37:45 +05:00
sovushik
b58120d258
Update ru-RU.js 
Correct some words on Russian
 2022-02-09 21:26:47 +05:00
sovushik
79f99ce215
Update ru-RU.js 
Add new string
 2022-02-09 21:19:00 +05:00
Louis Lam
efaa55ad1f
Merge pull request #1269 from holao09/master 
Update Vietnamese language
 2022-02-09 21:42:02 +08:00
Louis Lam
32a898bee5
Merge pull request #1270 from rovast/master 
Update zh-CN  translation for setting module.
 2022-02-09 21:36:07 +08:00
Việt Nguyễn
daac9ddffc Update Vietnamese language 
Cập nhật một số thông tin tiếng Việt
 2022-02-09 16:17:10 +07:00
James White
6bd2ee8c69 Fix minor typos on disable auth warning 2022-02-08 21:53:15 +00:00
rovast
45dca072b2 Update zh-CN translation for setting module. 2022-02-07 15:28:21 +08:00
Mik Mueller
7d8b72c6c0
Merge branch 'louislam:master' into master 2022-02-06 10:57:10 +01:00
Hans Mayer
40cc885eb8
resolve conflict after update state 2022-02-05 11:48:48 +01:00
Mik Mueller
f1007ad42f Update de-DE.js 2022-02-02 22:59:13 +01:00
Mik Mueller
dd28ecaa2d Update de-DE.js 2022-02-02 22:57:02 +01:00
Mik Mueller
ffa585376d
Merge branch 'louislam:master' into master 2022-02-02 22:54:23 +01:00
dave9123
c1c1e2ba5b
Fixed the grammar issue 
Here's my pull request
 2022-02-02 10:13:55 +07:00
Louis Lam
2f7e24191a
Merge pull request #1237 from dave9123/patch-1 
[id-ID] Fixed some grammar error
 2022-02-02 00:31:50 +08:00
vfaergestad
0fce1b4b9b
Update nb-NO.js (#1232) 
Improved and finished the translation.
 2022-02-02 00:31:00 +08:00
Mik Mueller
11c2e86bfe
Update src/languages/de-DE.js 
Co-authored-by: Alf <62615304+Alf-Melmac@users.noreply.github.com>
 2022-02-01 08:13:30 +01:00
Mik Mueller
1bbf17f3da
Update src/languages/de-DE.js 
Co-authored-by: Alf <62615304+Alf-Melmac@users.noreply.github.com>
 2022-02-01 08:13:23 +01:00
Mik Mueller
39f8b30b36
Update src/languages/de-DE.js 
Co-authored-by: Alf <62615304+Alf-Melmac@users.noreply.github.com>
 2022-02-01 08:13:13 +01:00
Mik Mueller
ffb2c2996b
Update src/languages/de-DE.js 
Co-authored-by: Alf <62615304+Alf-Melmac@users.noreply.github.com>
 2022-02-01 08:12:42 +01:00
dave9123
65896ed035
Fixed some grammar error 
I fixed at some part of the text.
 2022-01-31 08:01:45 +07:00
Mik Mueller
b13b20bd95 improve certain German words and phrases, improve grammer in README.md 2022-01-30 00:17:25 +01:00
Phuong Nguyen Minh
a9df7b4a14
Update vi.js (#1226) 
* update vi.js
 2022-01-28 21:23:37 +08:00
Alvin Pergens
cefe43800f add alerta service 2022-01-27 20:54:04 +01:00
Computroniks
97a5b400db
Added log out button to nav bar 
Implements Logout button in navbar #1209

Signed-off-by: Computroniks <mnickson@sidingsmedia.com>
 2022-01-27 19:45:31 +00:00
Computroniks
ca89f84b9a
Added sign-out-alt icon 
Signed-off-by: Computroniks <mnickson@sidingsmedia.com>
 2022-01-27 18:57:14 +00:00
Computroniks
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>
 2022-01-27 17:40:03 +00:00
Raphael Bernhart
dd3992063e
Apply suggestions from code review 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2022-01-22 13:59:36 +01:00
Raphael Bernhart
0313acd4c5 🐛 Fix bug where a condition was wrong-false 2022-01-21 17:22:30 +01:00
Raphael Bernhart
cd19b9fc49 💫 Improve hearbeat animation 2022-01-21 17:13:38 +01:00
Raphael Bernhart
c57b2c4d28 💄 Fix spacing to get pixel perfectness 2022-01-21 17:13:24 +01:00
Raphael Bernhart
3dda5938f2 💄 Add condition to div tag for styling reasons 2022-01-21 15:39:49 +01:00
Arjun Komath
74c584f544 Add Push by Techulus 2022-01-21 07:42:03 +00:00
Louis Lam
c3c4db52ec
Merge pull request #1184 from Khord/patch-1 
Rename 2FA/TOTP field ID for password manager filling compatibility
 2022-01-20 15:18:42 +08:00
Louis Lam
ff0e85737f
Merge pull request #1182 from sovushik/patch-4 
Update ru-RU.js
 2022-01-19 14:37:08 +08:00
Buchtič
4713820da7
first csy translation 2022-01-18 14:44:11 +01:00
Buchtič
a99e87c02c
cs-CZ 2022-01-18 08:50:11 +01:00
Buchtič
3f8ca82434
cs-CZ translation 2022-01-18 08:48:39 +01:00
Buchtič
60f1eb7b45
new cs-CZ.js 2022-01-17 18:42:32 +01:00
Louis
6961af005e eslint 2022-01-18 01:12:25 +08:00
Roy Feng
847a19afc1 Update zh-CN.js 2022-01-17 15:03:39 +08:00
Louis Lam
7532e7fd3e
Merge pull request #1192 from drodmantras/master 
Update sl-SI.js
 2022-01-17 14:18:27 +08:00
Erik
63a3704836 Update sl-SI.js 2022-01-16 12:29:00 +01:00
Hans Mayer
3e87eb596f
change wording, according to PR suggestions 2022-01-15 12:25:17 +01:00
Hans Mayer
c679613f7e
Updates some DE translations, fix typo in resolverserverDescription, removes some duplicates in languages 2022-01-14 19:06:21 +01:00
Dylan Khor
812e80030b
revert Token because of language file 2022-01-13 23:43:57 -05:00
Dylan Khor
b89efa49aa
retain Token verbiage in display name 
since "Token" is used in several places in the 2FA setup screen
 2022-01-13 16:58:46 -05:00
Dylan Khor
6490ef3787
rename 2fa input element id and display name 2022-01-13 16:46:09 -05:00
sovushik
329c8cbc2d
Update ru-RU.js 
Add new string
 2022-01-13 22:07:21 +05:00
Louis Lam
2bf9764cec
Merge pull request #1175 from sovushik/patch-3 
Update ru-RU.js
 2022-01-13 13:18:23 +08:00
Louis Lam
6272514820 [MQTT] Use existing fields instead of creating new ones (Server) 2022-01-13 11:53:08 +08:00
Louis Lam
1c8407a433 [MQTT] Use existing fields instead of creating new ones (UI) 2022-01-13 11:36:55 +08:00
Louis Lam
32ec4beda0 Merge branch 'master' into mqtt 2022-01-13 11:24:45 +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
sovushik
52e0d74a1e
Update ru-RU.js 
Add new string
 2022-01-12 20:49:41 +05:00
Adam Stachowicz
23532aaafe
Update pl.js 
Addendum to ab61acab63
 2022-01-12 12:26:23 +01:00
Łukasz Szczepański
06aab3dee8 Added missing text and fix typos 2022-01-12 09:48:37 +01:00
Louis Lam
9f063cf477
Merge branch 'master' into patch-2 2022-01-10 17:56:47 +08:00
Louis Lam
b83c896d0c
Merge pull request #1150 from sovushik/patch-1 
Update ru-RU.js
 2022-01-10 17:55:46 +08:00
Louis Lam
5e2c39eb4b
Merge pull request #1144 from alex3025/master 
Fixed italian (it-IT) translations
 2022-01-10 17:54:22 +08:00
Louis Lam
2a1f011f05
Merge pull request #1153 from drodmantras/master 
Update sl-SI.js
 2022-01-10 17:53:03 +08:00
Zack Elia
ea43422ccf Implement gorush notifications 2022-01-09 12:05:11 -05:00
Erik
cdcdf377ec Update sl-SI.js 
Small langue updates
 2022-01-09 11:39:05 +01:00
sovushik
30a345d8b6
Update ru-RU.js 
Updated language files and added new lines
 2022-01-08 23:00:18 +05:00
sovushik
83d60fea29
Update ru-RU.js 
1. Updated the language lines (in the correct declension)
2. Added new lines for the "Create Incident" functionality
 2022-01-08 22:46:05 +05:00
Matteo D
2304c53c8d Fixed some translations 
And made them more user-friendly.
 2022-01-08 13:28:48 +01:00
Philipp Bischoff
bcc3cec7d6 extract translation for notification type 2022-01-05 23:57:40 +01:00
MrEddX
69dfc0c0d2
Update bg-BG.js 
Fixed some typos.
 2022-01-05 08:15:34 +02:00
Leslie Leung
590859a95b
Merge branch 'master' into add-wecom-notification 2022-01-03 21:43:56 +08:00