a93b67c9d8
Fixed eslint checks
2023-08-13 16:47:04 +02:00
c5eec8fa12
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-08-10 11:03:30 -04:00
8672e6d64e
Fix missing dropdown-item class on warning or danger storage areas. Increase warning to 95% instead of 90%
2023-08-10 11:03:22 -04:00
9d5a1ec9d5
If scale is invalid, reset to auto so we don't constantly log the error.
2023-08-10 10:58:19 -04:00
b2993c3ec0
Use some const instead of var in changeScale
2023-08-09 19:29:19 -04:00
b8982dce53
When hiding/unhiding the monitor filter bar, when done call changeScale to readjust the size of teh video
2023-08-09 19:28:59 -04:00
10d70022fe
Handle when controls is not defined, like in WebSite monitors
2023-08-09 19:01:55 -04:00
7aa229658b
Slight cleanup of changeScale, converting it to float instead of string.
2023-08-09 19:01:30 -04:00
889c809e0b
Add RTSP2WebEnabled to defaults
2023-08-09 18:55:36 -04:00
7750eef533
Handle non-existing elements when monitor type is Website or Local.
2023-08-09 16:00:08 -04:00
95655c9043
Allow RTSPtoWeb streams for zone editing ( #3750 )
...
* Allow RTSPtoWeb streams for zone editing
* Fix quoting
2023-08-08 22:03:13 -05:00
97bb130cd1
Limit effect of styling on label elements
2023-08-08 19:18:25 -04:00
00bd2259a3
Midly improve dlink support. Fix for probing an undefined array
2023-08-08 18:34:44 -04:00
0afa383c38
Info to Debug for login.
2023-08-08 14:24:36 -04:00
1e200abf16
Remove support for browsers not supporting TextDecoder to fix eslint
2023-08-08 13:01:42 -04:00
fd391a4b68
Merge whoosinn:ZoneMinder
2023-08-08 10:11:08 -04:00
11f84fcb4e
Fix user->Controls to user->Control. Fixes broken js on monitor view
2023-08-08 10:10:49 -04:00
042edd25e5
Add classes to tr so they can be styled
2023-08-08 09:54:47 -04:00
2f552bdcce
User monitor->canView instead of user->unviewableMonitorIds for performance
2023-08-02 18:08:32 -04:00
8f9a4dc825
Use User object to get Monitor_Permission and Group_Permissions hoping it will be cached there.
2023-08-02 18:07:35 -04:00
5233c402d3
Use User object to get Monitor_Permission and Group_Permissions hoping it will be cached there.
2023-08-02 18:07:28 -04:00
672ba114f4
Fix reversed defaults for RTSP2Web options
2023-08-02 13:48:15 -04:00
206be0ea96
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-08-02 13:36:33 -04:00
b48702c96c
Fix lack of ZM on Warning
2023-08-02 13:36:26 -04:00
80c145dca4
Add support for HTTPS connections to RTSP2Web
2023-07-31 00:16:51 -05:00
af42398070
Fix ESLint issues in RTSP2Web work
2023-07-30 16:54:22 -05:00
5c9588c012
Adds RTSP2Web support for live view
2023-07-29 23:46:31 -05:00
d56beead81
Remove duplicated and old styles from dark montage that are in base. Removes width 99% from montage content which is no longer needed
2023-07-28 14:03:20 -04:00
20bbd9f3a6
If controls are on but not permitted the controls will not be defined
2023-07-28 12:56:51 -04:00
3301d3042b
Only show map if the event has lat&long
2023-07-27 10:30:37 -04:00
03155da5b6
Use the full integer value instead of the first char of mi. Fixes failure to get status on janus viewing pages
2023-07-25 15:18:35 -04:00
30c8052e60
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-07-25 12:32:40 -04:00
bd3aac1cf6
Fixup curl() and Axis probing
2023-07-25 12:32:35 -04:00
bb625ab237
nonce can contain =, so parse that properly. Use a betr nonce.
2023-07-25 12:32:13 -04:00
a6c403a4ac
Refresh table on show
...
After opening an event from the events table and editing some properties, returning back to the events table would show the cached version of the table without the new values.
This change will refresh the events table each time it's shown.
It is a bit of a performance hit, but it's more important to show accurate information after a quick delay than to show bad/inaccurate information fast.
2023-07-24 15:13:53 -04:00
8c49d911a0
Event table data should be aligned with column headers
...
This is more noticeable when some columns of the events table are toggled off, but the column headers were centered and the data in columns were left justified. This made it difficult to read which column went to which data.
This change centers both the column headers and the data in the columns so that they line up.
2023-07-24 15:01:12 -04:00
add08aeb56
Add 5MP resolution
2023-07-21 14:30:10 -07:00
2fb0b4476b
add mac to probe results
2023-07-21 14:26:56 -07:00
c0b5bbf8cc
Rough in Hanwha support. Fix results getting overwritten
2023-07-21 14:26:39 -07:00
c949b9e2d6
fix(event): Honor the Alt key with left/right arrow
...
Fixes a race condition when using Alt-LeftArrow to go back to the previous page (standard browser behavior).
Sometimes it would go the previous event and sometimes it would go to the previous page. Now it will consistently go to the previous page when the alt key is pressed with the left arrow.
2023-07-21 15:07:22 -04:00
10f7e4320f
fix(cookies): Use max-age instead of expires
2023-07-21 13:27:44 -04:00
ef68943b7c
chore(): Set default cookie time to Jan 2038
2023-07-21 11:07:11 -04:00
6cb4f0a4f6
Fix logic on filtering monitorNames
2023-07-20 16:44:23 -04:00
75322142a4
Remove deprecated MonitorsIds. Replace it's use with looking for edit permission per monitor
2023-07-19 12:39:32 -04:00
cb7d954a87
Fix warning when creating new user
2023-07-17 17:29:16 -04:00
6dbdd2120d
Cleanup mid before use. Mostly to quiet snyk
2023-07-17 17:02:32 -04:00
f46ef094dc
Merge envserv:sandbox/ZoneMinder
2023-07-17 15:37:12 -04:00
65d37e7a36
Rough in a Grandstream detector
2023-07-17 14:36:28 -05:00
64057eec95
ROugh in Foscam and DLink detections
2023-07-15 10:29:54 -04:00
cae8fda326
Remove debug
2023-07-15 10:29:38 -04:00
c7259fdc14
Implement read locks when accessing jpgs. Implement locking on creating scaled jpegs.
2023-07-13 17:20:18 -04:00
d172d41638
Add Capturing=Always
2023-07-13 12:45:25 -04:00
b21b58c5ba
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-07-12 17:09:51 -04:00
752faf5899
Add ue strict, some speed control functions and fixes for use strict
2023-07-12 17:08:44 -04:00
e13a42aa46
Fix not saving Manufacturer and Model. Have to unset the text input if the ddm is populated
2023-07-12 14:30:49 -04:00
5d21a19231
Merge pull request #3726 from Simpler1/patch-2
...
Remember Events table settings
2023-07-12 10:34:13 -04:00
5a8330ac98
Merge pull request #3727 from Simpler1/patch-3
...
Fix(event): Consistent cookie timeframe
2023-07-12 10:33:18 -04:00
87e493376f
fix(events): Dark background for table while loading
...
When using the dark theme css, as the events table is loaded, the background is a dark grey instead of white.
Previously, the "loading" background color was white which was very jarring for the user as the screen flashes from dark grey to white and then back to dark grey.
2023-07-12 10:28:59 -04:00
e96d2a6acc
No longer abort when sending a command... no streaming ajax should take any significant time.
2023-07-11 17:27:52 -04:00
4f80577d36
Add geolocation to event view
2023-07-10 13:45:12 -04:00
f96ac69033
Set thumbnail image source to stream immediately, then change the class for zoom. Increate timeout to 250
2023-07-09 12:05:18 -04:00
37b571a58a
Handle no password specified and make testing for www-authenticate header non case sensitive
2023-07-05 15:51:16 -04:00
fd39c57038
Use sticky instead of absolute to fix zoomed thumbnails when scrolled
2023-06-28 14:51:32 -04:00
2862f47a8b
Add standard divs and put canvas in the content div so scrolbars work
2023-06-28 14:49:31 -04:00
47ebf929cc
Actualy populate Name, Email, Phone inputs
2023-06-27 11:55:21 -04:00
3714b38caa
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-06-27 11:47:03 -04:00
961f05b228
Don't show deleted monitors in group dropdowns
2023-06-27 10:45:13 -04:00
bc1214e8e5
Don't use empty because it tests for false, and 0 is false. Just check for empty string. Fixes #3732
2023-06-27 10:44:25 -04:00
93dc57401f
Remove duplicated ExistsInFileSystem label
2023-06-26 10:34:19 -04:00
ccdbb8edf6
Improve Avigilon detection
2023-06-22 13:31:01 -04:00
139315776d
Fix searching by monitor name
2023-06-22 13:13:19 -04:00
2f2c488e5a
Merge pull request #3725 from Simpler1/patch-1
...
Fix(monitor.css): Narrow layout for pills-tab
2023-06-20 13:02:43 -04:00
fa68fc3894
Merge remote-tracking branch 'origin/patch-4' into patch-5
2023-06-19 11:36:39 -04:00
2d07098e1b
Add Help text for OPTIONS_ALARMMAXFPS
...
Previously this was pointing to the same text as OPTIONS_MAXFPS.
2023-06-19 11:33:20 -04:00
40a4d5266e
Add Help for OPTIONS_ALARMMAXFPS
...
Pulled text from ReadTheDocs.
2023-06-19 11:29:31 -04:00
80373f8f44
Fix(event): Consistent cookie timeframe
...
Sets cookie timeframe from one hour to two years (consistent with other cookie settings).
2023-06-14 19:23:14 -04:00
4c28b16c4b
Remember Events table settings
...
Fixes #3671
2023-06-14 19:19:58 -04:00
ed1a4c249d
Fix(monitor.css): Narrow layout for pills-tab
...
Fixes issue #3714
2023-06-14 19:13:42 -04:00
87fbc96609
Fix where error_log write to to include path
2023-06-09 19:37:47 -04:00
19128eee18
Do not allow directory names in ZM_LOG_DEBUG_FILE. Only log to ZM_LOG_DIR
2023-06-09 17:27:54 -04:00
8a00be8cc8
Load the ZM::Event using the Event Model data instead of loading by Id which goes back to db.
2023-06-09 10:53:10 -04:00
c811f1bc90
Load event using find_one which does caching.
2023-06-09 10:52:39 -04:00
2cb697f0e9
Debug alarm.jpg path when not found. Spacing. Remove unused Monitor variable
2023-06-09 10:40:34 -04:00
14eb38a00b
add timeout value to debug, only send scale command if it is > 0
2023-06-08 10:30:01 -04:00
59ff7f3a31
Improve logged wrt insufficient permissions
2023-06-08 09:17:16 -04:00
81b9ac5efd
Ignore inherit on monitor permission. We were returning true instead
2023-06-07 16:00:27 -04:00
7a21c01f36
Don't show bandwidth options if there are none to choose from
2023-06-07 16:00:02 -04:00
3dbd68886a
Reload user using zm\User object methods
2023-06-07 15:59:46 -04:00
3491a99fc3
ServerId can be null so must have quotes around it
2023-06-07 11:33:59 -04:00
4f416edf93
Fix missing auth_relay on alarm xhr
2023-06-05 09:57:12 -04:00
28d6a9915c
Fix eslint by finishing the intended code. The idea is to autmatically populate dhcp-range based on the ip set on the interface. This is unlikely to every happen due to defaults. Perhaps the code should simply check for the existence of the specified ip and flag the error
2023-06-04 07:50:29 -04:00
50be49b447
Make objdetect modals 65% width to make it easier to see
2023-06-01 14:49:00 -04:00
5c81538a09
remove fit-content on objdetect modal so we can scale it up to fit the screen better
2023-06-01 14:48:39 -04:00
7f10c7060a
Fix hard coded monitor 5 in Add New Zone button
2023-06-01 07:56:43 -04:00
31d9342918
Assume reverse proxy setup for janus for http as well
2023-05-31 17:01:45 -04:00
993e8806c5
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-05-31 15:04:45 -04:00
8a0c1bc379
Check to see if dnsmasq is installed
2023-05-31 15:04:42 -04:00
42df7c00ea
Fix left alingment of DHCP option
2023-05-31 15:04:04 -04:00
cd4461c5a5
Fix merging config values. Defaults to no, fix parsing config file
2023-05-31 15:03:50 -04:00
bfd86993e7
Add back logging, fix including = in value
2023-05-31 14:52:33 -04:00
Alejandro Criado-Pérez
Isaac Connor
baudneo
Jonathan Bennett
Simpler1
Simpler1
IPC
Isaac Connor