Andrew Bauer
|
6486f59383
|
fix colorization of navbar widgets
|
2020-07-26 10:41:05 -05:00 |
|
Andrew Bauer
|
eaed5abcd3
|
add missing bootstrap.bundle.js.map
|
2020-07-25 16:56:17 -05:00 |
Isaac Connor
|
3ec7952c31
|
apply cache_busting to bootstrap, overlay anda reset
|
2020-07-25 15:05:12 -04:00 |
|
Isaac Connor
|
c81e4a3bca
|
fix
|
2020-07-25 14:32:30 -04:00 |
|
Isaac Connor
|
99d7aa0da0
|
fix
|
2020-07-25 14:31:57 -04:00 |
|
Isaac Connor
|
4af343e833
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-07-25 14:28:32 -04:00 |
|
Isaac Connor
|
e3b339e72e
|
add missing globals
|
2020-07-25 14:28:26 -04:00 |
|
Isaac Connor
|
e90efa7a7e
|
spacing
|
2020-07-25 14:28:08 -04:00 |
|
Isaac Connor
|
4c8f96b786
|
Update saving action to use our ORM methods
|
2020-07-25 14:28:01 -04:00 |
|
Isaac Connor
|
dda630f522
|
fix filter_regexp to remove trailing /
|
2020-07-25 14:27:09 -04:00 |
|
Isaac Connor
|
522dfecebe
|
Fix setting values by checking is_callable. Remove debug. Fix filter_regexp
|
2020-07-25 14:26:49 -04:00 |
|
Isaac Connor
|
7511b1fd7e
|
Fix for saving jpegs
|
2020-07-25 14:25:45 -04:00 |
|
Andrew Bauer
|
c48fa83c6d
|
upgrade to bootstrap 4.5
|
2020-07-25 13:18:09 -05:00 |
Isaac Connor
|
fe9db4cfa2
|
add filtering to Storage->Path()
|
2020-07-25 13:51:13 -04:00 |
|
Isaac Connor
|
a819b73e18
|
allow filter_regexp to be an array
|
2020-07-25 13:50:59 -04:00 |
|
Isaac Connor
|
859428db51
|
remove debug
|
2020-07-24 15:42:53 -04:00 |
|
Isaac Connor
|
f4a0f91d7f
|
nothing
|
2020-07-24 15:27:05 -04:00 |
|
Isaac Connor
|
1f889bd086
|
def don't use linesize when allocating share images
|
2020-07-24 15:26:48 -04:00 |
|
Isaac Connor
|
4ecfa32601
|
remove uneccessary multiplications from jpeg compression.
|
2020-07-24 15:26:28 -04:00 |
|
Isaac Connor
|
0e9da28a97
|
Don't pass linesize to shared images. Shared images have to have a contiguous chunk of memory.
|
2020-07-24 12:48:38 -04:00 |
|
Isaac Connor
|
0a9fdb4eb3
|
Fix second jump by matching final WriteJpeg destination. Just use linesize instead of assigning to row_stride
|
2020-07-24 12:41:27 -04:00 |
|
Isaac Connor
|
d9a9aeef1d
|
if linesizes don't match, allocate a frame buffer and use that when sws_scaleing and then copy to the image buffer.
|
2020-07-24 12:37:24 -04:00 |
|
Isaac Connor
|
490009446d
|
fix use of int or unsigned long instead of int for monitor id
|
2020-07-23 19:32:30 -04:00 |
|
Isaac Connor
|
559fe15e3f
|
fix use of int or unsigned long instead of int for monitor id
|
2020-07-23 19:32:25 -04:00 |
|
Isaac Connor
|
e9681fcdcf
|
fix use of int or unsigned long instead of int for monitor id
|
2020-07-23 19:31:12 -04:00 |
|
Isaac Connor
|
ee4d90d906
|
remove debug
|
2020-07-23 17:15:43 -04:00 |
|
Isaac Connor
|
cceb010048
|
set linesize in WriteBuffer which also sets colours, width, etc. Fixes segfault when streaming from jpegs
|
2020-07-23 17:14:56 -04:00 |
|
Isaac Connor
|
4f3b6a063e
|
don't cast fps to an int... values like 2.038 become 1.
|
2020-07-23 16:08:57 -04:00 |
|
Isaac Connor
|
e3a2099ca8
|
fix crash because we weren't setting alarm status
|
2020-07-23 16:08:35 -04:00 |
|
Andrew Bauer
|
bda7e1a2b7
|
minor cleanup of getNavBarHTML
|
2020-07-23 12:52:21 -05:00 |
|
Isaac Connor
|
038590270e
|
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
|
2020-07-23 12:06:05 -04:00 |
|
Isaac Connor
|
18272b9587
|
add debug for prealarmcount
|
2020-07-23 12:05:53 -04:00 |
|
Isaac Connor
|
7aa46df50f
|
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
|
2020-07-23 12:05:32 -04:00 |
|
Andrew Bauer
|
e6cce14c77
|
additional cleanup of getNavBarHTML
|
2020-07-23 10:54:42 -05:00 |
|
Isaac Connor
|
89007227b6
|
Add reboot method to SkyIPCam7xx control script
|
2020-07-23 11:54:19 -04:00 |
|
Isaac Connor
|
09d02e94d9
|
fix lack of c_str on path
|
2020-07-23 11:53:54 -04:00 |
|
Isaac Connor
|
27fed8b227
|
spacing
|
2020-07-23 11:53:33 -04:00 |
Andrew Bauer
|
e9323f96a5
|
additional cleanup of getNavBarHTML
|
2020-07-23 10:52:12 -05:00 |
|
Isaac Connor
|
172eaad8bd
|
fix capture jpeg saving due to use of std::string
|
2020-07-22 22:45:11 -04:00 |
|
Isaac Connor
|
1416bc547e
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-07-22 17:37:52 -04:00 |
|
Isaac Connor
|
f635afe00f
|
spacing
|
2020-07-22 17:30:39 -04:00 |
|
Isaac Connor
|
07165aed98
|
mostly spacing. Also set new_size from line_size in Assign(Image&) and set linesize in the assigned image
|
2020-07-22 17:30:28 -04:00 |
|
Isaac Connor
|
e746f0babe
|
Use 0 instead of the word auto for scale
|
2020-07-22 17:28:41 -04:00 |
|
Isaac Connor
|
7fd038d99b
|
spacing and quotes
|
2020-07-22 17:28:12 -04:00 |
|
Andrew Bauer
|
062ae675c8
|
partial cleanup of getNavBarHTML
|
2020-07-22 13:12:59 -05:00 |
|
Isaac Connor
|
7e6c637ec3
|
Unexpected colours while bad should only cause failure to annotate, not panic
|
2020-07-22 11:34:54 -04:00 |
|
Isaac Connor
|
d5dbebefe5
|
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
|
2020-07-21 19:06:38 -04:00 |
|
Isaac Connor
|
c5285143f7
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2020-07-21 17:39:32 -04:00 |
|
Isaac Connor
|
13e8ed1924
|
Clean up code that updates event with video_name. Fix video_file assignment missing /
|
2020-07-21 16:34:46 -04:00 |
|
Isaac Connor
|
f217ab54a3
|
When event_close_mode == CLOSE_ALARM and so we want to close the recording and start a new one, don't do it when alarm_frame_count > 1 until alarm_frames > alarm_frame_count. I believe this fixes a mem leak
|
2020-07-21 16:17:46 -04:00 |