Isaac Connor
|
7d346747d6
|
use Digest::SHA instead of Digest::SHA1. API appears to be the same
|
2016-03-02 10:18:58 -05:00 |
Isaac Connor
|
0a5d7a11b2
|
Merge pull request #1316 from knnniggett/multiservermsg
change multi-server error message text
|
2016-03-01 12:25:09 -05:00 |
Andy Bauer
|
466f2b2ae3
|
change multi-server error message text
|
2016-03-01 11:12:54 -06:00 |
Isaac Connor
|
838da183e0
|
Merge pull request #1314 from knnniggett/zm.conf
add comment/warning for ZM_SERVER_HOST
|
2016-03-01 09:55:06 -05:00 |
Andy Bauer
|
1c9633f1bd
|
add comment/warning for ZM_SERVER_HOST
|
2016-03-01 08:43:36 -06:00 |
Kyle Johnson
|
bc89b95470
|
Merge pull request #1292 from ZoneMinder/telemetry
Telemetry Data
|
2016-03-01 07:17:16 -07:00 |
Andy Bauer
|
b7259b973a
|
first formatting pass
|
2016-02-28 12:54:21 -06:00 |
Andy Bauer
|
72c8ae3735
|
Remove package building instructions from README.md
|
2016-02-28 12:32:45 -06:00 |
Andy Bauer
|
35d013136f
|
add redhat instructions to readthe docs
|
2016-02-28 12:27:04 -06:00 |
Andrew Bauer
|
6aabfa71f5
|
Merge pull request #1311 from pliablepixels/image-php-typo
typo in function name
|
2016-02-27 12:56:00 -06:00 |
arjunrc
|
84801fcb86
|
typo in function name
|
2016-02-27 13:06:33 -05:00 |
Andrew Bauer
|
c138914edd
|
Merge pull request #1251 from tikismoke/patch-1
Update gettingstarted.rst
|
2016-02-26 07:03:36 -06:00 |
SteveGilvarry
|
d40bf89b17
|
Remove Phone BW settings used with mobile skin
|
2016-02-26 22:43:37 +11:00 |
SteveGilvarry
|
0277a66700
|
Remove eyezm from distros and Cmake.
Conflicts:
distros/debian8/control
|
2016-02-26 22:41:27 +11:00 |
SteveGilvarry
|
4837585601
|
Deleted eyezm options documentation and references to it in other areas of documentation. Removed zmstreamer.cpp.
Conflicts:
src/zmstreamer.cpp
|
2016-02-26 22:37:23 +11:00 |
SteveGilvarry
|
6b169af655
|
Remove eyezm configdata
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
|
2016-02-26 22:35:24 +11:00 |
SteveGilvarry
|
7c7d7b245c
|
Remove the XML skin folder
|
2016-02-26 22:30:20 +11:00 |
SteveGilvarry
|
e6d57da0d4
|
Remove the mobile skin folder
|
2016-02-26 22:29:41 +11:00 |
SteveGilvarry
|
e4a72f7653
|
Remove more Autotools files and edit travis to no longer build Autotools
Conflicts:
.travis.yml
bootstrap.sh
configure.ac
|
2016-02-26 22:23:19 +11:00 |
SteveGilvarry
|
5ff427d9e9
|
Removed Autotools Makefile.am
Conflicts:
Makefile.am
misc/Makefile.am
src/Makefile.am
web/includes/Makefile.am
web/js/Makefile.am
web/skins/classic/css/classic/views/Makefile.am
web/skins/classic/css/flat/views/Makefile.am
web/skins/classic/views/Makefile.am
web/skins/classic/views/js/Makefile.am
|
2016-02-26 22:19:02 +11:00 |
Andrew Bauer
|
f0a4ef8b70
|
Merge pull request #1306 from SteveGilvarry/cake2.8
Update to CakePHP 2.8.0 copy in lib folder
|
2016-02-25 15:09:15 -06:00 |
Isaac Connor
|
1ff4c65339
|
Merge pull request #1305 from knnniggett/netcat
add Netcat ONVIF compatible ptz control
|
2016-02-25 09:23:57 -05:00 |
SteveGilvarry
|
b294f210dc
|
Update to CakePHP 2.8.0 copy in lib folder
|
2016-02-25 23:25:24 +11:00 |
SteveGilvarry
|
b53e9e7dad
|
ffmpeg 3.0 too many 0000s
|
2016-02-25 22:38:19 +11:00 |
SteveGilvarry
|
4fd984f30b
|
ffmpeg 3.0.0 build
|
2016-02-25 22:32:18 +11:00 |
Andy Bauer
|
7a42a8c3f9
|
add Netcat ONVIF compatible ptz control
|
2016-02-24 10:15:59 -06:00 |
Isaac Connor
|
28e94764d7
|
Merge pull request #1304 from knnniggett/debianscript
use debian control file to auto-install deps
|
2016-02-22 19:20:06 -05:00 |
Andrew Bauer
|
2fc1fc4380
|
use debian control file to auto-install deps
|
2016-02-22 09:18:46 -06:00 |
Andrew Bauer
|
918407bcae
|
Merge pull request #1248 from pliablepixels/documentation
updated documentation for ubuntu
|
2016-02-22 09:05:53 -06:00 |
Isaac Connor
|
b653f74b09
|
Merge pull request #1301 from kunkku/event-memcpy-overlap
zm_event: fix overlap in memcpy buffers
|
2016-02-20 20:43:24 -05:00 |
Kaarle Ritvanen
|
5b047dc74b
|
zm_event: fix overlap in memcpy buffers
|
2016-02-20 23:58:36 +02:00 |
Andrew Bauer
|
82a130bf58
|
Merge pull request #1300 from ZoneMinder/zm_trigger_improvements
Zm trigger improvements
|
2016-02-19 11:50:54 -06:00 |
Isaac Connor
|
826a22a2a8
|
add missing .
|
2016-02-19 11:07:06 -05:00 |
Isaac Connor
|
3b07b56400
|
Use more descriptive names for the channels
|
2016-02-19 11:05:55 -05:00 |
Isaac Connor
|
64c5b64068
|
Log error before croaking and include port# in the error message
|
2016-02-19 11:04:02 -05:00 |
Isaac Connor
|
327a01cb20
|
Log error before croaking and show path to file in the error message
|
2016-02-19 10:59:40 -05:00 |
Isaac Connor
|
3a512f87a5
|
Log the reason for croaking before croaking.
|
2016-02-19 10:57:52 -05:00 |
Isaac Connor
|
46efe9c1e0
|
Merge pull request #1298 from onlyjob/jquery
Upgrade bundled jQuery (Closes: #1263)
|
2016-02-17 19:54:21 -05:00 |
Dmitry Smirnov
|
632e9c8e53
|
Upgrade bundled jQuery (Closes: #1263)
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
|
2016-02-18 00:28:30 +11:00 |
Kyle Johnson
|
f4d51d01a9
|
Merge pull request #1273 from knnniggett/enableonvif
By default, enable ONVIF discovery support
|
2016-02-16 12:53:05 -07:00 |
Andrew Bauer
|
5f771327be
|
Merge pull request #1295 from ZoneMinder/zmdc_better_error_messages
include the sock path in the error message and output an error on fai…
|
2016-02-16 10:04:11 -06:00 |
Isaac Connor
|
d1ba45c56a
|
include the sock path in the error message and output an error on failure to open pid file
|
2016-02-16 10:02:30 -05:00 |
Isaac Connor
|
26f5f12190
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2016-02-16 09:29:57 -05:00 |
Isaac Connor
|
172a4c6bd4
|
Add montagereview.php to autotools build.
|
2016-02-16 09:29:49 -05:00 |
Isaac Connor
|
6f221ed269
|
Merge pull request #1278 from schrorg/bigfont-license
Added script to generate src/zm_bigfont.h
|
2016-02-16 09:17:54 -05:00 |
Isaac Connor
|
e2f88f6bb6
|
Merge pull request #1293 from kunkku/memcpy-overlap
zm_monitor: fix overlap in memcpy buffers
|
2016-02-16 09:16:04 -05:00 |
Isaac Connor
|
b3f5c10591
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2016-02-16 08:59:56 -05:00 |
Kaarle Ritvanen
|
6332f28c53
|
zm_monitor: fix overlap in memcpy buffers
behavior undefined by POSIX and causes a crash with FORTIFY_SOURCE
|
2016-02-16 11:47:49 +02:00 |
Andrew Bauer
|
8a2dc2897d
|
Perl DateTime dependency not needed
|
2016-02-15 14:11:58 -06:00 |
Andrew Bauer
|
041585b4a2
|
Change Info to Debug
|
2016-02-15 14:03:16 -06:00 |