Isaac Connor
|
07af49511c
|
Load Storage Object so that we can print it's path
|
2015-12-24 15:33:46 -05:00 |
|
Isaac Connor
|
d943488475
|
add sub Storage
|
2015-12-24 15:32:30 -05:00 |
|
Isaac Connor
|
92ddd57942
|
include storage path when saying an event is too young to delete
|
2015-12-24 15:28:36 -05:00 |
|
Isaac Connor
|
ec0d6359a0
|
Merge branch 'newpointone' of isaac.internal.point-one.com:ZoneMinder.p1 into newpointone
|
2015-12-24 15:26:24 -05:00 |
|
Isaac Connor
|
177ed076a7
|
Make zmaudit only look at storage areas that are local
|
2015-12-24 15:25:56 -05:00 |
Isaac Connor
|
492550b5ef
|
Merge branch 'storageareas' into newpointone
Conflicts:
scripts/zmaudit.pl.in
|
2015-12-24 12:36:40 -05:00 |
|
Isaac Connor
|
c174d74987
|
Set MOnitorId and StorageID because the Event does not exist in the db
|
2015-12-24 12:36:16 -05:00 |
|
Isaac Connor
|
45987e92a9
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2015-12-24 12:34:55 -05:00 |
|
Isaac Connor
|
dfa9a5a390
|
Add AUTOLOAD
|
2015-12-23 14:31:56 -05:00 |
|
Isaac Connor
|
1328492c64
|
fixes
|
2015-12-23 14:16:09 -05:00 |
|
Isaac Connor
|
33a3661958
|
cleanup, revent to openprint style objects
|
2015-12-23 14:03:40 -05:00 |
|
Isaac Connor
|
f32344c647
|
Add output options to the concat cmd line
|
2015-12-23 09:33:33 -05:00 |
|
Isaac Connor
|
ac0425d14b
|
sort events before testing and deleting. Makes the output easier to grok
|
2015-12-22 15:08:38 -05:00 |
|
Isaac Connor
|
12a5621fb8
|
remove deleted event from fs_events hash so that we don't do it more than once
|
2015-12-22 14:31:24 -05:00 |
|
Isaac Connor
|
9c6041d55b
|
require Object
|
2015-12-22 13:13:45 -05:00 |
|
Isaac Connor
|
9ad22d9ee5
|
have to set the MonitorId on events that don't exist in db
|
2015-12-22 12:55:55 -05:00 |
|
Isaac Connor
|
3932ce692c
|
remove Exporter stuff
|
2015-12-22 12:55:36 -05:00 |
|
Isaac Connor
|
171fcf0dca
|
Use Object
|
2015-12-22 12:40:15 -05:00 |
|
Isaac Connor
|
bc4ce4f009
|
add Event require and document lgob behaviour and skip monitor dirs that have anything other than digits in them
|
2015-12-22 12:35:25 -05:00 |
|
Isaac Connor
|
26a92e5fed
|
require Object
|
2015-12-22 12:23:24 -05:00 |
|
Isaac Connor
|
7663955dc8
|
Merge branch 'storageareas' into newpointone
Conflicts:
scripts/zmaudit.pl.in
|
2015-12-22 12:14:29 -05:00 |
|
Isaac Connor
|
e2f8b1adc3
|
rough in generic object, using some similar syntax to dbix
|
2015-12-22 12:13:57 -05:00 |
|
Isaac Connor
|
06a5a6d879
|
rough in Storage area support
|
2015-12-22 11:50:29 -05:00 |
|
Isaac Connor
|
c9dc53b237
|
add in find and find_one
|
2015-12-22 11:50:08 -05:00 |
|
Isaac Connor
|
d4a7258766
|
rough in Storage Area support
|
2015-12-22 11:10:17 -05:00 |
|
Isaac Connor
|
12d87c252f
|
Don't do Videod = 0, since zmvideo might need them to concatting and they won't regenerated if they exist anyways. Or maybe we want to encode them at a higher framerate or something
|
2015-12-21 16:04:31 -05:00 |
|
Isaac Connor
|
239b494db8
|
Add M.Id as MonitorID
|
2015-12-21 15:31:33 -05:00 |
|
Isaac Connor
|
07260adb2a
|
append ZoneMinder::General to executeShellCommand
|
2015-12-21 15:30:05 -05:00 |
|
Isaac Connor
|
a4024ffebc
|
Must do E.*, not *
|
2015-12-21 15:29:27 -05:00 |
|
Isaac Connor
|
9d454bdc41
|
Add test for empty storage path
|
2015-12-21 15:29:18 -05:00 |
|
Isaac Connor
|
3e29aa56a3
|
Return default event path when no Id in Storage
|
2015-12-21 15:27:53 -05:00 |
|
Isaac Connor
|
16a1768511
|
fixes
|
2015-12-21 15:19:57 -05:00 |
|
Isaac Connor
|
70039b4c9d
|
require ZoneMinder::Event
|
2015-12-21 15:14:23 -05:00 |
|
Isaac Connor
|
ad038edab4
|
chdir
|
2015-12-21 14:49:00 -05:00 |
|
Isaac Connor
|
99f9145cdd
|
Fix SQL for loading events
|
2015-12-21 14:43:55 -05:00 |
|
Isaac Connor
|
892623ce63
|
Use * to grab all Event columns
|
2015-12-21 14:14:00 -05:00 |
|
Isaac Connor
|
0cb2d141a5
|
Fix dbh's
|
2015-12-21 13:16:07 -05:00 |
|
Isaac Connor
|
5683210e42
|
Add missing ;
|
2015-12-21 12:42:00 -05:00 |
|
Isaac Connor
|
ca07b951cb
|
Merge branch 'master' into newpointone
Conflicts:
docs/installationguide/ubuntu.rst
|
2015-12-21 12:41:25 -05:00 |
|
Isaac Connor
|
1039207f3a
|
Use Event->delete instead of our own delete code
|
2015-12-21 12:31:48 -05:00 |
|
Isaac Connor
|
2dfab0b408
|
Add delete and delete_files methods
|
2015-12-21 12:29:35 -05:00 |
|
Isaac Connor
|
872e5eff15
|
Merge branch 'multi-server' into newpointone
Conflicts:
web/lang/en_gb.php
web/skins/classic/views/filter.php
|
2015-12-21 11:35:16 -05:00 |
|
Isaac Connor
|
c2a857b498
|
Merge branch 'storageareas' into newpointone
|
2015-12-21 11:34:27 -05:00 |
|
Isaac Connor
|
3d00c3a50d
|
Make getDiskPercent take an optional path. When a Server is specified, add it to the Filter object so that we can use in getDiskPercent
|
2015-12-21 11:34:12 -05:00 |
|
Isaac Connor
|
710197a4f2
|
Merge branch 'filter_object' into storageareas
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/Storage.pm
scripts/zmfilter.pl.in
|
2015-12-21 11:27:48 -05:00 |
|
Isaac Connor
|
de83872671
|
id => Id
|
2015-12-21 11:25:38 -05:00 |
|
Isaac Connor
|
118dc12ad5
|
id => Id
|
2015-12-21 11:25:17 -05:00 |
|
Isaac Connor
|
f6d52e77b9
|
it is important to return the object from the constructor
|
2015-12-21 11:13:21 -05:00 |
|
Isaac Connor
|
9f02f4353c
|
it is important to return the object from the constructor
|
2015-12-21 11:13:01 -05:00 |
|
Isaac Connor
|
e7c337f9f3
|
fix namespace for dbh
|
2015-12-21 11:10:45 -05:00 |