20811 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Isaac Connor	bc12205ec3	pass jwt_token_str and key by ref for performance	2022-07-14 09:46:24 -04:00
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
Isaac Connor	9334001247	Convert frame->pts to stream pts. Add a seek if jumping a long way into the mp4	2022-07-13 18:47:27 -04:00
Isaac Connor	356678f164	Use ints when comparing maxfps and effectivefps so that small decimal differences in fps don't matter.	2022-07-13 18:47:27 -04:00
Isaac Connor	af6ad6acfa	Merge pull request #3524 from ovargasp/master ... created es_la.php with all messages up to 1.37.17	2022-07-13 16:36:40 -04:00
ovargasp	ea0ad373fe	Update zm_monitor.cpp	2022-07-13 12:33:09 -06:00
ovargasp	213d57ee03	Update options.php	2022-07-13 12:05:53 -06:00
ovargasp	ea73c8b81e	Update zm_monitor.cpp	2022-07-13 11:05:28 -06:00
ovargasp	53824fa3da	Update zm_monitor.cpp	2022-07-13 11:01:18 -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	a93e5c8478	Bump version to 1.37.18	2022-07-12 17:34:08 -04:00
Isaac Connor	a617a70620	Add UserId to MontageLayouts	2022-07-12 17:33:34 -04: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
Isaac Connor	b298b46b5e	Add UserId to MontageLayouts	2022-07-12 17:30:25 -04:00
Isaac Connor	802ecc293c	Roughed in Uniview PTZ module. Currently is a copy of Hikvision. Only reboot is correct.	2022-07-12 13:25:47 -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
Isaac Connor	976a1cdf5a	Merge pull request #3520 from ovargasp/patch-1 ... translations for labels	2022-07-11 18:29:48 -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	89277f8e67	Use encoder options to specify reorder_queue size used. Clean up repeated options parsing	2022-07-07 13:33:06 -04: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	92cf91c8a1	Merge branch 'master' of github.com:zoneminder/zoneminder	2022-07-04 11:16:54 -04:00
Isaac Connor	82d20f3d1e	Restart has different results than start/stop, so actually handle it separately. Should fix zmdc.pl later.	2022-07-04 11:16:44 -04:00
Isaac Connor	a5ef240e96	Use remove_authentication instead of mask_authentication	2022-07-04 11:02:02 -04:00
Isaac Connor	365830a9ae	Rough in remove_password function + tests	2022-07-04 09:53:50 -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	8c121127ad	fix lined monitor zone parsing	2022-06-26 22:10:51 -04:00
Isaac Connor	51486af16d	Merge branch 'master' of github.com:ZoneMinder/zoneminder	2022-06-26 18:41:03 -04:00
Isaac Connor	6e3c90261d	zone_index would be left with a value if not found due to > instead of >=. Make the code a little better.	2022-06-26 18:40:46 -04:00
Isaac Connor	7cb08c0ffa	Use ImportanceNumber instead of Importance because Importance is a string	2022-06-24 14:02:32 -04:00
Isaac Connor	2bfc85c816	Implement sub ImportanceNumber because Importance is a string but we want to do math on it	2022-06-24 14:01:42 -04:00
Isaac Connor	e03d42103b	Return true or false for open	2022-06-24 13:57:59 -04:00
Isaac Connor	0d48c92bc8	Calling zmMemInvalidate when detached should be fine, so turn Error into a debug	2022-06-24 13:57:10 -04:00
Isaac Connor	1ee5b1e57b	Merge branch 'master' of github.com:ZoneMinder/zoneminder	2022-06-23 17:02:20 -04:00
Isaac Connor	8fc957b7ae	Merge branch 'master' of github.com:ConnorTechnology/zoneminder	2022-06-23 17:01:49 -04:00
Isaac Connor	009c1ab0fb	We cannot break if there are packets in the queue. They must be deleted.	2022-06-23 16:57:08 -04:00