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 |
Andrew Bauer
|
3c6692d0d5
|
RPM specfile config change
fix logrotate script
|
2016-07-31 07:29:37 -05:00 |
Steve Gilvarry
|
97aa674274
|
Merge pull request #1559 from onlyjob/warn
reduce noise on "zmupdate.pl" invocation
|
2016-07-30 00:41:55 +10:00 |
Steve Gilvarry
|
24aeb91ef2
|
Merge pull request #1558 from onlyjob/spellcheck
spellcheck/codespell
|
2016-07-30 00:35:10 +10:00 |
Andrew Bauer
|
627b838fc4
|
Merge pull request #1565 from SteveGilvarry/avdict
Enable local and travis ccache
|
2016-07-29 09:34:11 -05:00 |
Steve Gilvarry
|
e0e49a2734
|
Merge pull request #1511 from TJC/feature/improve_docker
Improve Docker features
|
2016-07-30 00:30:49 +10:00 |
Steve Gilvarry
|
1a684b7709
|
Remove whitespace
|
2016-07-28 23:22:34 +10:00 |
Steve Gilvarry
|
71e3789bd0
|
Use av_dict_parse_string to split ffmpeg options, and remove creating strings to split them in next step for rtsp_transport
|
2016-07-28 23:15:01 +10:00 |
Steve Gilvarry
|
e7aed10f77
|
Merge pull request #1564 from pliablepixels/api-config-edit-example
Added example of configs API edit
|
2016-07-28 11:45:26 +10:00 |
Jon Gerdes
|
ee720c4561
|
Control script for Keekoon cameras. Tested with KK002.
|
2016-07-25 11:20:49 +01:00 |
Steve Gilvarry
|
0234e82396
|
Enable local and travis ccache
|
2016-07-24 09:26:10 +10:00 |
Pliable Pixels
|
dc916bba2c
|
case typo
|
2016-07-23 08:04:46 -04:00 |
Pliable Pixels
|
45a62dc8d8
|
Added example of configs API edit
|
2016-07-23 08:03:15 -04:00 |
Steve Gilvarry
|
14437189ca
|
Merge pull request #5 from knnniggett/patch-1
Update zoneminder.init
|
2016-07-18 21:04:51 +10:00 |
Dmitry Smirnov
|
aed3c3d29a
|
reduce noise on "zmupdate.pl" invocation
|
2016-07-14 00:43:32 +10:00 |
Dmitry Smirnov
|
f1acc52913
|
spellcheck/codespell
|
2016-07-14 00:30:39 +10:00 |
Andrew Bauer
|
59cc952cef
|
Merge pull request #1557 from ZoneMinder/fix_zmvideo
restore the behaviour where the generated file names are printed to stdout
|
2016-07-12 15:06:57 -05:00 |
Isaac Connor
|
85c0377280
|
When generating video, zmvideo.pl now returns the file path to the video file so don't append eventPath to it
|
2016-07-12 14:21:54 -04:00 |
Isaac Connor
|
6129732e61
|
restore the behaviour where the generated file names are printed to stdout.
|
2016-07-11 08:01:43 -04:00 |
Andy Bauer
|
19265b631a
|
custom banner text on web console
|
2016-07-09 13:11:30 -05:00 |
Andrew Bauer
|
477c02382b
|
Update CMakeLists.txt
Minor change for fedora rpmbuild
|
2016-07-06 19:06:28 -05:00 |
Steve Gilvarry
|
4873683f01
|
Merge pull request #1548 from knnniggett/libjpegturbo
fix jpeg buffer too small
|
2016-07-07 00:13:54 +10:00 |
Andrew Bauer
|
1f060f1938
|
Update zoneminder.init
Remove my initials
|
2016-07-05 11:35:08 -05:00 |
Andrew Bauer
|
257ce2b9a9
|
Merge pull request #1546 from SteveGilvarry/DocsUpdate
Updates to Ubuntu and Debian install guides
|
2016-07-05 09:30:45 -05:00 |
Steve Gilvarry
|
5811ba7eda
|
Swap to apt-get for debian
|
2016-07-05 23:10:03 +10:00 |
Steve Gilvarry
|
3a40f39d83
|
Fix 14.04 php.ini location and some more formatting issues
|
2016-07-05 07:52:37 +10:00 |
Steve Gilvarry
|
1f53377d8a
|
Implement suggested wait for MySQL start
|
2016-07-05 07:28:52 +10:00 |
Steve Gilvarry
|
219289ee20
|
Consistency changes
|
2016-07-05 07:15:01 +10:00 |
Andrew Bauer
|
75a98601ef
|
fix jpeg buffer too small
|
2016-07-03 14:59:05 -05:00 |
Andy Bauer
|
980d3f6e7f
|
rpm housecleaning, change the way jscalendar is installed
|
2016-07-03 11:34:35 -05:00 |
Steve Gilvarry
|
b2d1d688cc
|
Updates to Ubuntu and Debian install guides
|
2016-07-03 20:21:13 +10:00 |
Steve Gilvarry
|
3eccdcd3e2
|
Merge pull request #1524 from ZoneMinder/add_api_auth
if user=&pass= are in request, use them for auth in api
|
2016-06-29 21:47:44 +10:00 |
Steve Gilvarry
|
f3779d543c
|
Merge pull request #1521 from ZoneMinder/fix_zone_edit
update area when points move
|
2016-06-29 21:46:28 +10:00 |
Steve Gilvarry
|
bdd0790106
|
Merge pull request #1522 from ZoneMinder/video_session
Move the session start down to where it is actually needed so that we…
|
2016-06-29 21:45:12 +10:00 |
Andrew Bauer
|
f3583e5707
|
rpm specfile - add support for f24, remove support for f22
|
2016-06-24 15:39:57 -05:00 |
Andrew Bauer
|
97baf4ecd3
|
Merge pull request #1529 from ZoneMinder/fix_1526
connect needs a +1
|
2016-06-24 09:53:46 -05:00 |
Isaac Connor
|
b4aec41d3d
|
fix warnings and move User import up higher to where it needs to be
|
2016-06-21 09:09:58 -04:00 |