ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,380 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

889 Commits

Author SHA1 Message Date
Isaac Connor f0486e5b5e fix dumb mistake, undefing ZM_SERVBER_ID after setting it. 2016-01-04 22:07:07 -05:00
Andrew Bauer fc5de5a4f3 Merge pull request #1215 from ZoneMinder/multi-server 
Multi server
 2016-01-01 21:50:31 -06:00
Isaac Connor 54bff42fa0 Remove warnings when no server set 2016-01-01 21:27:30 -05:00
Andrew Bauer c827f55580 Merge pull request #1040 from ZoneMinder/multi-server 
Multi server
 2016-01-01 09:36:04 -06:00
Isaac Connor 39bcb20dac Skip directories that have non-digits in them 2015-12-22 12:59:37 -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 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 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 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
arjunrc 27b1b37d5b added opt_use_api 2015-12-19 17:43:36 -05: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
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