Isaac Connor
|
8dc7b3cee1
|
Merge branch 'master' into multi-server
|
2015-12-24 15:13:35 -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 |
SteveGilvarry
|
9eaab8c1ac
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2015-12-24 11:18:55 +11:00 |
Isaac Connor
|
dfa9a5a390
|
Add AUTOLOAD
|
2015-12-23 14:31:56 -05:00 |
|
Isaac Connor
|
9b6157a685
|
Merge branch 'newpointone' of isaac.internal.point-one.com:ZoneMinder.p1 into newpointone
|
2015-12-23 14:18:36 -05:00 |
|
Isaac Connor
|
1328492c64
|
fixes
|
2015-12-23 14:16:09 -05:00 |
|
Isaac Connor
|
fc56b14c4a
|
fixup sphinx theem
|
2015-12-23 14:06:29 -05:00 |
Isaac Connor
|
66a828b4d4
|
Merge pull request #1202 from SteveGilvarry/MissingRTDTheme
Missing rtd theme
|
2015-12-23 14:05:36 -05:00 |
|
Isaac Connor
|
33a3661958
|
cleanup, revent to openprint style objects
|
2015-12-23 14:03:40 -05:00 |
|
Isaac Connor
|
769b1f713c
|
Merge branch 'multi-server' into storageareas
Conflicts:
distros/ubuntu1204/apache.conf
|
2015-12-23 13:13:25 -05:00 |
|
Isaac Connor
|
f32344c647
|
Add output options to the concat cmd line
|
2015-12-23 09:33:33 -05:00 |
|
SteveGilvarry
|
abda4411e9
|
Revert to Default Theme, RTD will use their own and local builds default sphinx theme
|
2015-12-23 19:34:31 +11:00 |
|
SteveGilvarry
|
6e567e2878
|
Merge remote-tracking branch 'upstream/master'
|
2015-12-23 19:29:14 +11:00 |
|
SteveGilvarry
|
1ff2043774
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2015-12-23 19:24:08 +11: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
|
39bcb20dac
|
Skip directories that have non-digits in them
|
2015-12-22 12:59:37 -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
|
962d74f6a7
|
blah
|
2015-12-22 11:38:36 -05:00 |
|
Isaac Connor
|
d4a7258766
|
rough in Storage Area support
|
2015-12-22 11:10:17 -05:00 |
|
Isaac Connor
|
479e5df454
|
Add default events dir to dropdown
|
2015-12-22 10:53:39 -05:00 |
|
Isaac Connor
|
eccfced6d4
|
Merge branch 'multi-server' into newpointone
Conflicts:
distros/ubuntu1204/apache.conf
|
2015-12-22 09:54:13 -05:00 |
|
Isaac Connor
|
6df1425897
|
Slight update to allow the instantiation with no row or Id
|
2015-12-22 09:52:33 -05:00 |
|
Isaac Connor
|
1aa79c306b
|
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
|
2015-12-22 09:47:45 -05:00 |
|
Isaac Connor
|
64f1475058
|
blah
|
2015-12-22 09:47:35 -05:00 |
|
Isaac Connor
|
658e130d33
|
sync up to c39 version
|
2015-12-22 09:44:46 -05:00 |
|
Isaac Connor
|
82a9e9099f
|
Merge branch 'master' into multi-server
|
2015-12-22 09:40:50 -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
|
9d8455daea
|
fix size of filter popups
|
2015-12-21 15:18:05 -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
|
c03088e1b5
|
Just say Storage Area instead of Storage Id /Name. Same with Server
|
2015-12-21 14:32:42 -05:00 |