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 |
|
Isaac Connor
|
bae3ecca4f
|
Monitor states have to start at 0 for string lookup
|
2024-01-11 17:18:54 -05:00 |
|
Isaac Connor
|
5da67339d0
|
Correct values for state to include Unknown
|
2024-01-11 17:18:23 -05:00 |
|
Isaac Connor
|
fe9abb96a1
|
Revert "Remove unknown as a state, as string lookup has to start at 0 and this breaks api."
This reverts commit e0a90319e7.
|
2024-01-11 17:17:25 -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
|
992cbc137f
|
When not recording, fix never going back to idle state
|
2024-01-11 17:13:09 -05:00 |
|
Isaac Connor
|
e0a90319e7
|
Remove unknown as a state, as string lookup has to start at 0 and this breaks api.
|
2024-01-11 17:10:48 -05:00 |
|
Isaac Connor
|
237546de2f
|
Turn off caching of objects in zmwatch. Remove unneeded zmMemInvalidate. Remove unused include of Storage
|
2024-01-11 13:59:41 -05:00 |
|
Isaac Connor
|
72778bd76d
|
Remove circular reference in Control(), free shm if allocated in destructor
|
2024-01-11 13:59:10 -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
|
fb6e0f7305
|
Bump version for increase Phone column to 64
|
2024-01-11 10:16:08 -05:00 |
|
Isaac Connor
|
3fe8f2f4b3
|
Better debug on waiting for capture to begin. Only send error image once, as we are in single image mode
|
2024-01-11 10:12:00 -05:00 |
|
Isaac Connor
|
5a8358ba29
|
Make log about analysis thread sleeping a level 5
|
2024-01-11 10:11:04 -05:00 |
|
Isaac Connor
|
3f5328568e
|
Spacing, mege some lines
|
2024-01-10 09:29:50 -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
|
e99f49fcb5
|
Fix NewPath missing /
|
2024-01-09 15:34:50 -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
|
13114b2e83
|
Only do joins if required. Use a subselect on Tags because it is way more efficient that doing the joins.
|
2024-01-08 17:23:50 -05:00 |
|
Isaac Connor
|
ef215b1427
|
Slight code improvements, mostly for readability
|
2024-01-08 13:06:03 -05:00 |
|
Isaac Connor
|
7f03a84b35
|
When instantiating an object, and given the data, refresh the cache instead of using an old cached object. This should fix issues with Events where cached properties like Storage and Path use an old value.
|
2024-01-08 10:02:56 -05:00 |
|
Isaac Connor
|
ad54ad787a
|
Fix missing WHERE on monitor select.
|
2024-01-08 10:01:29 -05:00 |
|
Isaac Connor
|
9e2a4335d1
|
Even objects can have cached properties, so add an undef in calls to Storage and Path so that they get recalculated. This should fix invalid errors about Event already being moved, when in fact it hasn't.
|
2024-01-05 10:43:33 -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
|
8617c09f16
|
Implement new zms parameters frames= which is the # of frames to send when in streaming mode. The idea is to replicate single mode, but allowing for other intermediate images, like Waiting for Connection etc. type=single should only ever send 1 single image.
|
2024-01-04 11:37:49 -05:00 |
|
Isaac Connor
|
6f40293e93
|
Fix incorrect use of zmDbExecute causing emails to not be sent. Fixes #3800
|
2024-01-04 10:16:38 -05:00 |
|
Isaac Connor
|
9024e5a479
|
Include backtrace info when logging sql error
|
2024-01-04 10:16:07 -05:00 |
|
Isaac Connor
|
6d0f634bfc
|
Cleanup audio_in opening frmo setup_resampler, and open audio_in_ctx with the correct parameters
|
2024-01-03 18:50:53 -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
|
d4fb904a51
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2024-01-03 09:51:27 -05:00 |
|
Isaac Connor
|
aaedd33a03
|
Default admin user to having Create permission for Monitors
|
2024-01-03 09:51:20 -05:00 |
|
Isaac Connor
|
2747a97168
|
Disable range support to fix chrome playback.
|
2024-01-02 17:07:34 -05:00 |