Isaac Connor
|
110e5075f4
|
fix namespace fixes #3566
|
2019-04-01 17:21:01 -04:00 |
Isaac Connor
|
87cb716500
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-04-01 14:02:46 -04:00 |
|
Isaac Connor
|
cb33318c4a
|
fix invalid memory access due to incorrect opening/closing/copying of contexts
|
2019-04-01 14:02:39 -04:00 |
|
Isaac Connor
|
a6998cbc9e
|
Use FFMPEGDeInit instead of avformat_network_deinit
|
2019-04-01 13:39:11 -04:00 |
|
Isaac Connor
|
c9985107ee
|
Add a deinit function to handle avformat_network_deinit
|
2019-04-01 13:38:13 -04:00 |
|
Isaac Connor
|
15fb546e15
|
spacing
|
2019-04-01 11:13:35 -04:00 |
|
Isaac Connor
|
ed5a448a1d
|
Correct pts on audio frame before sending it to the encoder so that when we flush the encoder the resulting packets have the right pts.
|
2019-04-01 11:13:14 -04:00 |
|
Isaac Connor
|
7d07cdf530
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-04-01 10:12:09 -04:00 |
|
Isaac Connor
|
fa9803d819
|
Can't use this->data to avoid another db hit. Must load by id
|
2019-04-01 10:11:56 -04:00 |
Andrew Bauer
|
fc38e5f48b
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-03-30 10:41:36 -05:00 |
|
Andrew Bauer
|
e97751558f
|
eslint fix
|
2019-03-30 10:41:04 -05:00 |
Andrew Bauer
|
593f1571e3
|
add zmrecover.pl to rpm specfile
|
2019-03-30 08:57:04 -05:00 |
|
Andrew Bauer
|
1d3617c1cf
|
Rem reference to AUTHORS since it no longer exists
|
2019-03-30 08:43:46 -05:00 |
|
Andrew Bauer
|
4e5ed68232
|
update redhat install guide
|
2019-03-30 08:36:45 -05:00 |
|
Andrew Bauer
|
e3caf38a72
|
Update zoneminder.spec
|
2019-03-30 08:20:18 -05:00 |
|
Andrew Bauer
|
8556e13504
|
Update zoneminder.spec
|
2019-03-30 08:16:46 -05:00 |
|
Isaac Connor
|
d579faa291
|
attr in modern ZM should be StartWeekday. Continue to support legacy filters
|
2019-03-28 15:13:53 -04:00 |
|
Isaac Connor
|
90e97ff135
|
Merge branch 'master' into storageareas
|
2019-03-28 11:20:29 -04:00 |
|
Isaac Connor
|
95657491e0
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-03-28 09:43:39 -04:00 |
|
Isaac Connor
|
49e3f0a68e
|
eslint fixes
|
2019-03-28 09:43:31 -04:00 |
|
Isaac Connor
|
9a70dff143
|
to single quotes, include monitor Id when logging the closing of an event
|
2019-03-28 09:43:17 -04:00 |
|
Isaac Connor
|
e6547953b0
|
fix segfault using old ffmpeg
|
2019-03-28 09:24:32 -04:00 |
|
Isaac Connor
|
ee4b452e42
|
Update monitor edit to not use inline js
|
2019-03-25 16:25:09 -04:00 |
|
Isaac Connor
|
c7e09e03d3
|
add cache busting to base.js
|
2019-03-25 16:24:46 -04:00 |
|
Isaac Connor
|
ba8c96e113
|
Merge branch 'master' into storageareas
|
2019-03-25 12:33:33 -04:00 |
|
Isaac Connor
|
acb9070b04
|
Add a warning when an event exceeds section length
|
2019-03-25 12:33:30 -04:00 |
|
Isaac Connor
|
052a2ef1fd
|
fix eventserver => eventnotification
|
2019-03-25 12:20:21 -04:00 |
|
Isaac Connor
|
7565e171b4
|
spacing
|
2019-03-25 12:18:15 -04:00 |
|
Isaac Connor
|
4eafc52955
|
spacing
|
2019-03-25 12:18:01 -04:00 |
|
Isaac Connor
|
7e62ccca3c
|
Handle div by zero when TotalMem is not known for Server
|
2019-03-25 12:08:56 -04:00 |
|
Isaac Connor
|
8d07a4a08f
|
Log useful error messages when can't mkdir the monitor events dir or the symlink to it. symlink is a warning because the symlink is just a user aid
|
2019-03-25 11:58:04 -04:00 |
santos995
|
accf826ae9
|
New translations
|
2019-03-25 11:44:01 +03:00 |
|
santos995
|
42196ed5aa
|
Update translation ru 2
|
2019-03-25 10:20:27 +03:00 |
|
Isaac Connor
|
677b9cfbed
|
Make controlcap popup wider
|
2019-03-24 09:59:04 -04:00 |
|
Isaac Connor
|
bd5c9b5b20
|
add Control to ZM namespace
|
2019-03-24 09:58:50 -04:00 |
|
santos995
|
01056fc0f4
|
Перевод некоторых слов
|
2019-03-24 04:14:06 +03:00 |
|
Isaac Connor
|
f311fcc9e0
|
change to a button
|
2019-03-22 17:28:23 -04:00 |
|
Isaac Connor
|
8f28ba0be3
|
beter debug and less often when no terms in parseFilter
|
2019-03-22 17:28:12 -04:00 |
|
Isaac Connor
|
6d4d353209
|
fix namespace on MontageLayout
|
2019-03-22 17:27:58 -04:00 |
|
Isaac Connor
|
5615cafc19
|
fix compile on old ffmpeg
|
2019-03-21 17:50:17 -04:00 |
|
Isaac Connor
|
16467595d4
|
Fix clicking in montage
|
2019-03-21 17:00:51 -04:00 |
|
Isaac Connor
|
65fab1b032
|
add px to width and height of event img
|
2019-03-21 14:14:45 -04:00 |
|
Isaac Connor
|
7f7acc18ee
|
spacing and code doc
|
2019-03-21 14:14:30 -04:00 |
|
Isaac Connor
|
f434042c52
|
fix spacing
|
2019-03-21 14:14:15 -04:00 |
|
Isaac Connor
|
c159dd8d10
|
cleanup and fix code that assumed H264
|
2019-03-21 14:13:56 -04:00 |
|
Isaac Connor
|
c791f136da
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2019-03-21 10:43:54 -04:00 |
|
Isaac Connor
|
a30c4d9551
|
rework ffmpeg_input to not use pkt_duration which doesn't exist in avconv
|
2019-03-21 10:41:59 -04:00 |
|
Isaac Connor
|
b97801a174
|
Don't specify database name when turning off DEEP storage
|
2019-03-20 16:22:47 -04:00 |
|
Isaac Connor
|
fcb9f76561
|
Fix out_frame->pts being nothing because we freed in_frame
|
2019-03-20 16:06:55 -04:00 |
|
Isaac Connor
|
05976b3227
|
Add pts to zm_dump_frame
|
2019-03-20 16:06:31 -04:00 |