Commit Graph

9998 Commits

Author SHA1 Message Date
Isaac Connor
3d2fa3172f Fix im => i. Typo in variable name. 2024-01-22 15:41:00 -05:00
Isaac Connor
bd90711aa6 Use an interval instead of calling Timeout from callback 2024-01-22 14:25:57 -05:00
Isaac Connor
ad168ca23a Allow monitor creation if Monitors()==Create 2024-01-22 14:25:57 -05:00
Isaac Connor
552069cd64 Makes zones view use getBodyTopHTML so that it display error messages. Rename deleteBtn to action. 2024-01-21 11:31:44 -05:00
Isaac Connor
4df4f5146a Log error_message if set 2024-01-21 11:31:06 -05:00
Isaac Connor
580aefdfee Handle the deleteBtn having an id instead of name == deleteBtn 2024-01-21 11:30:49 -05:00
Isaac Connor
da700a621a Make EventStartCommand and EventEndCOmmand wider 2024-01-21 11:30:25 -05:00
Isaac Connor
e47fd8f661 Recamp zones actions, adding a redirect after finishing deletion and fixing CanEdit=>canEdit 2024-01-21 11:30:01 -05:00
Isaac Connor
0d6e7bc082 Add debugging to editableMonitor and handle when permission is set to Create. 2024-01-21 11:28:34 -05:00
Isaac Connor
4d1ffb258a Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-01-18 14:17:02 -05:00
Isaac Connor
69383316aa If the video file doesn't exist, don't try ffmpeg etc and log all those errors. 2024-01-18 13:16:22 -05:00
Isaac Connor
c26548d182 Alert any returned error messages when deleting events 2024-01-18 13:15:59 -05:00
Isaac Connor
ef926f4437 Return an array of string error messages instead of an array of arrays of arrays in deleting events. 2024-01-18 13:15:25 -05:00
Isaac Connor
04239c128c Fix regular expression search of Source 2024-01-18 12:44:55 -05:00
Isaac Connor
adc784e767 Move maxfit2 to montage_common.js. Clean it up and apply strict 2024-01-17 17:04:49 -05:00
Isaac Connor
ceb60dd606 Remove unused compSize 2024-01-17 16:54:49 -05:00
Isaac Connor
422dda62dc Remove important from navbar colour so that it is easier to override 2024-01-17 10:23:17 -05:00
Isaac Connor
839ef9ce67 Add a Component filter to logs 2024-01-16 16:35:52 -05:00
Isaac Connor
6812f2efe7 Fix eslint 2024-01-16 09:56:28 -05:00
Isaac Connor
1ab66b10b1 Don't assume findByEventidAndType actually returns a frame. If we are only recoridng, then there will be no alarm frames in the db 2024-01-16 09:50:19 -05:00
Isaac Connor
ebadc7a07b GIve default user the create permission 2024-01-14 08:41:12 -05:00
Isaac Connor
a402217456 Correct state values so that Unknown starts at 0 2024-01-11 17:19:29 -05:00
Isaac Connor
36bdc3f8a9 Revert "Remove STATE_UNKNOWN"
This reverts commit 66e7179242.
2024-01-11 17:16:58 -05:00
Isaac Connor
66e7179242 Remove STATE_UNKNOWN 2024-01-11 17:13:09 -05:00
Isaac Connor
63def6b82e Add a function to_string that handles nulls, arrays, etc 2024-01-11 10:30:36 -05:00
Isaac Connor
6684f73694 Add export to users 2024-01-09 17:14:31 -05:00
Isaac Connor
7694d1aa86 Add End Date Time as an option for sorting in filters 2024-01-09 17:13:27 -05:00
Isaac Connor
c954214b03 If success when saving monitors, do a redirect so that a reload doesn't repeat the request and ask to resubmit data 2024-01-09 17:12:45 -05:00
Isaac Connor
db2691bf60 Only show PTZ button if camera has ptz enabled 2024-01-09 17:10:44 -05:00
Isaac Connor
0d3953bd9e Fix collapsed version of navbar 2024-01-09 10:48:52 -05:00
Isaac Connor
c456960254 Add tags_opTypes and use it to limit operators for tags in a filter 2024-01-08 17:24:19 -05:00
Isaac Connor
ad54ad787a Fix missing WHERE on monitor select. 2024-01-08 10:01:29 -05:00
Isaac Connor
da37e27431 Only do the console refresh if there is a value for REFRESH_MAIN 2024-01-04 15:17:09 -05:00
Isaac Connor
5887a1e853 State Unknown starts at -1 2024-01-03 16:52:44 -05:00
Isaac Connor
31036ae9dd Users with Create permission should be able to view console 2024-01-03 16:41:56 -05:00
Isaac Connor
2747a97168 Disable range support to fix chrome playback. 2024-01-02 17:07:34 -05:00
Isaac Connor
2cc47557df Remove bogus adding RTSP2WEB to CSP and CORS 2024-01-02 16:44:05 -05:00
Isaac Connor
ee9e03a7c1 Fix FPS values when getting status from web instead of ZMS. 2024-01-02 16:28:49 -05:00
Isaac Connor
e9362f1a10 Fix duplicated Capturing in monitor status elements. Add Recording. Fix MinEventId, MaxEventId, TotalEvents. Ad CaptureFPS, AnalysisFPS and CaptureBandwidth 2024-01-02 16:28:49 -05:00
Isaac Connor
f064887451 Add ZM_RTSP2WEB_PATH to CSP_Headers 2024-01-02 16:25:28 -05:00
Isaac Connor
85006269f7 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-01-02 14:07:16 -05:00
Isaac Connor
3603aca21c Put navbar brand separate from navbars, remove explicit padding. Increase text size of ZoneMinder in brand, hide Branding on portrait mobile 2024-01-02 14:06:52 -05:00
Isaac Connor
2d49e93405 Introduce a Create permission for Monitors, so that a given user may Edit existing monitors, but not create new ones. 2024-01-02 12:18:09 -05:00
Isaac Connor
2b10d02271 Don't include Deleted Monitor Names when checking for duplicates 2023-12-30 11:46:04 -05:00
Isaac Connor
deb880e99b TRun off SSL verification when restarting remote filters. 2023-12-29 12:27:18 -05:00
Isaac Connor
7d5b91949c Remove duplicate .cherry-picked commit wasn't needed. 2023-12-29 11:25:10 -05:00
Isaac Connor
d2a264b79f define count. Fixes #3799 2023-12-29 11:06:46 -05:00
Isaac Connor
72e8ee0e5e Move session inclusion down to where it is first used. 2023-12-29 11:06:46 -05:00
Isaac Connor
326a4ca201 Clean out old unused debugging code. The code further down is more useful 2023-12-29 11:06:46 -05:00
Isaac Connor
6e93e3df4c Allow untrsuted ssl certs when sending commands to other servers 2023-12-24 12:17:08 -05:00