120 commits

Author	SHA1	Message	Date
Louis Lam	5311bef3eb	Merge pull request #809 from Saibamen/pagination_no_text ... Don't display "count" text for pagination	2021-10-29 16:05:59 +08:00
Adam Stachowicz	18a99c2016	Revert deleting records and "One record" keys	2021-10-28 14:20:56 +02:00
Louis Lam	71884cf42a	Merge pull request #772 from andreasbrett/patch-6 ... show logged in user on settings page	2021-10-27 10:24:45 +08:00
Adam Stachowicz	2e7ad1b7b2	Don't display "count" text for pagination	2021-10-26 18:03:49 +02:00
Louis Lam	77addfebc8	Merge branch 'tarun7singh_master' ... # Conflicts: # src/languages/vi.js	2021-10-26 16:26:59 +08:00
Adam Stachowicz	1239f6d1a2	PL update + fixes	2021-10-24 21:50:02 +02:00
Tarun Singh	bc68088350	Click send sms integration for notifications	2021-10-24 15:17:29 -04:00
Andreas Brett	4becb97a5d	Update en.js	2021-10-23 01:54:36 +02:00
Andreas Brett	85e2b36424	Update en.js	2021-10-23 01:54:07 +02:00
Andreas Brett	abdf1ae90a	Update en.js	2021-10-23 01:53:31 +02:00
Andreas Brett	606c967985	Merge branch 'master' into patch-6	2021-10-23 01:52:54 +02:00
Andreas Brett	9ad8e5f56a	show logged in user	2021-10-22 13:05:52 +02:00
NeuralMiner	a35569481d	Updates	2021-10-18 15:26:38 -06:00
NeuralMiner	572a5300aa	Recommended updates.	2021-10-18 13:25:53 -06:00
Louis Lam	20d59e5a13	fix and move the steam api key to settings page	2021-10-18 17:02:05 +08:00
Louis Lam	ae31eb6ba9	Merge branch 'master' into Revyn112_master ... # Conflicts: # server/model/monitor.js # src/languages/en.js # src/pages/EditMonitor.vue	2021-10-18 15:50:35 +08:00
Louis Lam	6944b35ea7	Merge pull request #667 from zsxeee/i18n ... Missing i18n and zh-CN translation	2021-10-16 22:47:58 +08:00
Daniel Patrón Gómez	0a73b84ae6	Add records translations and fix pause translation	2021-10-16 12:45:41 +02: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	4178983df3	Merge remote-tracking branch 'origin/master'	2021-10-15 19:01:04 +08:00
Louis Lam	cd211a6be7	[http options] fine tune	2021-10-15 18:36:40 +08:00
Louis Lam	4e71ab7406	Merge branch 'master' into feature/add-support-for-method-body-and-headers	2021-10-15 16:07:05 +08:00
Louis Lam	8338881927	[SMTP] change {{HOSTNAME}} to {{HOSTNAME_OR_URL}}, support for http montior type, some UI improvements	2021-10-14 16:07:25 +08:00
Louis Lam	674b387c95	Merge branch 'master' into smtp-subject	2021-10-14 14:59:54 +08:00
hrtkpf	84507268ad	fix translations (de-DE and en)	2021-10-13 11:13:51 +02:00
zsxeee	33f773fcd0	Move param out of the translation file	2021-10-13 15:36:07 +08:00
zsxeee	3fe91c52cb	Fix i18n ... Missing webhook json description Ajust Telegram context-based sentence, (also changed translated language files) Missing primary base url label Wrong PromoSMS i18n Missing Octopush legacy hint Missing Matrix i18n Missing push url i18n	2021-10-12 16:29:18 +08:00
wuwenjing	6d9b71c054	Add Feishu notification	2021-10-11 17:20:09 +08:00
LouisLam	272d4bde45	find promossms language key typo	2021-10-10 13:19:10 +08:00
Lukas	792f3c7c5c	Add support for values of Name, Hostname and Status	2021-10-09 21:48:28 +02:00
Lukas	5e3ea3293c	Very basic email subject customization	2021-10-09 20:32:45 +02:00
Nelson Chan	6cf2eb036d	Fix: Improve settings layout and wording	2021-10-09 23:51:05 +08:00
Nelson Chan	dca5a59dbc	Feat: Implement data clearing logic & frontend	2021-10-09 23:33:47 +08:00
Bert Verhelst	d71d27220b	fix(edit-monitor): store headers as JSON	2021-10-09 12:42:32 +02:00
Bert Verhelst	b8093e909b	fix(edit-monitor): fix minification of translations containing { }	2021-10-09 11:38:12 +02:00
Bert Verhelst	daab2a05f5	Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers	2021-10-09 11:13:16 +02:00
Lukas	12b5489eb5	PromoSMS as Notification Provider ... Add PromoSMS (Polish SMS Gateway) as new notification provider	2021-10-07 21:56:32 +02:00
LouisLam	ddad2dcb4a	Merge remote-tracking branch 'origin/master' ... # Conflicts: # src/languages/en.js	2021-10-08 01:40:34 +08:00
LouisLam	e96121f69a	fix merging mistake	2021-10-08 01:39:14 +08:00
LouisLam	2ce5c28ed4	Merge branch 'master' into feature/matrix-notifications ... # Conflicts: # src/languages/en.js	2021-10-08 00:59:39 +08:00
Bert Verhelst	8be4bf0e16	Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers	2021-10-07 08:56:29 +02:00
Bert Verhelst	162ef04c41	Merge branch 'master' into feature/add-support-for-method-body-and-headers	2021-10-06 21:56:28 +02:00
zsxeee	54d2fbcc02	Fix i18n ... Prevent use esm-bundler build vue-i18n Escape keyword: '@'	2021-10-06 18:21:31 +08:00
LouisLam	c8706b9aa1	Merge branch 'master' into notification_form_i18n ... # Conflicts: # src/components/notifications/SMTP.vue # src/languages/en.js	2021-10-06 16:48:14 +08:00
Gero Gerke	5decfb9fad	Matrix Notifications	2021-10-05 20:03:56 +02:00
Bert Verhelst	afeb424dc0	fix(edit-monitor): add translations to en.js	2021-10-05 09:20:24 +02:00
Adam Stachowicz	8ae64843fc	run update-language-files	2021-10-04 23:32:16 +02:00
Adam Stachowicz	23e64b8efd	Merge branch 'master' into fix_pl_i18n	2021-10-04 23:29:21 +02:00
zsxeee	0f2059cde0	Use named slot translation when has multi-slot	2021-09-30 19:48:24 +08:00
zsxeee	138ddf5608	Move attribute tag to start of tag	2021-09-30 19:22:17 +08:00