ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,072 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

6072 Commits

Author SHA1 Message Date
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
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