mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-27 02:02:36 -04:00
Code Issues Packages Projects Releases Wiki Activity
23,157 Commits 80 Branches 104 Tags
3d2fa3172fc3d2dd269efd43cb8dff57bda2df97
Commit Graph

23157 Commits

This Branch
This Branch
All Branches
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
d81b98da25 Set cause = LINKED_CAUSE regardless of whether we are in an event, as we may be ending an idle event to start a new one. Use MonitorLinkExpression.result to get score from the expression instead of just using 20. Imrpove logic around close events to prevent them from lasting too long 2024-01-22 14:25:57 -05:00
Isaac Connor
44862adb8a Implement MonitorLinkExpression::result so that we can return the score as well as simply a boolean value. 2024-01-22 14:25:57 -05:00
Isaac Connor
8c33c8ca2a Restore initial sleep, make Infos into Debugs. Add debugging for sleep behaviour and honour zm_terminate when trying to reconnect to db. 2024-01-22 14:25:57 -05:00
Isaac Connor
13e00e8152 Merge pull request #3804 from schabau/revert-1-schabau-patch-1 
Debian error message
 2024-01-22 14:14:00 -05:00
Isaac Connor
0e5da38c70 Merge pull request #3805 from ZoneMinder/dependabot/github_actions/actions/dependency-review-action-4 
Bump actions/dependency-review-action from 3 to 4
 2024-01-22 14:13:24 -05:00
dependabot[bot]
8898822f23 Bump actions/dependency-review-action from 3 to 4 
Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 3 to 4.
- [Release notes](https://github.com/actions/dependency-review-action/releases)
- [Commits](https://github.com/actions/dependency-review-action/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/dependency-review-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-22 17:57:00 +00: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
b8bb2e0786 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-01-20 16:15:58 -05:00
Isaac Connor
183a0a344f Add code to install a .list file in /etc/apt/sources.list.d 2024-01-20 15:11:59 -05:00
Isaac Connor
343d2294d4 Take post_event_frame count into consideration when closing events 2024-01-19 12:26:05 -05:00
Isaac Connor
4d1ffb258a Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-01-18 14:17:02 -05:00
Isaac Connor
39e03e6a3c Fix infinite loop in the event there is only the initial frame in the db. 2024-01-18 14:16:38 -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
7280329e6e Split long line 2024-01-17 17:09:43 -05:00
Isaac Connor
a0ecbdf0bf Rework state machine, separating the state machine from the code to start/stop event recording. Doing section_length < min_section_length at monitor load time instead of constantly during analysis. 2024-01-17 17:09:42 -05:00
Isaac Connor
0a6139b57d Rename variable from html to text because it is the text case. 2024-01-17 17:08:35 -05:00
Isaac Connor
f45c787d07 Instead of replacing with empty string, replace with content_id which is the filename and is the behaviour specified in PR #3769 2024-01-17 17:08:35 -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
08aefd881a Add decoding_image_count, use it in Ready() instead of image_count. Fix hanging processes due to event start/end command failing because it waits writing to db which isn't really open. Stop analysis thread in Pause. 2024-01-16 16:47:14 -05:00
Isaac Connor
219af38127 Fix use of deprecated pkt_duration 2024-01-16 16:41:05 -05:00
Isaac Connor
839ef9ce67 Add a Component filter to logs 2024-01-16 16:35:52 -05:00
Isaac Connor
86ab0c296e Add 6,7,8,9,10 wide montage layouts. 2024-01-16 11:52:28 -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
fba728d406 Must close events before closing camera because we use it's inputs_streams in videostore. 2024-01-16 09:48:38 -05:00
Isaac Connor
8173297346 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-01-16 09:44:28 -05:00
Isaac Connor
c8980c7529 Clean up termLevel() removing stupid code 2024-01-16 09:43:43 -05:00
Isaac Connor
8618900339 If we are not doing an html email, then don't replace with img tags referencing the attachment. Just do the attachment. Introduce %FID% to sub with the id of the filter. 2024-01-15 16:58:54 -05:00
Isaac Connor
ebadc7a07b GIve default user the create permission 2024-01-14 08:41:12 -05:00
Isaac Connor
a3ede8114c Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-01-13 13:25:23 -05:00
Isaac Connor
dbc9029b3a Manually commit @schabau's fix for cpu utilisation not working on debian. See PR #3804. Fixes #3797 2024-01-13 13:25:16 -05:00
Isaac Connor
1d7c69522b Fix duplicated inner join on Monitors 2024-01-12 13:35:17 -05:00
Isaac Connor
878b521a08 Add replacements for EI1, EIM, EIA1, EIAM when there are no alarm frames. 2024-01-12 13:34:36 -05:00
Schabau
51fe7fc22b Revert "Update zmstats.pl.in" 2024-01-12 19:13:12 +01:00
Schabau
9328417709 Merge pull request #1 from schabau/schabau-patch-1 
Update zmstats.pl.in
 2024-01-12 19:12:28 +01:00
Schabau
401af0338d Update zmstats.pl.in 
Debian compatibility issue
 2024-01-12 18:54:40 +01:00
Isaac Connor
a402217456 Correct state values so that Unknown starts at 0 2024-01-11 17:19:29 -05:00