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

10037 Commits

Author SHA1 Message Date
Andrew Bauer d931945619 Update zoneminder.spec 
we have to tell rpm what permission zmcustom.conf has to prevent the build from failing on el6
 2017-07-20 17:53:06 -05:00
Andrew Bauer 4bca799d43 reorganize zm config files (#1937) 
* reogranize config files

* process 01-system-paths.conf.in

* exclude .in files in install directive
 2017-07-17 09:11:36 -04:00
Isaac Connor 1264f0601f update to storageareas version, which changes the sql to use subqueries instead of JOINs 2017-07-14 15:55:08 -04:00
Andrew Bauer 5cf2be528a Merge pull request #1950 from connortechnology/fix_api_logs 
fix path to logs for api
 2017-07-14 13:19:12 -05:00
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 4cf28267e3 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-07-14 12:30:10 -04:00
Isaac Connor b030fee429 don't do csrf checks for control commands 2017-07-14 12:29:24 -04: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
Isaac Connor 9824049c0c fix conf.d loading in api 2017-07-14 11:46:36 -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 b3984ea2da Merge branch 'master' into storageareas 2017-07-14 10:38:20 -04: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
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