| 
							
							
								 Andreas Brett | 9ddd2c7365 | use jwt | 2021-10-25 01:23:02 +02:00 |  | 
			
				
					| 
							
							
								 Adam Stachowicz | 1239f6d1a2 | PL update + fixes | 2021-10-24 21:50:02 +02:00 |  | 
			
				
					| 
							
							
								 Louis Lam | c9549c0de2 | change body and header placeholders, less misleading. | 2021-10-23 22:14:05 +08: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 | 572a5300aa | Recommended updates. | 2021-10-18 13:25:53 -06:00 |  | 
			
				
					| 
							
							
								 NeuralMiner | e1f1d4a959 | Merge branch 'louislam:master' into textchanges | 2021-10-18 12:57:28 -06:00 |  | 
			
				
					| 
							
							
								 Louis Lam | 182597944d | fix #721 | 2021-10-19 00:19:26 +08: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 |  | 
			
				
					| 
							
							
								 Louis Lam | edcaf93446 | Merge pull request #721 from dpatrongomez/master Add Status Translation | 2021-10-16 17:41:46 +08:00 |  | 
			
				
					| 
							
							
								 Daniel Patrón Gómez | 53a008ae2b | Add Status Translation | 2021-10-16 11:32:15 +02:00 |  | 
			
				
					| 
							
							
								 Bert Verhelst | 61627545a5 | fix(edit-monitor): no need to escape placeholder {} if not translated | 2021-10-16 11:26:32 +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 |  | 
			
				
					| 
							
							
								 NeuralMiner | 8cb26d2b31 | Text update | 2021-10-15 19:12:09 -06:00 |  | 
			
				
					| 
							
							
								 januridp | 76e619c066 | Fix(Language): Bahasa Indonesia (Indonesian) | 2021-10-16 07:36:07 +07:00 |  | 
			
				
					| 
							
							
								 Louis Lam | f4b8da0a5c | Merge branch 'feature/add-support-for-method-body-and-headers' | 2021-10-15 19:02:49 +08:00 |  | 
			
				
					| 
							
							
								 Louis Lam | 4178983df3 | Merge remote-tracking branch 'origin/master' | 2021-10-15 19:01:04 +08:00 |  | 
			
				
					| 
							
							
								 Louis Lam | 7ac0ab2e34 | [http options] beautify the json format when clicked the save button | 2021-10-15 18:57:27 +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 | c593a962c2 | Merge pull request #627 from NixNotCastey/smtp-subject Add support for custom subject in emails | 2021-10-15 00:54:31 +08:00 |  | 
			
				
					| 
							
							
								 Louis Lam | 3b74b727f2 | [Push Type] fix missing important flag and missing up notification | 2021-10-14 22:32:15 +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 |  | 
			
				
					| 
							
							
								 zsxeee | 33f773fcd0 | Move param out of the translation file | 2021-10-13 15:36:07 +08:00 |  | 
			
				
					| 
							
							
								 KangAlleW | 2939bd4138 | fix locale | 2021-10-13 03:12:26 +07:00 |  | 
			
				
					| 
							
							
								 KangAlleW | 4b9f0a3fe6 | add indonesian language and edit settings.vue | 2021-10-13 02:53:46 +07:00 |  | 
			
				
					| 
							
							
								 Nelson Chan | 03b07730d3 | Fix: Increase default kept period | 2021-10-12 23:28:21 +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 |  | 
			
				
					| 
							
							
								 Daniel S. Billing | 62805014df | Update Settings.vue | 2021-10-10 18:38:19 +02:00 |  | 
			
				
					| 
							
							
								 Bert Verhelst | 8a739af5ad | Merge remote-tracking branch 'origin/master' into feature/add-support-for-method-body-and-headers | 2021-10-09 21:44:22 +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 |  | 
			
				
					| 
							
							
								 LouisLam | cac0a46bac | fix error if tls info object is in old format | 2021-10-09 19:08:38 +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 | c3c273f9df | fix(edit-monitor): fix regex to allow a single header | 2021-10-09 11:20:33 +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 |  | 
			
				
					| 
							
							
								 LouisLam | fc8d1e78b6 | [push type] hide upside down mode, apply primary base url | 2021-10-08 20:03:52 +08:00 |  | 
			
				
					| 
							
							
								 Bert Verhelst | ec4b7e4064 | Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers | 2021-10-07 18:22:59 +02:00 |  | 
			
				
					| 
							
							
								 LouisLam | 2c19aef4dc | minor | 2021-10-07 18:06:43 +08:00 |  | 
			
				
					| 
							
							
								 LouisLam | e5f6d7f047 | slack and rocket.chat use the primary base url env var to show time logger | 2021-10-07 17:39:58 +08:00 |  | 
			
				
					| 
							
							
								 LouisLam | d08a71ab49 | Set primary base url in settings page | 2021-10-07 16:30:16 +08:00 |  | 
			
				
					| 
							
							
								 LouisLam | ed67803af8 | improve minor style | 2021-10-07 16:10:21 +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 |  | 
			
				
					| 
							
							
								 MrEddX | 9f5bf37a96 | Update Settings.vue | 2021-10-07 09:37:13 +03:00 |  | 
			
				
					| 
							
							
								 Nelson Chan | a87595a849 | Fix: Allow underscore in hostname | 2021-10-07 03:29:42 +08:00 |  | 
			
				
					| 
							
							
								 Bert Verhelst | 550825927c | Merge branch 'master' into feature/add-support-for-method-body-and-headers | 2021-10-05 18:19:07 +02:00 |  | 
			
				
					| 
							
							
								 Louis Lam | 865b721b79 | Merge pull request #519 from chakflying/improve-certInfo Feat: Improve Certificate Info Display | 2021-10-05 16:09:08 +08:00 |  |