Emmanuel Papin
|
d0d72672a7
|
Fix sql files
|
2015-07-22 21:49:06 +02:00 |
|
Emmanuel Papin
|
132e0a1798
|
Add analysis fps paramter to monitors
|
2015-07-22 21:38:35 +02:00 |
|
Emmanuel Papin
|
a6b7c6e99f
|
Add analysis interval parameter to monitors
|
2015-07-21 22:52:52 +02:00 |
Andrew Bauer
|
a6a33fa77f
|
Merge pull request #955 from pliablepixels/953-configs-API-fix
Fixed Configs API to return all values
|
2015-07-21 12:42:41 -05:00 |
Pliable Pixels
|
e332fc36a9
|
Fixed Configs API to return all values
|
2015-07-21 13:28:37 -04:00 |
Isaac Connor
|
9f1d91b655
|
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
|
2015-07-20 16:28:59 -04:00 |
|
Isaac Connor
|
dfd3d2c4cd
|
use std::string to build sql for loading monitors. ALso use new ZmDbFetch functions
|
2015-07-20 16:28:21 -04:00 |
|
Andrew Bauer
|
500b560884
|
Merge pull request #952 from schrorg/583-correct-de_de-encoding
Change encoding of german language file to UTF-8
|
2015-07-20 08:07:30 -05:00 |
|
Isaac Connor
|
441a82e611
|
fixup loading SERVER_ID from SERVER_NAME
|
2015-07-17 10:12:44 -04:00 |
|
Isaac Connor
|
02ee745167
|
parameter to defined should be in quotes
|
2015-07-17 10:09:22 -04:00 |
|
Andrew Bauer
|
712d3959d2
|
Merge pull request #951 from schrorg/950-correct-ffmpeg-source
Show correct part of URL (hostname) for ffmpeg sources in console
|
2015-07-17 08:37:17 -05:00 |
root
|
a9df82256b
|
Change encoding of web/lang/de_de.php from ISO-8859-1 to UTF-8
|
2015-07-17 14:24:46 +02:00 |
|
root
|
560a4cccbe
|
Show correct part of URL (hostname) for ffmpeg sources in console
|
2015-07-17 13:59:40 +02:00 |
|
Isaac Connor
|
3c821f3686
|
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
|
2015-07-16 16:53:33 -04:00 |
|
Isaac Connor
|
633a6e2df9
|
use zmDbFetchOne more
|
2015-07-16 16:53:30 -04:00 |
|
Isaac Connor
|
77a332f61a
|
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
|
2015-07-16 16:44:31 -04:00 |
|
Isaac Connor
|
60410c98d6
|
use new db functions in zm_config.cpp
|
2015-07-16 16:44:09 -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 |
|
Andrew Bauer
|
e1a30cf4e5
|
Merge pull request #942 from ZoneMinder/add_db_functions
add some utility db functions
|
2015-07-16 13:08:49 -05:00 |
|
Andrew Bauer
|
fffea54ed1
|
Merge pull request #944 from ZoneMinder/php-gd
add php-gd to list of dependencies for debian and ubuntu builds
|
2015-07-16 13:08:33 -05:00 |
|
Isaac Connor
|
424b7d50bd
|
php-gd should isntead be php5-gd
|
2015-07-16 13:59:06 -04:00 |
Isaac Connor
|
ef19d5df8a
|
Merge pull request #943 from knnniggett/php-gd
rpm packaging - require php-gd
|
2015-07-16 13:40:38 -04:00 |
|
Isaac Connor
|
e3042c59a5
|
add php-gd to list of dependencies for debian and ubuntu builds
|
2015-07-16 13:40:16 -04:00 |
Andrew Bauer
|
eb5bb641d6
|
rpm packaging - require php-gd
|
2015-07-16 12:15:24 -05:00 |
|
Isaac Connor
|
ad23969982
|
add space instead of + to handle old Axis cameras
|
2015-07-16 13:06:15 -04:00 |
|
Isaac Connor
|
48fa0c3d42
|
add some utility db functions
|
2015-07-16 13:04:28 -04:00 |
|
Isaac Connor
|
ff9b86fc23
|
Merge branch 'master' into multi-server
Conflicts:
distros/ubuntu1504/changelog
|
2015-07-16 10:19:25 -04:00 |
|
Isaac Connor
|
e4a8aa8f0b
|
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
|
2015-07-16 10:06:37 -04:00 |
|
Isaac Connor
|
4ed248e5a5
|
Add SERVER_NAME and SERVER_ID loading to config
|
2015-07-16 10:05:21 -04:00 |
|
Isaac Connor
|
50b333fb28
|
Add SERVER_NAME and SERVER_ID loading to config
|
2015-07-16 10:04:56 -04:00 |
|
Andrew Bauer
|
a53ee60590
|
Merge pull request #938 from onlyjob/zmtrigger
zmtrigger: POD documentation
|
2015-07-16 06:47:59 -05: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
|
cc5ca259ed
|
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
|
2015-07-15 16:47:36 -04:00 |
|
Isaac Connor
|
3481368574
|
given SERVER_NAME populate SERVER_ID and vice versa
|
2015-07-15 16:44:16 -04: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 |
|
Isaac Connor
|
09efee3be3
|
limit man install to 8 to not conflict with man pages in libzoneminder-perl
|
2015-07-15 15:46:53 -04:00 |
|
Isaac Connor
|
2f3779473b
|
release SNAPSHOT2015071501
|
2015-07-15 15:45:02 -04:00 |
|
Isaac Connor
|
4f0466739f
|
remove generated .debhelpers
|
2015-07-15 12:04:00 -04:00 |
|
Isaac Connor
|
7a08127d21
|
release snapshot 2015071501
|
2015-07-15 12:02:20 -04:00 |
|
Andrew Bauer
|
a9035221cb
|
Merge pull request #934 from ZoneMinder/fix_utf
fix utf8 ' characters
|
2015-07-15 10:30:28 -05:00 |