Isaac Connor
|
d27ff05980
|
Have to use CURRENT_TIMESTAMP as our times are not in UTC
|
2023-12-04 18:38:41 -05:00 |
|
Isaac Connor
|
0b79e832cf
|
Merge branch 'master' into remove_triggers
|
2023-12-04 09:32:10 -05:00 |
|
Isaac Connor
|
5e9f53b41a
|
Fixup issues with label for's
|
2023-12-03 17:57:22 -05:00 |
|
Isaac Connor
|
983ccb7afc
|
Add support for double in zmMemWrite
|
2023-12-03 10:37:53 -05:00 |
|
Isaac Connor
|
379028123e
|
add wrap to monitor filters
|
2023-12-03 10:25:30 -05:00 |
|
Isaac Connor
|
89f90dc5fa
|
Don't output the boundary if we aren't streaming. Single jpegs don't need it and I think something was complaining about it.
|
2023-12-03 09:24:27 -05:00 |
|
Isaac Connor
|
c2f05911b1
|
Put a 1 sec wait limit on zms when in single image mode.
|
2023-12-03 09:15:28 -05:00 |
|
Isaac Connor
|
be61184faf
|
Add defaults to GenerateVideo, don't chdir, fix other code
|
2023-12-01 13:05:36 -05:00 |
|
Isaac Connor
|
70b1432c1f
|
Have to check for property_exists instead of empty. empty includes a valid value of 0
|
2023-12-01 12:46:49 -05:00 |
|
Isaac Connor
|
49af487746
|
port over generateVideo from perl side and stick into Event.
|
2023-12-01 12:46:26 -05:00 |
|
Isaac Connor
|
44a3a7a6a8
|
Fix loading event due to missing GROUP BY. Fixes event video generation.
|
2023-12-01 12:46:05 -05:00 |
Isaac Connor
|
16b67a59e0
|
Merge pull request #3791 from webgeek1234/master
Test changes
|
2023-12-01 09:33:52 -05:00 |
|
Isaac Connor
|
f373158d0a
|
Merge branch 'remove_triggers' into master
|
2023-12-01 09:33:18 -05:00 |
Aaron Kling
|
c6a3394028
|
Bump version to pickup intermediate event summary tables removal
|
2023-11-30 20:37:37 -06:00 |
|
Aaron Kling
|
fd2ed07a9b
|
Set DiskSpace on event end
|
2023-11-30 20:37:37 -06:00 |
|
Isaac Connor
|
fd4d331515
|
Add code to update summary table on event delete.
|
2023-11-30 20:37:37 -06:00 |
|
Aaron Kling
|
e5cef21b2d
|
Remove db triggers for intermediate event summaries
|
2023-11-30 20:34:40 -06:00 |
|
Isaac Connor
|
aa84acd3c0
|
Add inserting into summary table on event creation instead of relying on triggers
|
2023-11-30 19:59:09 -06:00 |
|
Aaron Kling
|
2c2023d1d5
|
Remove intermediate event summary table references
|
2023-11-30 19:59:09 -06:00 |
|
Isaac Connor
|
4ff215e8bd
|
Fix for when system_utilisation is empty
|
2023-11-30 14:38:41 -05:00 |
|
Isaac Connor
|
99c9eb5e0e
|
Fix missing )
|
2023-11-30 14:23:17 -05:00 |
|
Isaac Connor
|
bb94d02019
|
Make sure groups is always defined else we get error from user.js.php
|
2023-11-30 10:00:40 -05:00 |
|
Isaac Connor
|
02f922d4b7
|
Don't include csrf on ajax requests. We only return json for ajax and the csrf kills the json parsing.
|
2023-11-28 10:16:58 -05:00 |
|
Isaac Connor
|
065bed894c
|
Use empty array instead of null for allowedMonitors
|
2023-11-24 08:57:35 -05:00 |
|
Isaac Connor
|
420a5a5ea5
|
Load events using post so that we can send a large request
|
2023-11-23 16:59:59 -05:00 |
|
Isaac Connor
|
c1ae4336a7
|
Change Got Good Repsonse fro ONVIF to a debug
|
2023-11-23 16:06:32 -05:00 |
|
Isaac Connor
|
39a0ee1230
|
Add loading speed from COOKIES
|
2023-11-23 14:27:04 -05:00 |
|
Isaac Connor
|
bde6870a21
|
Add support for Notes as a filter, setup for altering the terms later. Add CASE so that incomplete events have and EndTimeSecs
|
2023-11-23 14:25:52 -05:00 |
|
Isaac Connor
|
b0a6ef5624
|
Add Sorting monitors by user preference.
|
2023-11-23 14:10:29 -05:00 |
|
Isaac Connor
|
a7885a4c04
|
Make montagereview default to history mode
|
2023-11-23 14:00:19 -05:00 |
|
Isaac Connor
|
2fb0e40503
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2023-11-23 13:00:51 -05:00 |
|
Isaac Connor
|
164ec3667e
|
Fix eslint
|
2023-11-23 13:00:44 -05:00 |
|
Isaac Connor
|
b08c44172a
|
Add back a little padding to mfbpanel in montage
|
2023-11-23 13:00:30 -05:00 |
|
Isaac Connor
|
1fa3e18e5c
|
Remove extra padding in headers
|
2023-11-23 13:00:13 -05:00 |
|
Isaac Connor
|
4957361278
|
Merge pull request #3788 from AmooAti/php8.3
PHP 8.3 deprecated get_class method call without argument
|
2023-11-22 09:01:28 -05:00 |
adhamiamirhossein
|
27977acdd4
|
fix: php 8.3 deprecated get_class method call without argument
|
2023-11-22 10:48:04 +03:30 |
|
Isaac Connor
|
07d4fb2099
|
Set default delay, add starting statusCmdTimer when using rtsp2web
|
2023-11-21 11:35:04 -05:00 |
|
Isaac Connor
|
791733ee67
|
Merge branch 'master' into remove_triggers
|
2023-11-21 10:49:24 -05:00 |
|
Isaac Connor
|
23a0e561eb
|
Remove depth of nested if's by returning early.
|
2023-11-21 10:49:09 -05:00 |
|
Isaac Connor
|
edfaaf71ce
|
Convert username and password to std::string. Fix crash in zmu because we can't convert null to std::string.
|
2023-11-21 10:49:09 -05:00 |
|
Isaac Connor
|
001787d194
|
Merge pull request #3787 from d-bum/issue_3786_fix_audio_in_ctx_leak
Prevent allocation on already allocated context, fix #3786
|
2023-11-21 09:49:01 -05:00 |
d-bum
|
c4a5413e47
|
Prevent allocation on already allocated context
|
2023-11-21 13:57:29 +01:00 |
|
Isaac Connor
|
092f8df115
|
Handle scale=0 in getImageSrc
|
2023-11-20 17:23:51 -05:00 |
|
Isaac Connor
|
5be0ce5704
|
Fix eslint
|
2023-11-20 14:34:03 -05:00 |
|
Isaac Connor
|
e1b17590fa
|
Handle Config table not being updated for ZM_WEB_VIEWING_TIMEOUT
|
2023-11-20 14:29:25 -05:00 |
|
Isaac Connor
|
9a271e8960
|
Add are you still watching modal
|
2023-11-20 14:23:57 -05:00 |
|
Isaac Connor
|
5fd00ef7a5
|
Use a modal instead of confirm for are you still watching popup
|
2023-11-20 14:23:45 -05:00 |
|
Isaac Connor
|
1df3dc4c8c
|
Return the added modal
|
2023-11-20 14:23:24 -05:00 |
|
Isaac Connor
|
2c776523e9
|
Fix eslint
|
2023-11-20 14:04:03 -05:00 |
|
Isaac Connor
|
c59aa1be23
|
Merge branch 'master' into remove_triggers
|
2023-11-20 13:57:16 -05:00 |