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

11362 Commits

Author SHA1 Message Date
Andrew Bauer 85ba525496
rpm spec file - use %{_sourcedir} macro 2018-04-19 20:41:11 -05:00
Andrew Bauer 087fcc6c78
update buildsystem 2018-04-19 20:23:17 -05:00
Andrew Bauer 39244ac6ec
buildsystem update 2018-04-19 20:01:31 -05:00
Andy Bauer 9f74efd18a Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder 2018-04-19 18:41:16 -05:00
Andy Bauer 411a831338 rpm packaging - mention the firewall in the README's 2018-04-19 18:40:05 -05:00
Andrew Bauer 2d2c0df8f1
rpm specfile - bump version 2018-04-19 15:39:08 -05:00
Andy Bauer ed140426ab rpm packaging changes and documentation 2018-04-19 15:36:43 -05:00
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
Isaac Connor fb44619a66 output the initial table head 2018-04-19 14:33:05 -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 64c3c21564 Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas 2018-04-19 14:22:23 -04:00
Isaac Connor 2516846176 only update DiskSpace if new DiskSpace is defined 2018-04-19 14:22:19 -04:00
Isaac Connor 2aa689a14a Use a class instead of an id for consoleTable 2018-04-19 14:20:02 -04:00
Isaac Connor 5b5cd3f330 fix broken table when no monitors to display 2018-04-19 14:16:30 -04:00
Isaac Connor 56d3c2824f Fix path to triggers.sql 2018-04-19 12:31:50 -04:00
Isaac Connor a3373e5e40 Use correct dir to source cmake generated files from 2018-04-19 08:22:28 -07:00
Isaac Connor e6525ce59e Introduce a level param, and use it to turn on checks that shouldn't need to be done anymore, due to foreign keys 2018-04-19 08:18:23 -07:00
Isaac Connor 5fe7b3f55f increase process kill time to 100 secs. zma can sometimes take this long 2018-04-19 08:17:37 -07:00
Isaac Connor 477e96a4a6 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-04-19 07:46:28 -07:00
Isaac Connor d9a035a45d Remove commit that is unneccesary 2018-04-19 07:38:39 -07:00
Isaac Connor 696b17e92e include path to where we are not deleting from in teh debug output 2018-04-19 07:37:11 -07: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