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

11141 Commits

Author SHA1 Message Date
Andrew Bauer 3c225c9f1c Migrate Webcache out of webroot (#2083) 
* migrate webcache folder out of webroot, migrate htaccess files

* rpm specfile - add missing reference to cache folder

* fix submodule mixup
 2018-04-19 15:01:46 -04:00
Andrew Bauer e7be406eb2
Merge pull request #2082 from connortechnology/fix_signalcheck 
Fix signalcheck
 2018-04-19 13:26:54 -05:00
Isaac Connor bd5f4020ca bump version 2018-04-19 10:10:23 -04:00
Isaac Connor 56186a42ef change signal_check_points to a per-monitor variable instead of parts of config. Only call SignalCheck if signal_check_points is > 0 2018-04-19 10:10:14 -04:00
Isaac Connor 1f80277bee Add SignalCheckPoints to Monitors 2018-04-19 10:09:32 -04:00
Isaac Connor 983cd83054 Add default for SignalCheckPoints and add it as a hidden field to the non-misc tabs 2018-04-19 10:01:04 -04:00
Isaac Connor c7f672fabd SIGNAL_CHECK_POINTS is now a per-monitor setting 2018-04-19 09:59:10 -04:00
Isaac Connor cd70ed3dec always show SignalCheckColour and add a SignalCheckPoints option 2018-04-19 09:45:28 -04:00
Isaac Connor 6e9805f5c8 Merge ../ZoneMinder.master into storageareas 2018-04-19 09:34:20 -04:00
Isaac Connor eb21a5113e Add a debug line in SignaCheck function 2018-04-19 09:34:14 -04:00
Andrew Bauer a05a1f396c
fix copy/paste typo 2018-04-19 08:20:38 -05:00
Isaac Connor 385489b5f6 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-04-19 08:59:39 -04:00
Andy Bauer 98eb6570dd use make macros in zm_update-1.31.30.sql.in 2018-04-19 07:43:43 -05:00
Andrew Bauer edd4b1ec7f
fix a second case of perl double use 2018-04-19 07:24:05 -05:00
Isaac Connor d01682f3ad remove second use 2018-04-18 21:46:55 -04:00
Isaac Connor c27aa5efea Need to actually export CpuLoad 2018-04-18 21:44:37 -04:00
Isaac Connor 6dae6d8949 fix doubled use 2018-04-18 21:29:35 -04:00
Isaac Connor 8da9bc412b Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-04-18 21:12:33 -04:00
Isaac Connor fcaac016b5 Merge ../ZoneMinder.connortechnology 2018-04-18 21:12:14 -04:00
Isaac Connor 04e8244eca Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-04-18 21:06:23 -04:00
Isaac Connor b965eca683 Use a build substr for the default path to events 2018-04-18 21:06:13 -04:00
Isaac Connor cb7107ec4d Fix insert for default Storage Group 2018-04-18 21:04:54 -04:00
Andrew Bauer a5cbc8abd1 buildsystem - update git submodules 2018-04-18 19:21:14 -05:00
Isaac Connor bbee7fd0f2 fix array_key_exists 2018-04-18 14:17:41 -07:00
Isaac Connor 28b85e1977 Add ZeroSize test to Event Audit Report 2018-04-18 13:48:20 -07:00
Isaac Connor 70b8188cc1 make MoveTo more efficient by bailing early if it has already been moved. Also add a check for it's Old storage area changing. 2018-04-18 13:48:01 -07:00
Andrew Bauer be5161391a patching crud no longer needed 2018-04-18 15:02:42 -05:00
Andrew Bauer 8eb4195cb7 rpm specfile - update git submodules 2018-04-18 15:00:55 -05:00
Isaac Connor bd69f6a2ca close the videoStore when closing FFmpegCamera 2018-04-18 15:30:42 -04:00
Andrew Bauer f6540aeba1 point git submodules to our own forks 2018-04-18 14:00:00 -05:00
Isaac Connor 75248e7465 use array_key_exists instead of isset so that we can return nulls 2018-04-18 14:21:27 -04:00
Isaac Connor d31207dd53 use find_one instead of new Group so that caching will happen 2018-04-18 12:30:47 -04:00
Isaac Connor 88a2c0d953 spacing 2018-04-18 12:30:32 -04:00
Isaac Connor 61249ccf2a Show pause/play/stop when no stream buffer 2018-04-18 12:30:18 -04:00
Isaac Connor 36b8cfb115 test element so that processing will continue if buton doesn't exist 2018-04-18 12:29:59 -04:00
Isaac Connor 940c791d4f GroupIds won't be set if no groups are selected 2018-04-18 12:14:49 -04:00
Isaac Connor e3afa5e309 handle scale not being defined when using mpeg streaming 2018-04-18 11:28:19 -04:00
Isaac Connor 00b7ae9006 put in missing my 2018-04-18 10:07:50 -04:00
Isaac Connor 12d46e2377 change event_id in status_msg to 64bit when unpacking 2018-04-18 09:52:57 -04:00
Isaac Connor 1040afbda4 change message about not deleting files for speed 2018-04-18 09:27:11 -04:00
Isaac Connor bfe82e297a Default an empty Storage to doing Deletes 2018-04-18 09:26:36 -04:00
Isaac Connor 8c0ad8d1f3 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-04-17 22:57:44 -04:00
Andrew Bauer 456b1b59df
rpm specfile - bump crud to 3.1.0 2018-04-17 20:27:28 -05:00
Andrew Bauer 8bf502ee4f upgrade to cakephp 2.10.8 (#2067) 
* upgrade lib folder to cakephp 2.10.8

* recreate bootstrap.php.in

* Bump Crud module 3.0.10 -> 3.1.0

* fix CrudBaseObject.php
 2018-04-17 21:24:14 -04:00
Isaac Connor 48d5fa00d4 remove libsys-cpuload-perl as a dependency 2018-04-17 21:10:55 -04:00
Andrew Bauer 04cb1f9300 use ZoneMinder::Server::CpuLoad rather than Sys:CpuLoad (#2080) 2018-04-17 21:09:41 -04:00
Isaac Connor 118115f035 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-04-17 21:08:07 -04:00
Isaac Connor ef86746991 Merge ../ZoneMinder.connortechnology 2018-04-17 21:07:48 -04:00
Isaac Connor f620781f7e Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-04-17 21:07:00 -04:00
Isaac Connor aaa7844350 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-04-17 14:18:01 -07:00