Isaac Connor
|
c65255a067
|
Merge ../ZoneMinder.connortechnology
|
2018-04-20 15:56:42 -04:00 |
|
Isaac Connor
|
a868bb70ed
|
Better debug when fail to attach images
|
2018-04-20 15:56:14 -04:00 |
|
Isaac Connor
|
fac3cde1e7
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-04-20 15:23:23 -04:00 |
|
Isaac Connor
|
3ea39ad417
|
whitespace
|
2018-04-20 15:22:45 -04:00 |
|
Isaac Connor
|
1d4e79feb1
|
Update filters a bit, using Event as an object to get the Path, etc
|
2018-04-20 15:22:31 -04:00 |
|
Isaac Connor
|
5a93458441
|
add StartTime to Filters
|
2018-04-20 15:22:12 -04:00 |
|
Isaac Connor
|
8b165c34b0
|
Handle event and frame no found earlier
|
2018-04-20 14:25:54 -04:00 |
|
Isaac Connor
|
781438d4c5
|
specify E.* in query because otherwise it uses M.Id for Id
|
2018-04-20 14:25:38 -04:00 |
|
Isaac Connor
|
fedc4d4cb1
|
spacing
|
2018-04-20 14:24:56 -04:00 |
|
Isaac Connor
|
ac775f13f6
|
always return an array from find_all
|
2018-04-20 14:23:27 -04:00 |
|
Isaac Connor
|
9de3c44702
|
Add find_one and caching
|
2018-04-20 14:23:04 -04:00 |
|
Isaac Connor
|
07e7ab1547
|
fix spacing
|
2018-04-20 14:21:41 -04:00 |
Isaac Connor
|
970830aee3
|
tidy up
|
2018-04-20 13:10:38 -04:00 |
|
Isaac Connor
|
c9e18fa24f
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-04-20 08:54:38 -04:00 |
|
Isaac Connor
|
914c608dbc
|
get rid of stored procedure. Do everything in the Trigger
|
2018-04-20 08:54:25 -04:00 |
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 |