8614 Commits

Author	SHA1	Message	Date
Isaac Connor	e38dd4649d	Convert missed strftimes to dateTimeFormatter. Fixes #3526	2022-07-13 18:47:27 -04:00
Isaac Connor	df49d7a1ee	Send out a quit command when jumping to prev/next video so that hopefully zms exits.	2022-07-13 18:47:27 -04:00
ovargasp	213d57ee03	Update options.php	2022-07-13 12:05:53 -06:00
ovargasp	4be7cf409a	fix translate label	2022-07-12 18:08:26 -06:00
ovargasp	ebc9920442	Merge branch 'ZoneMinder:master' into master	2022-07-12 18:06:14 -06:00
Isaac Connor	fa2a02c27f	Add UserId to js side layouts so we can check it	2022-07-12 17:32:32 -04:00
Isaac Connor	c6cc23d73c	Check for ownership of layout before saving	2022-07-12 17:32:07 -04:00
Isaac Connor	56828f4d48	Add Id=0 for default user	2022-07-12 17:31:41 -04:00
Isaac Connor	2988d49454	When saving a layout, check for System[edit] or ownership of the layout.	2022-07-12 17:31:30 -04:00
Isaac Connor	64ed7370b6	Add UserId field to MontageLayouts	2022-07-12 17:30:54 -04:00
ovargasp	7d3c52cd49	Update es_la.php	2022-07-11 16:39:22 -06:00
Isaac Connor	bbba518215	Merge pull request #3522 from ovargasp/patch-3 ... more translations changes	2022-07-11 18:36:01 -04:00
Isaac Connor	00399b340c	Merge pull request #3523 from ovargasp/patch-4 ... translations on modal states...	2022-07-11 18:34:23 -04:00
ovargasp	d9be8def3d	translates prompts using lang file.	2022-07-11 15:49:31 -06:00
ovargasp	8973c72c77	V2 ... This one has all "prompts" from Config Table in it, goes along with change on options.php to translate options view to another language...	2022-07-11 15:46:11 -06:00
ovargasp	c388e25c9f	updated es_la language file (7-2022)	2022-07-11 13:25:53 -06:00
ovargasp	db2a22fcb9	translations	2022-07-11 13:02:33 -06:00
ovargasp	b6a523f265	translations...	2022-07-11 13:00:40 -06:00
ovargasp	ceb9869a86	fix translation for labels	2022-07-11 12:48:40 -06:00
Isaac Connor	13617025ed	fix eslint	2022-07-05 12:46:07 -04:00
Isaac Connor	831b45b8f1	fix js error due to leaflet not being install	2022-07-05 11:03:00 -04:00
Isaac Connor	d958c6fee0	Format duration	2022-06-28 10:54:20 -04:00
Isaac Connor	bef127b2e9	Fix ever increasing duration list	2022-06-28 10:47:46 -04:00
Isaac Connor	1af1b6a30b	Center the up/down arrows in console Mark column	2022-06-23 14:24:08 -04:00
Isaac Connor	9d89fb6f0f	Fix only one zone per monitor listed in Linked Monitors. Add type to zone name to indicated inactive	2022-06-22 10:03:57 -04:00
Isaac Connor	e08b826843	Add support for lambda functions as post processing. Use the to replace StartDateTimeShort with StartDateTimeFormatted so that dates on viewed events use the specified formatting.	2022-06-21 11:42:18 -04:00
Isaac Connor	9c9786de6e	fix eslint	2022-06-20 17:12:15 -04:00
Isaac Connor	9e22852195	Put back setting height of viewer	2022-06-20 17:06:44 -04:00
Isaac Connor	71ad8a2c98	Update handleClick to use consts	2022-06-17 15:14:41 -04:00
Isaac Connor	dbedfb3303	Default to using height: auto on image stream img. Default to 100% for progress bar. Use clickZoomOut on zoomout button	2022-06-17 15:14:26 -04:00
Isaac Connor	95b0f017af	Fix sizes of download and zones buttons. Set videoFeed img tag to 100%	2022-06-17 15:13:17 -04:00
Isaac Connor	b0717797b1	Use separate function for clicking on zoomout button. If CTRL is pressed, zoom out fully using new ZOOMSTOP command. Replace zoomin handleClick code with version from live watch view which fixes it.	2022-06-17 15:12:22 -04:00
Isaac Connor	4dbe66779a	Implement CMD_ZOOMSTOP	2022-06-17 15:11:27 -04:00
Isaac Connor	dfc4acd69f	Escape single quotes in config values. Fixes #3508.	2022-06-17 10:53:42 -04:00
Isaac Connor	4ab58f5f22	Merge branch 'master' of github.com:ZoneMinder/zoneminder	2022-06-16 09:58:49 -04:00
Isaac Connor	58fedd8c35	Fix streamQuery => streamCmdQuery. Fixes #3507	2022-06-16 09:58:26 -04:00
Isaac Connor	f4339b0e9e	fix eslint	2022-06-15 13:19:53 -04:00
Isaac Connor	17562671c1	fix eslint	2022-06-15 13:18:11 -04:00
Isaac Connor	f728cb15bc	fix eslint	2022-06-15 13:17:01 -04:00
Isaac Connor	29d8441227	Fix janus stream not working on zones and zone views	2022-06-15 13:09:27 -04:00
Isaac Connor	4d81e3c7f8	Make video tags 100% as well as img and svg	2022-06-15 13:09:11 -04:00
Isaac Connor	2141a5dd1c	Don't include 0 width in janus video tag	2022-06-15 13:08:48 -04:00
Isaac Connor	a5cbe65d70	watchdog is not available everywhere yet. comment out its use	2022-06-15 13:08:38 -04:00
Isaac Connor	cf88497c77	Merge branch 'master' of github.com:ZoneMinder/zoneminder	2022-06-15 12:42:07 -04:00
Isaac Connor	5188346086	Institute a status timer to be used when not streaming from zms.	2022-06-15 12:34:55 -04:00
Isaac Connor	9211e72b94	Add AnalysisImage and options to MOnitor view	2022-06-15 11:33:09 -04:00
Isaac Connor	fb92207bb1	Improve map. Invalidate size on location tab so that tiles populate. Update marker position when get Current Location button is clicked. Make marker draggable.	2022-06-15 11:28:54 -04:00
Isaac Connor	c189250a61	Add AnalysisImage and options to MOnitor object	2022-06-15 11:27:48 -04:00
Isaac Connor	3299f5ed49	Handle php versions < 5.6.1 which don't have non-blocking semaphore support	2022-06-13 15:56:52 -04:00
Isaac Connor	a578370970	Add filter terms for snapshots	2022-06-09 12:13:58 -04:00