Isaac Connor
|
93bec93d4a
|
Fix DefaultCodec in monitor
|
2018-09-10 15:09:27 -04:00 |
|
Isaac Connor
|
884ba078c7
|
Store codec in session for monitor
|
2018-09-10 15:09:08 -04:00 |
|
Isaac Connor
|
03f769eacc
|
Rough in codec specification for Events
|
2018-09-10 12:22:55 -04:00 |
|
Isaac Connor
|
978e332e3a
|
Merge branch 'master' into storageareas
|
2018-09-09 16:36:31 -04:00 |
|
Isaac Connor
|
534aebb21f
|
When loading previous and subsequent log lines, merge the fields in the filters instead of replacing
|
2018-09-09 16:36:09 -04:00 |
|
Isaac Connor
|
5eec7e00c5
|
Merge branch 'master' into storageareas
|
2018-09-09 14:09:52 -04:00 |
|
Isaac Connor
|
a296b2b777
|
fix crash when savind audio on ffmpeg 2.8
|
2018-09-09 14:01:03 -04:00 |
|
Isaac Connor
|
55dcb161ae
|
find should always return an array
|
2018-09-09 13:59:10 -04:00 |
|
Isaac Connor
|
b4f80fbe11
|
Always return an array from find
|
2018-09-09 13:56:29 -04:00 |
|
Isaac Connor
|
882e47c9ab
|
Fix deleting empty directories
|
2018-09-09 13:28:24 -04:00 |
|
Isaac Connor
|
9e8a876101
|
Fix finding Storage by ServerId
|
2018-09-09 13:28:11 -04:00 |
|
Isaac Connor
|
b8f6617db3
|
fix another instance of find_all
|
2018-09-09 12:15:06 -04:00 |
|
Isaac Connor
|
e4c87ce256
|
Merge branch 'master' into storageareas
|
2018-09-09 11:36:52 -04:00 |
|
Isaac Connor
|
1a2232734c
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-09-09 11:35:12 -04:00 |
|
Isaac Connor
|
d945e2ba54
|
Fix context allocation on ffmpeg 2.8. Fixes #41 on connorTechnology fork.
|
2018-09-09 11:34:12 -04:00 |
Vitaly Saversky
|
b778fd782c
|
Misspelling - non-recordable (#2200)
|
2018-09-09 09:39:30 -04:00 |
|
Isaac Connor
|
dfdac2ed70
|
make find and find_one functions consistent across Objects
|
2018-09-07 16:31:11 -04:00 |
|
Isaac Connor
|
fa690826a3
|
clean up zmstats, add db reconnect
|
2018-09-07 16:30:47 -04:00 |
|
Isaac Connor
|
b7aa11f109
|
Fix infinite loop reconnecting to db in Logging
|
2018-09-07 16:30:24 -04:00 |
|
Isaac Connor
|
def72b8e66
|
tidy up license
|
2018-09-07 16:29:59 -04:00 |
|
Isaac Connor
|
426aeea95b
|
add db reconnects to zmwatch.
|
2018-09-07 16:29:23 -04:00 |
|
Isaac Connor
|
4b69f520d5
|
Merge branch 'master' into storageareas
|
2018-09-05 12:08:23 -04:00 |
|
Isaac Connor
|
fe1e17d097
|
Capture can reasonably return -1 for EOF.
|
2018-09-05 11:16:17 -04:00 |
|
Isaac Connor
|
af32d59aa1
|
add libhuman-bytes-perl and libfile-slurp-file
|
2018-09-05 10:18:09 -04:00 |
|
Isaac Connor
|
730e1fda37
|
We only use File::Slurp when moving files to s3fs so only require it if doing that
|
2018-09-05 10:14:45 -04:00 |
|
Isaac Connor
|
c34f899d31
|
eliminate warning when no Storage area is set.
|
2018-09-04 13:57:35 -04:00 |
|
Isaac Connor
|
c9b4f14171
|
fix deleting events
|
2018-09-04 09:57:32 -04:00 |
|
Isaac Connor
|
8245d193e2
|
Merge branch 'master' into storageareas
|
2018-09-04 09:48:47 -04:00 |
Andrew Bauer
|
13558b2c12
|
convert existing http urls in help text to markdown
|
2018-09-04 07:39:46 -05:00 |
Andy Bauer
|
ce48343d1a
|
embed link to privacy statment in telemetry help text
|
2018-09-03 13:55:11 -05:00 |
|
Andrew Bauer
|
e5a2581dcc
|
optionhelp - support links markdown style (#2198)
|
2018-09-03 09:56:52 -04:00 |
|
Andrew Bauer
|
36322f9129
|
rpm - use _pkgdocdir instead of _docdir
|
2018-09-01 12:15:08 -05:00 |
|
Andrew Bauer
|
86f043633a
|
typo
|
2018-09-01 12:04:48 -05:00 |
|
Andrew Bauer
|
563e673bee
|
rpm - rename README.xxx to README for all builds
|
2018-09-01 11:53:56 -05:00 |
Isaac Connor
|
14b5fc3660
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-08-31 18:43:29 -04:00 |
|
Isaac Connor
|
2858564155
|
Merge branch 'master' into storageareas
|
2018-08-31 16:06:13 -04:00 |
|
Isaac Connor
|
9ec415b30a
|
Just reload the event view instead of dynamically updating the stream. Fixes #2196
|
2018-08-31 15:56:21 -04:00 |
|
Isaac Connor
|
798aab84f3
|
whitespace changes
|
2018-08-31 11:58:33 -04:00 |
|
Isaac Connor
|
623d31edae
|
Don't do csrf for view=image
|
2018-08-31 11:58:17 -04:00 |
|
Isaac Connor
|
7ee80e7cca
|
Debug lines should be debug, not warning
|
2018-08-31 11:58:03 -04:00 |
|
Isaac Connor
|
57d5e28870
|
clear output buffer before sending image. Adjust filename for saveAs when doing a scaled image. whitespace corrections. More Debug output
|
2018-08-31 11:57:47 -04:00 |
|
Isaac Connor
|
f3a7a61849
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-08-31 10:53:26 -04:00 |
|
Isaac Connor
|
0823b28712
|
whitespace changes. Make Privacy test an else so that PRIVACY checks don't happen if not logged in
|
2018-08-31 10:37:11 -04:00 |
|
Isaac Connor
|
4b30ea7877
|
cleanup, whitespace
|
2018-08-31 10:35:23 -04:00 |
|
Andrew Bauer
|
029c6401af
|
add libjson-maybexs-perl as a debian package dependency
|
2018-08-31 09:34:54 -05:00 |
|
Isaac Connor
|
799b34eee8
|
handle xhr errors like when auth is no longer valid. Do a page refresh when this happens
|
2018-08-31 10:34:54 -04:00 |
|
Andrew Bauer
|
18c88be550
|
bump rpm specfile to 1.31.47
|
2018-08-31 07:59:51 -05:00 |
|
Isaac Connor
|
df3da6dd93
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-08-30 14:53:39 -04:00 |
|
Isaac Connor
|
0eaa539dc6
|
ZM_SWAP_PATH may not exist, so always try to create it
|
2018-08-30 14:53:27 -04:00 |
|
Isaac Connor
|
4e32089a48
|
Merge branch 'master' into storageareas
|
2018-08-30 14:51:27 -04:00 |