28d5614da0
Fix missing ;
2021-12-15 09:11:55 -05:00
f683557b0e
Fix Monitor::Control to handle local cameras
2021-12-15 09:11:55 -05:00
e8edeab641
parseInt prevEventId and nextEventID to be sure that our tests for != 0 work. Also don't go to previous event if prevEventId ==0.Maybe Fixes #3390
2021-12-15 09:11:55 -05:00
61fe35a32a
Don't log errors when querying a monitor in NONE Function. Just report a 0 status.Fixes #3397
2021-12-15 09:11:55 -05:00
f6d0274f74
Fix PrevCycle because monIdx was empty.
2021-12-14 17:05:56 -05:00
4fa804e9a2
Can only SKIP LOCKED if locking rows. Remove FOR SHARE as it isn't supported on < mysql 8
2021-12-14 13:33:00 -05:00
cca7953856
include user and function error message about insufficient permissions. Will make it easier to figure out who tried what.
2021-12-14 12:26:26 -05:00
fe72fd83f8
Fix auth not getting realm from auth headers due to them being an array now. Get auth and ip from Path if not set in ControlAddress.
2021-12-14 10:04:35 -05:00
cfcc39defb
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2021-12-14 09:29:03 -05:00
2f287a5050
Merge pull request #3400 from makers-mark/master
...
Fix boilerplate (un)typo
2021-12-13 22:29:52 -05:00
9733cdb576
Update zm_update-1.35.25.sql
2021-12-13 21:07:35 -05:00
3fad178528
Bump version for ExecuteInterval in filters
2021-12-13 15:02:54 -05:00
ea671a57f8
Add skip_locked and ExecuteInterval
2021-12-13 15:01:23 -05:00
6b18b2889d
Add skip_locked and ExecuteInterval
2021-12-13 15:01:17 -05:00
69faa42ca7
Add more of the resulting SQL to the filter debug modal
2021-12-13 15:00:55 -05:00
6511dc8a4f
Allow empty sort field.
2021-12-13 15:00:35 -05:00
e2df6e5074
Add ExecuteInterval to Filters
2021-12-13 15:00:03 -05:00
a65f2b42ce
Implement per-filter delays using the ExecuteInterval member of Filters. Remove uneded lockandload when doing row locks. We will have already locked when executing the filter sql.
2021-12-13 14:59:38 -05:00
0382a677df
Add ExecuteInterval to Filter Object. Allow empty sort_field to have the effort of not sorting. Always add FOR SHARE which adds a read-only lock the returned records. Add SKIP LOCKED functionality so that filters can simply skip locked records. This should reduce contention. Also specify FOR UPDATE of the events table, otherwise we also lock Monitors and Storage.
2021-12-13 14:58:32 -05:00
ef13c84d8b
fix zmtrigger. Need {}
2021-12-12 17:01:12 -05:00
b4511a8fc3
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2021-12-10 16:20:54 -05:00
c42b75a252
must clear the monitors array before terminating log.
2021-12-10 16:20:44 -05:00
4cbc55d160
spacing
2021-12-10 16:19:41 -05:00
5a57122891
fix typpo
2021-12-10 16:17:54 -05:00
5312d11e78
Don't both running zmu if monitor Function is set to None
2021-12-10 16:08:43 -05:00
ed360348ef
spacing, remove dead code. If Monitor Function becomes None, skip it
2021-12-10 15:36:47 -05:00
aa320cb28f
Fix missing STATE_UNKNOWN
2021-12-10 15:35:53 -05:00
5d8db0a320
Merge cycle functionality into watch view. Add period dropdown, countdown timer, toggle the sidebar. Fix auth on statusAjax, and don't use status ajax unless we are in still mode. Apply some min-width to fps so they don't jump around. Only update their content if it has changed (fewer browser renders).
2021-12-10 15:34:35 -05:00
7bc46ba7a8
Create the .tar.gz by default if it doesn't exist. Only warn if it already exists.
2021-12-09 15:19:49 -05:00
6e01bca187
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2021-12-09 15:09:50 -05:00
a9ef5bf731
Add STATE_UNKNOWN and correct values of other states
2021-12-09 12:36:03 -05:00
31a1ef6cb4
Move state definitions into skin.js.php because they are used in several different views. Add STATE_UNKNOWN to match of with c++ side actual values.
2021-12-09 12:35:42 -05:00
090c803b98
Wait for closeEvent thread to finish. Fixes unfinished event when zmc told to restart
2021-12-09 12:33:59 -05:00
35bca1d89b
When launching concurrent zmfilter, use the id instead of Name because Name isn't necessarily unique
2021-12-06 10:32:17 -05:00
3b84d7d82a
Add --daemon to command line documentation so it ends up in man page. Fixes #3393 . Improve the description and move the pod documentation to the bottom after __END__. Improve executeCommand a bit
2021-12-06 10:28:02 -05:00
1f78776093
Don't change colour of dot to warning when not Enabled and not doing analysis. Add reason to the dot
2021-12-06 09:48:44 -05:00
7b66d751d8
cleanup, spacing, use zone object methods to clean up svg zone layers
2021-12-05 17:49:24 -05:00
089c6044f1
Add layers toggle button, cleanup code by using ->canView, rename Monitor to monitor, add svg zones layer
2021-12-05 17:48:49 -05:00
76c4560c25
put svg zone styles in one files that can be included where needed
2021-12-05 17:46:25 -05:00
e6a12d20c6
Add svg syles and rename imageFeed to videoFeed
2021-12-05 17:45:54 -05:00
45559123af
Add numCoords, Coords, Area, AlarmRGB to Zone object. Also add Points(), AreaCoords, svg_polygon utility functions to it.
2021-12-05 17:45:26 -05:00
1fc0e93673
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2021-12-03 15:13:13 -05:00
27e87fc21f
Move all the opening of events code into one function called openEvent.
2021-12-03 13:25:50 -05:00
eef172379c
Move all the opening of events code into one function called openEvent.
2021-12-03 13:25:50 -05:00
1277e75278
Detect group hierarchy loops and break them.
2021-12-03 13:25:50 -05:00
5f9dcabee1
Merge pull request #3394 from petterreinholdtsen/conf-socket-comment
...
Make config file comment on unix socket option a bit clearer
2021-12-02 09:24:02 -05:00
5647c224d1
Make config file comment on unix socket option a bit clearer
...
Initially I took the comment for granted, and the 'unix_socket' string
as a magic string to tell zoneminder to use the mysql default socket. Alas,
this do not work, as the setting really need to point to the path of the socket.
Rewrite the comment to make this more clear, and less confusing for the
future users.
2021-12-02 15:18:04 +01:00
37069cb6fc
add cmake module to find libFmt
2021-11-29 18:59:44 -05:00
2b289abb95
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2021-11-29 18:50:52 -05:00
ca42a46bb4
Merge pull request #3392 from maddios/patch-1
...
Fix Copy/Move to Default Storage
2021-11-29 18:39:18 -05:00
Isaac Connor
Isaac Connor
makers-mark
Petter Reinholdtsen