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
|
d4a7258766
|
rough in Storage Area support
|
2015-12-22 11:10:17 -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
|
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
|
dfd7986c01
|
Merge branch 'master' into multi-server
Conflicts:
distros/debian_cmake/links
distros/ubuntu1504_cmake/zoneminder.postinst
|
2015-12-21 12:57:45 -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 |
|
Isaac Connor
|
ac88867fd2
|
fix namespace for dbh
|
2015-12-21 11:10:24 -05:00 |
|
Isaac Connor
|
8682b1af28
|
rough in a Storage class for the perl side of things
|
2015-12-21 11:03:53 -05:00 |
|
Isaac Connor
|
30353fbcf9
|
Add special case for Server Attr's because they are on the Monitor, not the event
|
2015-12-21 10:33:19 -05:00 |
|
Isaac Connor
|
5553760222
|
Add special cases for ServerId, ServerName, ServerHost to handle supplying the value of the host that the script is running on.
|
2015-12-21 10:23:37 -05:00 |
|
Isaac Connor
|
27597c3401
|
Merge branch 'master' into storageareas
Conflicts:
docs/installationguide/ubuntu.rst
|
2015-12-20 11:19:44 -05:00 |
arjunrc
|
27b1b37d5b
|
added opt_use_api
|
2015-12-19 17:43:36 -05:00 |
|
Isaac Connor
|
fd773858a6
|
Merge branch 'better_zmvideo' into newpointone
Conflicts:
scripts/zmfilter.pl.in
|
2015-12-18 14:17:45 -05:00 |
|
Isaac Connor
|
d035753971
|
Add the event class.
Also, remove the unused Storage class
|
2015-12-17 14:38:18 -05:00 |
|
Isaac Connor
|
b32ef7751b
|
implement the options to generate videos for events specified by a stored filter. Also implement ability to generate a concatenated video of all events specified by the filter.
|
2015-12-17 14:36:40 -05:00 |
|
Isaac Connor
|
c71d1e52ac
|
Fix
|
2015-12-17 13:13:04 -05:00 |
|
Isaac Connor
|
9db9d243f2
|
Fix
|
2015-12-17 13:12:37 -05:00 |
|
Isaac Connor
|
6f34022613
|
add find and find_one routines
|
2015-12-17 13:11:32 -05:00 |
|
Isaac Connor
|
7a979bb891
|
remove duplicated routines
|
2015-12-17 13:11:15 -05:00 |
|
Isaac Connor
|
64f65b55cc
|
use new Filter object to do some of the heavy lifting in zmfilter.pl
|
2015-12-17 12:57:14 -05:00 |
|
Isaac Connor
|
7365c053e6
|
Create a Filter object, out of some of the code in zmfilter.pl. The purpose is to be able to use it elsewhere like zmvideo.pl.
|
2015-12-17 12:56:40 -05:00 |
|
Isaac Connor
|
3121e5550c
|
Create a new class Storage and use it to handle figureing out where the event is actually stored.
|
2015-12-17 10:47:47 -05:00 |
Marco
|
62095b30d0
|
Added autostop to Down command
|
2015-12-16 16:58:20 +01:00 |
|
Isaac Connor
|
39e396eb6e
|
Merge branch 'master' into multi-server
|
2015-12-09 10:36:51 -05:00 |
Isaac Connor
|
ac23efebef
|
Merge pull request #1184 from ZoneMinder/TV-IP862_new_firmware
Add code to detect the change in REALM from older to newer firmware
|
2015-12-09 10:36:27 -05:00 |
|
Isaac Connor
|
7c298c58ed
|
Add code to detect the change in REALM from older to newer firmware
|
2015-12-08 16:20:38 -05:00 |
SteveGilvarry
|
5390605797
|
Add v to front of version string in version->parse to force conversion of decimal to dotted decimal versions, and change from ge to > to prevent reapplying current version
|
2015-12-03 10:23:19 +11:00 |
|
Isaac Connor
|
4d6c4355db
|
Merge branch 'master' into multi-server
|
2015-11-20 16:07:50 -05:00 |
|
Isaac Connor
|
d231ac4533
|
remove comment at end of line
|
2015-11-10 14:46:12 -05:00 |
Robin Daermann
|
49a89b75a8
|
More verbose error reporting
|
2015-11-09 16:15:53 +01:00 |
|
Robin Daermann
|
a942b22541
|
Add camera control module for Vivotek ePTZ protocol
|
2015-11-04 17:12:07 +01:00 |
|
Isaac Connor
|
44168ce05e
|
Merge branch 'master' into multi-server
|
2015-10-30 11:29:03 -04:00 |
Kyle Johnson
|
1cce60f6ec
|
Update version check URL
|
2015-10-23 11:45:32 -06:00 |
|
Isaac Connor
|
582cbe7567
|
Merge branch 'master' into multi-server
|
2015-10-15 09:01:19 -04:00 |
|
Isaac Connor
|
1367de292e
|
Fix error message when no ZM_SERVER_NAME or ZM_SERVER_HOST set
|
2015-10-07 08:57:50 -04:00 |
|
Isaac Connor
|
79d8e4b74f
|
Merge branch 'master' into fix_zmaudit
|
2015-10-06 09:30:32 -04:00 |
|
Isaac Connor
|
4a506368dc
|
Fix zmaudit sleeping and deleting Empty Events now that Frames also has an Id field
|
2015-10-06 09:30:10 -04:00 |
|
Pliable Pixels
|
e0e048fe7e
|
fixed version compare logic
|
2015-10-04 09:10:05 -04:00 |
|
Isaac Connor
|
aa108eff6e
|
Add Info line on startup saying which Server it is loading for
|
2015-10-02 12:33:09 +00:00 |
|
Isaac Connor
|
b0b69c5176
|
parse ZM_SERVER_HOST into ZM_SERVER
|
2015-10-02 12:32:41 +00:00 |
|
Isaac Connor
|
ea87ffe66f
|
merge master, bump version to 1.28.108
|
2015-10-01 11:52:49 -04:00 |
Bobby Billingsley
|
4eb4bdbfb5
|
Added control script for SunEyes SP-P1802SWPTZ
(http://www.amazon.com/SunEyes-SP-P1802SWPTZ-Wireless-Camera-1080P/dp/B00MOTBXK6)
|
2015-09-30 13:39:50 +02:00 |
|
Isaac Connor
|
e4b0e74f69
|
merge master
|
2015-09-24 10:01:27 -04:00 |
|
Isaac Connor
|
d754239a51
|
add debug statements for when LastWriteTime is not defined.
|
2015-09-24 09:57:58 -04:00 |
|
Isaac Connor
|
4c2545a5ca
|
Merge branch 'master' into multi-server
|
2015-09-17 15:39:26 -04:00 |
|
Isaac Connor
|
6e3c8bb380
|
revert
|
2015-09-14 15:15:44 -04:00 |
|
Isaac Connor
|
204f2b1e22
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2015-09-10 13:20:06 -04:00 |
|
Isaac Connor
|
31ad75dea9
|
only add -h hostname to mysql command if it is defined. This helps support local unix-socket mysql access
|
2015-09-10 13:04:52 -04:00 |
|
Pliable Pixels
|
73fa051ef8
|
Google recaptcha
|
2015-08-29 13:29:52 -04:00 |
|
Isaac Connor
|
9cdf8ec317
|
tabs to spaces
|
2015-08-27 11:13:44 -04:00 |
|
Isaac Connor
|
80a294da34
|
tabs to spaces
|
2015-08-27 11:10:13 -04:00 |
|
Isaac Connor
|
75919c9cd5
|
Merge branch 'master' into multi-server
Conflicts:
docs/installationguide/ubuntu.rst
misc/apache.conf.in
src/zm_monitor.cpp
|
2015-08-27 10:34:47 -04:00 |
|
Pliable Pixels
|
b4e9a0f0cf
|
whitespacing
|
2015-08-26 12:08:10 -04:00 |
|
Pliable Pixels
|
46bd7b492b
|
adds sanity checks to isActive and default states
|
2015-08-26 11:20:58 -04:00 |
|
Isaac Connor
|
41637278c9
|
merge master
|
2015-08-19 16:08:12 -04:00 |
|
Isaac Connor
|
5a363273a2
|
Merge branch 'master' into multi-server
Conflicts:
distros/ubuntu1504/changelog
|
2015-07-16 16:37:44 -04:00 |
Andrew Bauer
|
10adae3696
|
Merge pull request #941 from ZoneMinder/trigger_on_space
add space instead of + to handle old Axis cameras
|
2015-07-16 13:09:36 -05:00 |
|
Isaac Connor
|
ad23969982
|
add space instead of + to handle old Axis cameras
|
2015-07-16 13:06:15 -04:00 |
Dmitry Smirnov
|
c788d70b93
|
zmtrigger: POD documentation
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
|
2015-07-16 18:35:42 +10:00 |
|
Isaac Connor
|
ca9a391d62
|
Only load the monitors for our server
|
2015-07-15 16:24:01 -04:00 |
|
Isaac Connor
|
b8888b9d55
|
Only load triggers for our Server if ZM_SERVER_ID is set
|
2015-07-15 16:22:43 -04:00 |
|
Andrew Bauer
|
4e5ca2cead
|
Merge pull request #937 from ZoneMinder/better_logging
improve log
|
2015-07-15 15:21:08 -05:00 |
|
Andrew Bauer
|
104f375669
|
Merge pull request #936 from ZoneMinder/handle_serial_trigger_problem
add error handling on failure to open serial port
|
2015-07-15 15:20:56 -05:00 |
|
Isaac Connor
|
51af432468
|
Only load monitors for our server if ZM_SERVER_ID is specified
|
2015-07-15 16:18:05 -04:00 |
|
Isaac Connor
|
e318c3bf37
|
Add ServerId as a filter option
|
2015-07-15 16:12:35 -04:00 |
|
Isaac Connor
|
01518d6aa9
|
fix. without this zmc won't restart automatically
|
2015-07-15 16:08:02 -04:00 |
|
Isaac Connor
|
e4b3344a8c
|
improve log
|
2015-07-15 16:06:55 -04:00 |