Isaac Connor
|
7db8ec2149
|
Remove zm_update-1.37.15.sql
|
2022-05-24 13:11:15 -04:00 |
|
Isaac Connor
|
ebca4b80bb
|
Change Private to Readonly as Private only exists in master
|
2022-05-24 13:11:15 -04:00 |
|
Isaac Connor
|
7b67749472
|
Add System to Config table
|
2022-05-24 13:11:15 -04:00 |
|
Isaac Connor
|
6d0bdfdd47
|
add System to Config table
|
2022-05-24 13:11:15 -04:00 |
|
Isaac Connor
|
14e53266be
|
Add ZM_PATH_FFMPEG to 01-system-paths.conf
|
2022-05-24 13:11:15 -04:00 |
|
Isaac Connor
|
9723356ce8
|
Check Config::System to determine if field is disabled or not.
|
2022-05-24 13:11:15 -04:00 |
|
Isaac Connor
|
2cbd07fd98
|
Remove debug as it is too frequent and not useful
|
2022-05-20 11:15:19 -04:00 |
|
Isaac Connor
|
69267057c9
|
Spacing, remove debug
|
2022-05-20 11:14:56 -04:00 |
|
Isaac Connor
|
469112af6c
|
Remove file_exist localSocketFile. It will very likely exist and logging it is not useful
|
2022-05-20 11:14:39 -04:00 |
|
Isaac Connor
|
56bc1106a9
|
Config entries are not constants, duh
|
2022-05-19 17:18:55 -04:00 |
|
Isaac Connor
|
2b1ce5bd75
|
Log keyframe interval seen when clearing queue.
|
2022-05-19 17:18:01 -04:00 |
|
Isaac Connor
|
ee22f056c5
|
Fix index of CAMERA_TYPE
|
2022-05-18 18:58:51 -04:00 |
|
Isaac Connor
|
e362f3cdfb
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2022-05-18 18:53:00 -04:00 |
|
Isaac Connor
|
c1583b85c4
|
Must also update the $user global when doing password migrations
|
2022-05-18 18:52:38 -04:00 |
tftadmin Appleton
|
713e466c33
|
Fix password_type test on REQUEST['password'] instead of user['Password'] causing password migrations to not happen
|
2022-05-18 17:51:44 -05:00 |
|
tftadmin Appleton
|
bdf13bd46e
|
Fix loading sessions
|
2022-05-18 17:51:08 -05:00 |
|
tftadmin Appleton
|
a9dee3334c
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2022-05-18 17:38:07 -05:00 |
|
tftadmin Appleton
|
746ee44cf4
|
Specify only sessions active in the last ZM_COOKIE_LIFTTIME seconds when loading logout modal
|
2022-05-18 17:37:53 -05:00 |
|
tftadmin Appleton
|
93b1382537
|
Only keep ZM_COOKIE_LIFETIME entries in Sessions.
|
2022-05-18 17:37:23 -05:00 |
|
Isaac Connor
|
c3275bf750
|
Stop the dbQueue before closing logs. Since dbQueue.stop() join's the dbQueue thread, it should not log after we return.
|
2022-05-18 17:27:51 -04:00 |
|
Isaac Connor
|
789816aead
|
Stop the dbQueue before closing logs. Since dbQueue.stop() join's the dbQueue thread, it should not log after we return.
|
2022-05-18 17:27:26 -04:00 |
|
Isaac Connor
|
e4c6e108ec
|
Stop the dbQueue before closing logs. Since dbQueue.stop() join's the dbQueue thread, it should not log after we return.
|
2022-05-18 17:16:11 -04:00 |
|
Isaac Connor
|
f8904fd3a2
|
Set last_write to now instead of packet timestamp. This is so that zmwatch doesn't kill us if we fall behind. Add a warning message about it though.
|
2022-05-18 17:06:54 -04:00 |
|
Isaac Connor
|
77ff70572a
|
Use auto to get the right type for n_coords
|
2022-05-18 12:56:09 -04:00 |
|
Isaac Connor
|
675f431c82
|
Warn when the number of vertices changes due to clipping
|
2022-05-18 12:55:56 -04:00 |
|
Isaac Connor
|
46c0134fb3
|
Handle no vertices in Fill. Prevents crash when a zone is entirely outside the image
|
2022-05-18 12:55:47 -04:00 |
r01k
|
10e438e526
|
Fixed in export.php "Class 'Filter' not found" and construction of SQL query with wrong syntax
|
2022-05-13 09:29:09 -04:00 |
|
Isaac Connor
|
a611f7cc22
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2022-05-12 16:15:34 -04:00 |
|
Isaac Connor
|
5bc01d75e5
|
Don't build for hirsute, do build for jammy
|
2022-05-12 16:14:49 -04:00 |
|
Isaac Connor
|
f9b49002c4
|
We have to update start_usec not just start. Fixes #3439
|
2022-05-12 14:20:36 -04:00 |
|
Isaac Connor
|
945ff0df7d
|
Fix inverted logic breaking audio
|
2022-05-12 12:56:40 -04:00 |
|
Isaac Connor
|
bba851e8b5
|
Setting flags in ffmpeg5 crashes, so don't do it.
|
2022-05-12 12:07:13 -04:00 |
|
Isaac Connor
|
56e121e9bb
|
Don't clear img.src after sending QUIT. QUIT will do the job and killing the stream first might mean that it gets lost
|
2022-05-12 12:05:02 -04:00 |
|
Isaac Connor
|
0d29864d36
|
Start the query status timer on img.load
|
2022-05-12 10:51:27 -04:00 |
|
Isaac Connor
|
6419ec6841
|
Make STATES const instead of VAR
|
2022-05-12 10:51:05 -04:00 |
|
Isaac Connor
|
76c8b78b5a
|
Wake up everyone waiting in packetqueue before joining the event thread so that we don't lock
|
2022-05-12 10:50:28 -04:00 |
|
Isaac Connor
|
5a73e16bd2
|
Introduce packetqueue::stop which just sets the deleting flag and sends out a notify. The idea is to call it before clear().
|
2022-05-12 10:50:04 -04:00 |
|
Isaac Connor
|
1af63e151b
|
Fix numbering of states, since UNKNOWN=0
|
2022-05-12 10:17:02 -04:00 |
|
Isaac Connor
|
6952a324bd
|
const_cast away the constness of oformat so that we can set AV_TS_NOTSTRICT
|
2022-05-12 10:06:15 -04:00 |
|
Isaac Connor
|
d1dbd8639b
|
Use AV_NOPTS_VALUE instead of 0 in first_dts/first_pts variables. Don't adjust dts when it's AV_NOPTS_VALUE in writeVideoPacket. Handle it better in writePacket.
|
2022-05-12 10:06:08 -04:00 |
|
Isaac Connor
|
ccf48a4c02
|
Add more debugging of packet processing
|
2022-05-11 18:42:29 -04:00 |
|
Isaac Connor
|
7f9a9e5c22
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2022-05-11 10:22:04 -04:00 |
|
Isaac Connor
|
7545cbea4d
|
Don't assuming we want to communicate with zms if streaming.
|
2022-05-11 10:22:01 -04:00 |
|
Isaac Connor
|
30384ae8f9
|
Convert width and height auto => 0 to auto=>auto. Add an auto-select for 5 wide when there are more than 5 and a multiple of 5
|
2022-05-10 18:35:13 -04:00 |
|
Isaac Connor
|
bfb6d79615
|
Convert width and height auto => 0 to auto=>auto. Set image height in setLayout so that we aren't left with a specified height on the image
|
2022-05-10 18:34:38 -04:00 |
|
Isaac Connor
|
8a1905cb4b
|
Remove duplicated code in else
|
2022-05-10 18:01:28 -04:00 |
|
Isaac Connor
|
0d6f6fa1b8
|
State::Unknown must be 0 so that we can index into the strings array
|
2022-05-10 18:00:01 -04:00 |
|
Isaac Connor
|
f5567bc9a7
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2022-05-10 17:48:35 -04:00 |
|
Isaac Connor
|
51ffc05c4d
|
Set samesite for session ZMSESSID cookie for php < 7.3
|
2022-05-10 17:48:16 -04:00 |
|
Isaac Connor
|
bc8677e333
|
Add debugging to help figure out misordered of packets on event creation
|
2022-05-10 17:34:56 -04:00 |