Dmitry Smirnov
|
5bcc414038
|
codespell: misc. spelling corrections
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
|
2016-02-08 20:41:36 +11:00 |
Andrew Bauer
|
f607e3a6fa
|
zmtelemetry - the typo of my typo is my friend
|
2016-02-06 14:50:02 -06:00 |
Andrew Bauer
|
4ad31695ba
|
fix typo in cmakefile
|
2016-02-06 14:25:00 -06:00 |
Andrew Bauer
|
e0ee05e05c
|
add zmtelemetry to cmake
|
2016-02-06 14:10:42 -06:00 |
Andrew Bauer
|
8a537029ea
|
Initial commit to add zmtelemetry.pl
|
2016-02-06 14:08:28 -06:00 |
Isaac Connor
|
9ace6c518d
|
Merge pull request #1225 from Simpler1/profiles
Added profiles for Wanscam-HW0025 and IPCC-7210W
|
2016-02-04 11:55:48 -05:00 |
Isaac Connor
|
d3755611c5
|
Merge pull request #1247 from bodegard/master
Corrected DB update version comments, fixed typos, and skin font modification
|
2016-02-04 11:54:02 -05:00 |
Isaac Connor
|
52e16dbdd0
|
Merge pull request #1249 from knnniggett/pelcop
Fix PelcoP checksum calculation
|
2016-02-04 11:52:51 -05:00 |
Andrew Bauer
|
748754a213
|
Merge pull request #1209 from adamreiser/StrictKeyChecking
Strict key checking
|
2016-02-04 10:07:19 -06:00 |
Andy Bauer
|
fa168027b3
|
Fix PelcoP checksum calculation
|
2016-01-24 07:45:04 -06:00 |
Andrew Bauer
|
50b113cd02
|
Merge pull request #1189 from marcolino7/master
PTZ - Added autostop to Down command on FI8918W
|
2016-01-24 07:40:30 -06:00 |
Brandon Odegard
|
9c72579c2e
|
Corrected typo in function info
|
2016-01-22 12:12:39 -06:00 |
Andy Bauer
|
66c66106f5
|
Process off+time delay condition
|
2016-01-15 20:31:31 -06:00 |
Isaac Connor
|
f0486e5b5e
|
fix dumb mistake, undefing ZM_SERVBER_ID after setting it.
|
2016-01-04 22:07:07 -05:00 |
Simpler1
|
1432c6ae1f
|
Added profiles for Wanscam-HW0025 and IPCC-7210W
|
2016-01-04 12:30:46 -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 |
Adam Reiser
|
659b3f37f5
|
Stylistic fix
|
2015-12-29 21:08:24 -08:00 |
Adam Reiser
|
28bf4dfe7b
|
Add option for strict host key checking
|
2015-12-29 16:34:11 -08:00 |
SteveGilvarry
|
e089805276
|
Merge remote-tracking branch 'upstream/master' into feature-plugins
Conflicts:
CMakeLists.txt
configure.ac
|
2015-12-28 15:24:28 +11: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 |
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 |
SteveGilvarry
|
ea9457d7f5
|
Merge remote-tracking branch 'upstream/master' into feature-plugins
|
2015-11-14 01:18:45 +11: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 |
SteveGilvarry
|
a700cbffdb
|
Merge remote-tracking branch 'upstream/master' into feature-plugins
Conflicts:
CMakeLists.txt
configure.ac
src/zm_monitor.cpp
src/zm_monitor.h
web/lang/big5_big5.php
web/lang/cn_zh.php
web/lang/cs_cz.php
web/lang/de_de.php
web/lang/dk_dk.php
web/lang/en_gb.php
web/lang/es_ar.php
web/lang/es_es.php
web/lang/et_ee.php
web/lang/fr_fr.php
web/lang/he_il.php
web/lang/hu_hu.php
web/lang/it_it.php
web/lang/ja_jp.php
web/lang/nl_nl.php
web/lang/pl_pl.php
web/lang/pt_br.php
web/lang/ro_ro.php
web/lang/ru_ru.php
web/lang/se_se.php
web/skins/classic/views/monitor.php
|
2015-11-08 21:06:21 +11: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 |
Emmanuel Papin
|
b294569147
|
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support
Merging conflicts fixed in files:
CMakeLists.txt
configure.ac
distros/debian_cmake/control
src/zm_monitor.h
web/lang/de_de.php
web/skins/classic/views/monitor.php
|
2015-07-20 16:49:04 +02: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 |
Isaac Connor
|
cf3f160783
|
add error handling on failure to open serial port
|
2015-07-15 16:02:02 -04:00 |
Isaac Connor
|
4630bad24b
|
add http to control url if it isn't present
|
2015-07-15 15:59:21 -04:00 |
Andy Bauer
|
561bf43721
|
fix pod2man generation for out-of-source builds
|
2015-07-09 19:33:06 -05:00 |
Isaac Connor
|
58448adb51
|
Merge pull request #896 from knnniggett/pod2man
Generate man pages for perl scripts & C Binaries in the bin folder
|
2015-07-03 11:40:24 -04:00 |
Andy Bauer
|
1aebbec4e8
|
Merge branch '898-isRunning-States' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-898-isRunning-States
Conflicts:
db/zm_create.sql.in
db/zm_update-1.28.99.sql
|
2015-06-27 16:32:32 -05:00 |
Andrew Bauer
|
b867ee4c4c
|
Merge pull request #891 from ZoneMinder/zmwatch_cleanup2
Zmwatch cleanup2
|
2015-06-23 08:36:42 -05:00 |
Andrew Bauer
|
30c7ab697c
|
Merge pull request #847 from ZoneMinder/faster_shutdown
faster shutdown
|
2015-06-23 08:19:25 -05:00 |
Isaac Connor
|
e4106e34a1
|
put back build replacements, don't know how I lost those
|
2015-06-22 13:56:27 -04:00 |
Andrew Bauer
|
91e7281695
|
Merge pull request #890 from ZoneMinder/zmwatch_cleanup1
reverse the if statement to reduce indenting
|
2015-06-22 12:53:06 -05:00 |
Isaac Connor
|
612e96bbfe
|
fix problem causing processes to not be restarted. Also, tabs to spaces
|
2015-06-22 13:37:26 -04:00 |
Pliable Pixels
|
e758d9bf7c
|
Modified to handle setting isActive for custom states
|
2015-06-21 09:30:46 -04:00 |
Andrew Bauer
|
fa835359a1
|
Add install target for C binary man pages
|
2015-06-20 17:33:13 -05:00 |
Andrew Bauer
|
13b9921680
|
Modify zmsystemctl pod documentation
|
2015-06-20 16:13:40 -05:00 |
Andrew Bauer
|
fd239f6545
|
Generate man pages for perl scripts in the bin folder
|
2015-06-20 15:22:11 -05:00 |
Pliable Pixels
|
f8cc27e224
|
Protocol for 8918W
|
2015-06-19 15:45:50 -04:00 |
Pliable Pixels
|
991291ce67
|
declared so perl does not complain of globals
|
2015-06-19 14:12:08 -04:00 |
Pliable Pixels
|
39ee845ff0
|
Updated 9831W foscam script
|
2015-06-19 12:58:40 -04:00 |
Isaac Connor
|
1f87a696cf
|
improve debugging for analysis check and restart if can't read shared data
|
2015-06-19 11:07:20 -04:00 |
Isaac Connor
|
3be4a0aa11
|
re-enable restarting capture process if mem invalid
|
2015-06-19 09:04:19 -04:00 |
Isaac Connor
|
a9175705c1
|
reverse the if statement to reduce indenting
|
2015-06-19 08:59:49 -04:00 |
Emmanuel Papin
|
a32a0f2752
|
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support
|
2015-06-08 19:42:57 +02:00 |
Emmanuel Papin
|
3f20a08d16
|
Add cmake support
|
2015-05-31 02:37:58 +02:00 |
Emmanuel Papin
|
eff56664c3
|
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support
Conflicts:
web/lang/de_de.php
web/skins/classic/views/monitor.php
web/skins/classic/views/plugin.php
|
2015-05-28 23:43:13 +02:00 |