ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,619 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

7619 Commits

Author SHA1 Message Date
Andrew Bauer c98255dd75 Merge pull request #1948 from connortechnology/fix_empty_monitor_source_column 
Fix empty monitor source column
 2017-07-14 13:10:52 -05:00
Andrew Bauer e247efcd42 Merge pull request #1951 from connortechnology/fix_api_conf_d 
updates bootstrap.php.in to match config.php's conf.d loading
 2017-07-14 12:44:44 -05:00
Isaac Connor 240a990c7f fix writing to config 2017-07-14 12:19:43 -04:00
Isaac Connor e203064bf7 updates bootstrap.php.in to match config.php's conf.d loading 2017-07-14 12:03:00 -04:00
Isaac Connor 13a72b7a99 fix path to logs for api 2017-07-14 11:58:15 -04:00
Isaac Connor 1a8638f3dd Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder 2017-07-14 11:50:01 -04:00
Andrew Bauer 89bcfc4e28 fix incorrect gpl license text mailing address 2017-07-14 10:39:50 -05:00
Andrew Bauer 2002e863a9 Update zoneminder.service.in 2017-07-14 10:26:41 -05:00
Andrew Bauer 76f1d1a3aa Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder 2017-07-14 10:16:54 -05:00
Andrew Bauer 1822510909 rpm packaging - consolidate zoneminder apache config file 2017-07-14 10:15:12 -05:00
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
Andrew Bauer 99bb12dcc9 Update zoneminder.spec 
changes from rpmfusion feedback
 2017-07-14 08:33:08 -05: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
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 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 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 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 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 4d130b8595 updates to do_debian_package 2017-07-11 14:42:26 -04:00
Isaac Connor dfd1c2844a remove storageId 2017-07-11 11:28:15 -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
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 50adec45c5 Strip non 7-bit ascii chars from log message 2017-07-06 11:45:17 -04:00
Isaac Connor c372787882 fix typo 2017-07-06 10:50:56 -04:00
Isaac Connor 2cab6baf2c add some comments and one change that may fix effectiveLevel use 2017-07-05 15:25:01 -04:00
Isaac Connor 6b2e23e1a5 Merge branch 'montagereview_rework' of ../ZoneMinder.master into montagereview_rework 2017-07-05 14:27:46 -04:00
Isaac Connor 0e40897e02 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-07-05 14:24:09 -04:00
Isaac Connor d61dfcd410 scale in montagereview is 1 based instead of 100, so multiply by 100 when asking for the streamSrc. 2017-07-05 14:23:01 -04:00
Isaac Connor 720748a731 code cleanup mostly. scale in montagereview is 1 based instead of 100, so multiply by 100 when asking for the streamSrc. 2017-07-05 14:22:44 -04:00
Isaac Connor 0b4a2b41cc fix scale on initial montage load. Replace calls to functions.php/getStreamSrc with object based call 2017-07-05 14:20:50 -04:00
Isaac Connor 8569c7523a fix braces 2017-07-05 14:11:58 -04:00