Isaac Connor
|
e5b858a3c3
|
Add divs needed for MonitorStream
|
2022-05-25 15:57:47 -04:00 |
|
Isaac Connor
|
34ee033b7e
|
Start in single mode, make imageFeed have the monitor it in it. Include MOnitorStream.js
|
2022-05-25 15:54:35 -04:00 |
|
Isaac Connor
|
0265f69c6d
|
add monitorData so that we can use MonitorStream.js
|
2022-05-25 15:54:12 -04:00 |
|
Isaac Connor
|
32e2db03fc
|
Update to use setScale instead of setStreamScale
|
2022-05-25 15:54:04 -04:00 |
|
Isaac Connor
|
02d5b7eab7
|
add monitorData so that we can use MonitorStream.js
|
2022-05-25 15:53:44 -04:00 |
|
Isaac Connor
|
82582efeca
|
Fix point updating
|
2022-05-25 15:53:19 -04:00 |
|
Isaac Connor
|
63adbbad03
|
Remove monitorFrame and dead code
|
2022-05-25 15:52:39 -04:00 |
|
Isaac Connor
|
388592e5ca
|
Update Layouts to fill the space
|
2022-05-25 15:51:12 -04:00 |
|
Isaac Connor
|
838e020efc
|
Update styles to match master, meaning #imageFrame => .imageFrame
|
2022-05-25 15:11:44 -04:00 |
|
Isaac Connor
|
5423aa701d
|
Update css for .imageFeed img to always be 100%
|
2022-05-25 15:11:21 -04:00 |
|
Isaac Connor
|
f61e0b3e8f
|
Merge in MonitorStream from master, after removing janus
|
2022-05-25 15:10:58 -04:00 |
|
Isaac Connor
|
38d667c84f
|
var => const. Fix points not being draggable after switch to MonitorStream.js generated html. Fix hightlightoff not firing over points table
|
2022-05-25 15:00:50 -04:00 |
|
Isaac Connor
|
7ad513b4e6
|
Load ajaxQueue for all views
|
2022-05-25 13:39:12 -04:00 |
|
Isaac Connor
|
f93622f7a1
|
Fix printf format causing warning
|
2022-05-25 13:38:56 -04:00 |
tftadmin Appleton
|
007dcb64fe
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2022-05-25 09:55:11 -05:00 |
|
Isaac Connor
|
3536a8d696
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2022-05-25 10:54:13 -04:00 |
|
Isaac Connor
|
f8bd84c1d1
|
Must set connkey
|
2022-05-25 10:53:53 -04:00 |
|
Isaac Connor
|
61a28a1fcf
|
Remove debugging
|
2022-05-25 10:53:11 -04:00 |
|
tftadmin Appleton
|
1125433e1e
|
Send minimal headers when 403
|
2022-05-25 09:36:07 -05:00 |
|
Isaac Connor
|
b3979de135
|
Return CGI header status 403
|
2022-05-25 10:27:25 -04:00 |
|
Isaac Connor
|
fb5b6b1a48
|
Only send the HTTP if zms is in non-nph mode
|
2022-05-25 10:11:21 -04:00 |
|
Isaac Connor
|
661a2209ca
|
Change has_warned to warned_count, so that we can stop excess locked packet warnings too
|
2022-05-25 09:50:41 -04:00 |
|
Isaac Connor
|
1865aaa858
|
Remove debug
|
2022-05-24 14:52:19 -04:00 |
|
Isaac Connor
|
fcb3855668
|
Don't freshing config when doing update. That is it's own command
|
2022-05-24 13:34:31 -04:00 |
|
Isaac Connor
|
7beda7066f
|
Bump version to 1.36.16 to pickup db update
|
2022-05-24 13:23:48 -04:00 |
|
Isaac Connor
|
7e0e37ca56
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2022-05-24 13:11:29 -04:00 |
|
Isaac Connor
|
46790ff6a0
|
Make ZM_PATH_FFMPEG a System config entry. Meaning it can only be set in /etc/zm/conf.d. Update help text to mention this.
|
2022-05-24 13:11:15 -04:00 |
|
Isaac Connor
|
ace736a003
|
cleanup code and update System column in Config table on zmupdate.pl -f
|
2022-05-24 13:11:15 -04:00 |
|
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
|
dfd0c50ad3
|
Add ZM_PATH_FFMPEG to 01-system-paths.conf
|
2022-05-24 12:56:54 -04:00 |
|
Isaac Connor
|
7bf2383772
|
Add ajaxQueue
|
2022-05-24 12:53:43 -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 |