Isaac Connor
|
2427a5bf63
|
sync up .service file to match 1604.
|
2018-01-08 16:13:11 -05:00 |
|
Isaac Connor
|
3e31203a22
|
default service start timeout to 5 minutes. THe default of 1.5 minutes is too short on some larger systems
|
2018-01-08 16:11:54 -05:00 |
Isaac Connor
|
f73ead3f33
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-08 12:44:54 -08:00 |
|
Isaac Connor
|
348764985b
|
Fix Storage DiskSpace updating when Event.DiskSpace IS NULL
|
2018-01-08 15:42:28 -05:00 |
|
Isaac Connor
|
e877fa1d61
|
make zmupdate_1.31.19 re-runable.
|
2018-01-08 14:49:57 -05:00 |
|
Isaac Connor
|
baa360cd3d
|
update event stat counts for all monitors at once
|
2018-01-07 14:20:17 -05:00 |
|
Isaac Connor
|
727bde752f
|
Count non-i frames in frames_to_keep. Should reduce the size of the packetqueue
|
2018-01-07 13:39:13 -05:00 |
|
Isaac Connor
|
b25452d4c5
|
Don't both to add the Floreon control type. That can be done with zmcamtool
|
2018-01-05 15:47:28 -05:00 |
|
Isaac Connor
|
5c75df1a40
|
drop archived and Frames indexes from Events, as they are useless. Add a StorageId Index
|
2018-01-05 14:40:03 -05:00 |
|
Isaac Connor
|
37a40a30d3
|
drop archived and Frames indexes from Events, as they are useless. Add a StorageId Index
|
2018-01-05 14:39:54 -05:00 |
|
Isaac Connor
|
3ac73a9d6c
|
switch to updating event counts for all monitors
|
2018-01-05 10:01:30 -08:00 |
|
Isaac Connor
|
9c00488ada
|
Merge branch 'storageareas' into tesla
|
2018-01-04 14:23:30 -08:00 |
|
Isaac Connor
|
b7ad24a266
|
revert the triggers to update Monitor Stats. THey just don't work
|
2018-01-04 17:22:51 -05:00 |
|
Isaac Connor
|
131e986e83
|
Merge branch 'storageareas' into tesla
|
2018-01-04 14:17:53 -08:00 |
|
Isaac Connor
|
796ba0d899
|
revert to using the mysql client to do updates. We need it for delemiter changes when adding triggers
|
2018-01-04 17:16:43 -05:00 |
|
Isaac Connor
|
224e261ade
|
Don't run audit on default storage area. Add a test for an event having no endtime
|
2018-01-04 17:16:15 -05:00 |
|
Isaac Connor
|
68166719ca
|
Update the SQL that updates the monitor counts to be more efficient.
|
2018-01-04 17:15:46 -05:00 |
|
Isaac Connor
|
db0e35bf55
|
Move eventcounts update from zmwatch.pl to triggers and zmaudit.pl
|
2018-01-04 15:04:13 -05:00 |
|
Isaac Connor
|
023e50af5c
|
Merge branch 'storageareas' into tesla
|
2018-01-04 10:09:24 -08:00 |
|
Isaac Connor
|
4033cf5ffc
|
bump version to 1.31.19 with triggers
|
2018-01-04 13:07:02 -05:00 |
|
Isaac Connor
|
2cc185fd45
|
Move Updating Storage stats to a trigger. Remove the code from zmwatch that did it before
|
2018-01-04 13:06:28 -05:00 |
|
Isaac Connor
|
10133073de
|
Check for SaveJPEGs being set to snapshot instead of hitting the fs to check for a snapshot file
|
2018-01-04 12:31:20 -05:00 |
|
Isaac Connor
|
2ec25a20ec
|
Don't crash if we fail to open the video output stream
|
2018-01-04 10:07:51 -05:00 |
|
Isaac Connor
|
cc773fe992
|
Merge branch 'storageareas' into tesla
|
2018-01-03 07:21:33 -08:00 |
|
Isaac Connor
|
4e24e3647e
|
Also join the Storage table, and use it for ServerId instead of Monitors table.
|
2018-01-03 07:20:20 -08:00 |
|
Isaac Connor
|
485741b6f7
|
treat File exists as a non-error
|
2018-01-02 12:44:47 -08:00 |
|
Isaac Connor
|
7f44fb67e8
|
treat File exists as a non-error
|
2018-01-02 12:44:17 -08:00 |
|
Isaac Connor
|
b8cfff2b6d
|
Merge branch 'storageareas' into tesla
|
2018-01-02 09:18:29 -08:00 |
|
Isaac Connor
|
a33cba9989
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-01-02 09:17:16 -08:00 |
|
Isaac Connor
|
642c3f053a
|
We are not using boost at this time.
|
2018-01-02 09:16:37 -08:00 |
|
Isaac Connor
|
867f2a9166
|
simplify deleting event files. The old way was too intensive.
|
2018-01-02 09:15:50 -08:00 |
|
Isaac Connor
|
16f01d5ecb
|
Fix when specifying by filter_id or filter_name. Probably a botched merge.
|
2018-01-02 07:10:38 -08:00 |
|
Isaac Connor
|
1b1b93f811
|
use CakePHP-Enum-Behavior to add support for ENUMs to the Monitor model. This should fix #48
|
2018-01-01 14:43:02 -05:00 |
|
Isaac Connor
|
5a7ca38a1f
|
Merge branch 'storageareas' into tesla
|
2018-01-01 10:37:51 -08:00 |
|
Isaac Connor
|
109a24ed4d
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-01-01 10:37:24 -08:00 |
|
Isaac Connor
|
b62343fb2c
|
bump to 1.31.18
|
2018-01-01 13:19:30 -05:00 |
|
Isaac Connor
|
6c07347721
|
Fix Update DiskSpace Filter adding
|
2018-01-01 13:19:16 -05:00 |
|
Isaac Connor
|
1cd69c69b9
|
add defining ZM_SERVER_ID after loading config
|
2018-01-01 13:10:39 -05:00 |
|
Isaac Connor
|
edd5bd8874
|
create the Update DIskSpace filter if it doesn't exist
|
2018-01-01 12:44:09 -05:00 |
|
Isaac Connor
|
a79017b168
|
add a KEY to Events for EndTime and DiskSpace, since we are constantly selecting on those. Insert the Update DiskSpace filter on db creation.
|
2018-01-01 12:43:47 -05:00 |
|
Isaac Connor
|
7fcbd86ba0
|
fix auditing Medium directory structures
|
2017-12-29 15:29:57 -05:00 |
|
Isaac Connor
|
1044915ea3
|
Merge branch 'storageareas' into tesla
|
2017-12-23 12:58:58 -08:00 |
|
Isaac Connor
|
b219f76588
|
add togglebuttons to select all checbox
|
2017-12-23 12:58:48 -08:00 |
|
Isaac Connor
|
cc3b65b5fd
|
add default value for ServerId in Storage
|
2017-12-23 12:07:13 -08:00 |
|
Isaac Connor
|
74269fea73
|
make montagereview load event images from the server that the storage is located on
|
2017-12-22 12:33:30 -08:00 |
|
Isaac Connor
|
0fa11d7c36
|
make montagereview load event images from the server that the storage is located on
|
2017-12-22 12:32:45 -08:00 |
|
Isaac Connor
|
2c361de9d3
|
add Server Storage Areas
|
2017-12-22 11:39:43 -08:00 |
|
Isaac Connor
|
c6bf502ee7
|
only show each Storage area if there are less than 4.
|
2017-12-22 11:39:27 -08:00 |
|
Isaac Connor
|
0c350b8f41
|
add ServerId to Storage
|
2017-12-22 11:38:59 -08:00 |
|
Isaac Connor
|
0d7fff761c
|
upgrade find_all to take parameters
|
2017-12-22 11:38:42 -08:00 |