mdrush
|
16a9de3b1b
|
added missing brackets
|
2016-08-27 15:39:04 -07:00 |
mdrush
|
2d161924c0
|
changed error message to debug message
|
2016-08-27 15:34:10 -07:00 |
mdrush
|
52255e594e
|
improved style, added fallback when ssmtp can't be found
|
2016-08-27 15:18:00 -07:00 |
mdrush
|
574390730a
|
added missing ssmtp support in sendMessage
|
2016-08-27 13:10:39 -07:00 |
David Sabbath Grits
|
2d44531d1f
|
add some more translation
|
2016-08-25 14:24:14 +02:00 |
Isaac Connor
|
69461a7c1b
|
Merge pull request #1579 from peruchi/master
Update file sock for multiserver
|
2016-08-17 10:23:01 -04:00 |
Andrew Bauer
|
7d48b2c6c5
|
Merge pull request #1577 from ZoneMinder/fix_zmaControl
fix error in calling zmaControl
|
2016-08-17 08:36:51 -05:00 |
peruchi
|
50f55af68f
|
Update zmdc.pl.in
|
2016-08-17 10:36:00 -03:00 |
peruchi
|
7b389a79a6
|
Update zmdc.pl.in
|
2016-08-17 09:45:30 -03:00 |
Isaac Connor
|
cc696cbbc6
|
Merge pull request #1594 from vikaskedia/patch-2
Update README.md
|
2016-08-16 11:42:26 -04:00 |
Andy Bauer
|
4895942308
|
update fedora rpm readme
|
2016-08-16 09:49:45 -05:00 |
Andrew Bauer
|
ea34f3d69a
|
Merge pull request #1576 from ZoneMinder/show_other_zones
include polygons for the other zones.
|
2016-08-15 20:36:16 -05:00 |
Isaac Connor
|
872adc1c62
|
Merge pull request #1578 from erelson/patch-2
Minor API doc error fixes
|
2016-08-15 10:02:57 -04:00 |
Vikas Kedia
|
31ca095445
|
Update README.md
|
2016-08-15 04:39:04 -07:00 |
Andrew Bauer
|
cd55c8b2fb
|
Merge pull request #1585 from ZoneMinder/copy_av_dict_parse_string_from_ffmpeg
Fixes #1584. I've just copied the relevant functions from ffmpeg sour…
|
2016-08-14 11:02:48 -05:00 |
Andrew Bauer
|
31cb86046c
|
Merge pull request #1592 from connortechnology/fix_analysis_frame
Fix analysis frame
|
2016-08-14 10:54:46 -05:00 |
Isaac Connor
|
a0bc30d3fe
|
fix the order of analyse/capture being passed
|
2016-08-12 15:40:47 -04:00 |
Isaac Connor
|
240336e3ec
|
silence error when Event has no StorageId set
|
2016-08-12 15:20:21 -04:00 |
Isaac Connor
|
9106675842
|
pass capture or analyse to getImageSrc
|
2016-08-12 15:17:13 -04:00 |
Isaac Connor
|
bcb7dd1ba4
|
take optional show= to specify the analyse image or the capture image
|
2016-08-12 15:16:05 -04:00 |
Isaac Connor
|
3dadcc8d32
|
add ability to pass show=capture or show=analyse to getImageSrc
|
2016-08-12 15:14:51 -04:00 |
Isaac Connor
|
bc4923b555
|
use instead of for the frame object and pass to getImageSrc which expects an array
|
2016-08-12 13:50:18 -04:00 |
Isaac Connor
|
3dc2170a69
|
Merge ../ZoneMinder.master
|
2016-08-12 12:48:34 -04:00 |
Isaac Connor
|
1058796374
|
add an echo to tell us that updating is done and we are trying to start.
|
2016-08-12 10:04:35 -04:00 |
Isaac Connor
|
bdcc53d309
|
add an echo to tell us that updating is done and we are trying to start.
|
2016-08-12 10:04:10 -04:00 |
Isaac Connor
|
c1d2407ed3
|
add an echo to tell us that updating is done and we are trying to start.
|
2016-08-12 10:02:15 -04:00 |
Isaac Connor
|
d6dfe3dc72
|
Merge pull request #3 from ZoneMinder/master
updates from ZoneMinder/ZoneMinder
|
2016-08-10 10:19:24 -04:00 |
Andy Bauer
|
f6a46e4028
|
don't build the onvif libraries in travis
|
2016-08-10 08:35:49 -05:00 |
Isaac Connor
|
6b70ff964b
|
fix path in cake api cleanup rules
|
2016-08-10 09:06:15 -04:00 |
Isaac Connor
|
3f713df826
|
bump libavutil version check as per @SteveGilvarry
|
2016-08-09 13:14:10 -04:00 |
Isaac Connor
|
0b92b950e2
|
Merge branch 'master' into copy_av_dict_parse_string_from_ffmpeg
|
2016-08-09 13:10:53 -04:00 |
Isaac Connor
|
fbc0086fcc
|
get the other dbPass use and quote it. Slight visual code style cleanup.
|
2016-08-08 16:52:09 -04:00 |
Isaac Connor
|
177c2c741b
|
Fixes #1584. I've just copied the relevant functions from ffmpeg source. Please review carefully before merging.
|
2016-08-07 10:55:19 -04:00 |
Andrew Bauer
|
3a804a0d0c
|
Update definemonitor.rst
|
2016-08-06 16:34:00 -05:00 |
Andrew Bauer
|
24d471f452
|
Merge pull request #1503 from ZoneMinder/id_on_console
add option to show monitor ID on console
|
2016-08-06 10:59:03 -05:00 |
Isaac Connor
|
9d65ef3bb2
|
Merge pull request #1556 from knnniggett/banner
custom banner text on web console
|
2016-08-06 10:59:53 -04:00 |
Andrew Bauer
|
f67394ffb7
|
Merge pull request #1567 from SteveGilvarry/avdictparsestring
Use av_dict_parse_string to create AVDictionary of options
|
2016-08-06 09:50:49 -05:00 |
Andrew Bauer
|
528230c92d
|
Merge pull request #1581 from ZoneMinder/fix_1571
quote the password
|
2016-08-06 09:37:11 -05:00 |
Andrew Bauer
|
382896dc0d
|
Merge pull request #1498 from josh4trunks/mysql_port_socket
Add support for MySQL Port / Unix Socket
|
2016-08-06 09:32:32 -05:00 |
Andrew Bauer
|
6c8001f362
|
Merge pull request #1549 from SteveGilvarry/initd_sql_wait
Implement suggested wait for MySQL start
|
2016-08-06 09:14:58 -05:00 |
Andrew Bauer
|
e6b1cf90df
|
Merge pull request #1566 from gerdesj/Keekoon
Control script for Keekoon cameras.
|
2016-08-06 09:09:40 -05:00 |
Zhuykov Kirill
|
52ba284357
|
fixed wrong doc root
|
2016-08-06 16:20:30 +03:00 |
peruchi
|
0d85d3e60d
|
Update zmdc.pl.in
|
2016-08-02 16:26:27 -03:00 |
peruchi
|
0238656542
|
Update file sock for multiserver
Added the ZM_SERVER_ID in the creation the sock for not to give conflict in mode multi server.
|
2016-08-02 15:36:40 -03:00 |
Isaac Connor
|
25d58f5192
|
quote the password
|
2016-08-02 13:22:44 -04:00 |
Eric Relson
|
b822deeb8c
|
Minor API doc error fixes
|
2016-08-02 10:08:08 -07:00 |
Isaac Connor
|
aa78b403a1
|
zmaControl can take an id #, so need to move the check for local server test down.
|
2016-08-02 12:33:41 -04:00 |
Isaac Connor
|
8093470a2e
|
make only the editing polygon have a border. Set default for Type when creating a new zone
|
2016-08-02 12:19:55 -04:00 |
Isaac Connor
|
b522371080
|
include polygons for the other zones.
|
2016-08-02 12:02:07 -04:00 |
Andrew Bauer
|
004b651d61
|
RPM specfile config change
use make macros, rather than hard coded values
|
2016-07-31 15:06:39 -05:00 |