Isaac Connor
|
0df6ac2895
|
Merge branch 'master' into storageareas
|
2017-07-13 11:04:51 -04:00 |
|
Isaac Connor
|
9d1d2c1ce4
|
print the line out all at once, fixing the missing comma after fps.
|
2017-07-13 10:27:53 -04:00 |
|
Isaac Connor
|
10ea0de5a4
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-07-13 10:26:44 -04:00 |
|
Isaac Connor
|
403dca78fb
|
break up a long line
|
2017-07-13 10:26:24 -04:00 |
|
Isaac Connor
|
a5f9c01298
|
fixes braces and spacing and add some debug lines when the onvif-probe output doesn't match what is expected
|
2017-07-13 10:26:09 -04:00 |
|
Isaac Connor
|
cb88952a77
|
braces and spacing
|
2017-07-13 10:25:14 -04:00 |
|
Isaac Connor
|
aff7e94725
|
default to TCP for Method
|
2017-07-13 10:23:30 -04:00 |
|
Isaac Connor
|
363303efa9
|
use isset instead of empty to get rid of warning
|
2017-07-13 10:08:36 -04:00 |
|
Isaac Connor
|
f294acde92
|
add global and for including the state view
|
2017-07-13 10:07:23 -04:00 |
|
Isaac Connor
|
171891cd52
|
Merge branch 'fix_zmonvif' into storageareas
|
2017-07-13 09:41:59 -04:00 |
|
Isaac Connor
|
e92974c5d4
|
fix spacing
|
2017-07-13 09:41:46 -04:00 |
|
Isaac Connor
|
5d96a8d14e
|
make code more robust by handling an undefined get_VideoEncoderConfiguration()
|
2017-07-13 09:38:42 -04:00 |
Andrew Bauer
|
5e74fd2e53
|
Update zoneminder.spec
rpmspecfile change. zmsystemctl.pl is only installed on distros w/ systemd (i.e. all current distros except el6)
|
2017-07-12 14:23:43 -05:00 |
|
Isaac Connor
|
84863afb6b
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-07-12 12:52:24 -04:00 |
|
Isaac Connor
|
22e957ba46
|
clean up state a bit, use 1 less call to daemon check by using global . When selecting a layout, set img width to 100%
|
2017-07-12 12:49:01 -04:00 |
|
Isaac Connor
|
0adc14da4e
|
fix links to Filter and Devices
|
2017-07-12 11:17:07 -04:00 |
|
Isaac Connor
|
c9689aa010
|
fix braces,spacing,quotes. Change form method to post
|
2017-07-12 10:58:20 -04:00 |
|
Isaac Connor
|
bd681de955
|
fix braces
|
2017-07-12 10:57:45 -04:00 |
|
Isaac Connor
|
220588a1c9
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-07-11 20:39:57 -04:00 |
|
Isaac Connor
|
4a90980fbe
|
add Id to Filters
|
2017-07-11 20:35:56 -04:00 |
|
Isaac Connor
|
046acbc05b
|
fix some field
|
2017-07-11 20:34:06 -04:00 |
|
Isaac Connor
|
6c68ca40e4
|
add some indexes
|
2017-07-11 20:33:09 -04:00 |
|
Isaac Connor
|
fed4dae7e5
|
fix width and height in options
|
2017-07-11 19:13:29 -04:00 |
|
Isaac Connor
|
148d7066f9
|
Merge branch 'master' into storageareas
|
2017-07-11 16:15:02 -04:00 |
|
Isaac Connor
|
a9e72288f6
|
add -safe 0 to ffmpeg command line option so that it will generate the concat file
|
2017-07-11 16:11:52 -04:00 |
|
Isaac Connor
|
888aa11ae3
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-07-11 15:02:29 -04:00 |
|
Isaac Connor
|
8497e4c24d
|
remove tilde
|
2017-07-11 14:59:55 -04:00 |
|
Isaac Connor
|
4d130b8595
|
updates to do_debian_package
|
2017-07-11 14:42:26 -04:00 |
|
Isaac Connor
|
64d990a65f
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-07-11 14:33:04 -04:00 |
|
Isaac Connor
|
786dcb0dc1
|
Add orientation to Events
|
2017-07-11 14:31:41 -04:00 |
|
Isaac Connor
|
d612a3fb99
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-07-11 14:29:03 -04:00 |
|
Isaac Connor
|
cb98e3faea
|
bump version to 1.31.3
|
2017-07-11 14:11:15 -04:00 |
|
Isaac Connor
|
dfd1c2844a
|
remove storageId
|
2017-07-11 11:28:15 -04:00 |
|
Isaac Connor
|
cfcf7363ea
|
Don't test the symlinks anymore
|
2017-07-11 11:18:47 -04:00 |
Joe Alamo
|
0faeef58c0
|
Update filterevents.rst (#1944)
State where filters are actually saved
|
2017-07-10 17:16:01 -04:00 |
|
Isaac Connor
|
0eb7bfabf2
|
put the ajax query back to a post
|
2017-07-07 12:15:09 -04:00 |
|
Isaac Connor
|
90882edc31
|
make montage images be display: block; This makes the layout not jump around when a camera feed dies
|
2017-07-07 10:05:20 -04:00 |
|
Isaac Connor
|
2dd8b5df1f
|
in dark and flat, the buttons use a larger font. The fixed size is not appropriate
|
2017-07-07 09:59:41 -04:00 |
|
Isaac Connor
|
39745e49d4
|
I think we switch to border-box model or something, anyways, the box that the pantilt buttons go in needs to be 100px not 96px
|
2017-07-07 09:51:51 -04:00 |
|
Andrew Bauer
|
e2810a858e
|
Merge pull request #1941 from connortechnology/logger_fix
add some comments and one change that may fix effectiveLevel use
|
2017-07-07 08:35:35 -05:00 |
|
Andrew Bauer
|
4128f5861f
|
Merge pull request #1940 from connortechnology/montagereview_rework
Montagereview rework
|
2017-07-07 08:34:01 -05:00 |
|
Isaac Connor
|
21881235f9
|
merge changeWidth and changeHeight
|
2017-07-07 09:31:53 -04:00 |
|
Andrew Bauer
|
5dcfa2f2d2
|
Merge pull request #1942 from connortechnology/strip_badchars_from_log
Strip non 7-bit ascii chars from log message
|
2017-07-07 08:31:41 -05:00 |
|
Isaac Connor
|
1f6aea0454
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-07-06 17:46:00 -04:00 |
|
Isaac Connor
|
d3ec50aa69
|
various fixes plus use global db functions in logger
|
2017-07-06 17:45:23 -04:00 |
|
Isaac Connor
|
323aedde4e
|
fix merge
|
2017-07-06 12:41:15 -04:00 |
|
Isaac Connor
|
2a71b0f170
|
Merge branch 'storageareas' into work_on_zms
|
2017-07-06 12:39:44 -04:00 |
|
Isaac Connor
|
f9be7f0fa0
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-07-06 11:58:57 -04:00 |
|
Isaac Connor
|
c2d21289e1
|
always offer to upload to zmrepo
|
2017-07-06 11:57:56 -04:00 |
|
Isaac Connor
|
50adec45c5
|
Strip non 7-bit ascii chars from log message
|
2017-07-06 11:45:17 -04:00 |