Isaac Connor
|
94db0a3f02
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-07-14 10:32:19 -04:00 |
|
Isaac Connor
|
801d978898
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-07-14 10:30:25 -04:00 |
|
Isaac Connor
|
a07f8961d1
|
add another zmDbConnect at the bottom of the while(1) loop which will ping and reconnect to db if neccessary.
|
2017-07-14 10:30:12 -04:00 |
|
Isaac Connor
|
d5a4aaca5d
|
fix braces, spacing, move pod docs to bottom
|
2017-07-14 10:28:31 -04:00 |
|
Isaac Connor
|
e9d1474a4d
|
fix braces, spacing, move pod docs to bottom
|
2017-07-14 10:27:27 -04:00 |
|
Isaac Connor
|
d634d8967b
|
Merge ../ZoneMinder.master into fix_empty_monitor_source_column
|
2017-07-14 10:04:24 -04:00 |
|
Isaac Connor
|
d13d7e9050
|
recode the bit that outputs the link under source so that it defaults to Monitor # under all situations
|
2017-07-14 09:57:25 -04:00 |
|
Isaac Connor
|
33453cacf4
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-07-14 09:33:42 -04:00 |
Andrew Bauer
|
99bb12dcc9
|
Update zoneminder.spec
changes from rpmfusion feedback
|
2017-07-14 08:33:08 -05:00 |
|
Isaac Connor
|
0e54d4e69a
|
imposing a height on the textpanel causes the text to overflow
|
2017-07-14 09:26:56 -04:00 |
|
Isaac Connor
|
df0497b3a7
|
always use onmouseover, as we can now pull images fairly quickly from the mp4
|
2017-07-14 09:25:53 -04:00 |
|
Andrew Bauer
|
c294e25dbc
|
rpm packaging - migrate cakephp htaccess parms into main apache config
|
2017-07-14 07:23:35 -05:00 |
|
Andrew Bauer
|
8567ea9613
|
Merge pull request #1945 from connortechnology/fix_zmonvif
make code more robust by handling an undefined get_VideoEncoderConfig
|
2017-07-14 07:09:22 -05:00 |
|
Isaac Connor
|
b59e32c372
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-07-13 17:35:36 -04:00 |
|
Isaac Connor
|
8bbad9adf8
|
braces, spaces
|
2017-07-13 17:35:06 -04:00 |
|
Isaac Connor
|
a16d01a931
|
use less ram loading events
|
2017-07-13 17:34:45 -04:00 |
|
Isaac Connor
|
63e974192c
|
handle case when no filter is specified
|
2017-07-13 14:57:27 -04:00 |
|
Isaac Connor
|
0048908071
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-07-13 11:18:28 -04:00 |
Martin Goodwell
|
3789dcb5de
|
Introducing Maginon Supra IPC camera Controls and script (#1947)
* Added Maginon Supra IPC to Controls
* Adding support for Maginon Supra IPC camera
|
2017-07-13 11:10:20 -04:00 |
|
Isaac Connor
|
37003aebcf
|
Merge branch 'master' into storageareas
|
2017-07-13 11:07:06 -04:00 |
|
Isaac Connor
|
f7a99a1106
|
make montagereview not load all events and frames at once, so that it doesn't use up all memory
|
2017-07-13 11:06:08 -04:00 |
|
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 |