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 |
|
Isaac Connor
|
f5dfa0d740
|
Spacing and fix clone monitor by setting the Id to 0 instead of nextId, so that when we go to save it, we use an insert instead of an update
|
2019-03-20 15:03:20 -04:00 |
|
Isaac Connor
|
10a972f2a0
|
fixes to download video
|
2019-03-20 14:51:59 -04:00 |
|
Isaac Connor
|
d4353af8af
|
Fix eslint errors
|
2019-03-20 14:51:39 -04:00 |
|
Isaac Connor
|
a5366d522d
|
Fixup exporting
|
2019-03-20 14:29:05 -04:00 |
|
Isaac Connor
|
ae7391689b
|
Add some code doc
|
2019-03-20 14:28:19 -04:00 |
|
Isaac Connor
|
ad059f985e
|
spacing
|
2019-03-20 14:27:23 -04:00 |
|
Isaac Connor
|
09b42f8b55
|
remove nonce from js because it is the exported html not part of the zm web ui
|
2019-03-20 14:27:10 -04:00 |
|
Isaac Connor
|
6efeab5f8d
|
improve readability of parseFilter
|
2019-03-20 14:26:48 -04:00 |
|
Isaac Connor
|
b988ce0573
|
more parentheses to make logic more clear
|
2019-03-20 14:26:35 -04:00 |
|
Isaac Connor
|
c3324ada18
|
Put back mkdir ZM_PATH_SOCKS
|
2019-03-20 14:26:03 -04:00 |
|
Isaac Connor
|
84a200395e
|
spacing and turn off errors because ajax should only return json
|
2019-03-20 14:25:34 -04:00 |
|
Isaac Connor
|
52e66adc99
|
Fix namespace
|
2019-03-20 14:25:12 -04:00 |
|
Isaac Connor
|
3931baa2b6
|
fix build on old ffmpeg
|
2019-03-20 10:21:43 -04:00 |
|
Isaac Connor
|
5d834ef2d3
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-03-20 10:15:28 -04:00 |
|
Isaac Connor
|
a634d8b774
|
use id instead of this->data when loading Event to delete in API
|
2019-03-19 17:26:20 -04:00 |
|
Isaac Connor
|
7b878a4c64
|
Sync up quotes and space differences frmo zma_to_thread
|
2019-03-19 17:15:32 -04:00 |
aktarus82
|
12fe7fd2aa
|
first commit
|
2019-03-19 21:18:10 +01:00 |
|
Isaac Connor
|
a437c407a7
|
fix video_out_ctx init so that ffmpeg doesn't complain
|
2019-03-19 13:17:26 -04:00 |
|
Isaac Connor
|
0623afb0ae
|
add language entry for Monitor DefaultCodec
|
2019-03-19 12:19:58 -04:00 |
|
Isaac Connor
|
71cd024fda
|
spacing updates. Use MP4 instead of H264/H265 in viewing codec dropdown
|
2019-03-19 12:16:31 -04:00 |
|
Isaac Connor
|
6b6e787e4e
|
fix ajax stream code
|
2019-03-19 12:05:45 -04:00 |
|
Isaac Connor
|
418276ff1c
|
cleanup/debug
|
2019-03-19 12:02:42 -04:00 |
|
Isaac Connor
|
3844f9c9dd
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2019-03-19 11:51:22 -04:00 |