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

7263 Commits

Author SHA1 Message Date
Isaac Connor b36694ad8b Merge branch 'master' into storageareas 2016-08-12 10:04:52 -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 62a2ce56fb Merge Rotation/Orientation work, rename id to monitor_id in cameras and also make it an unsigned int since logically that is what it is. Also some fixups for bad rtsp h264 streams. 2016-08-10 12:19:53 -04:00
Isaac Connor 6b70ff964b fix path in cake api cleanup rules 2016-08-10 09:06:15 -04:00
Isaac Connor cc06a84a0e increase size of onvifprobe popup 2016-08-09 13:09:47 -04:00
Isaac Connor f9e7d3ccd8 fix error messages when an empty Monitor is instantiated 2016-08-09 10:43:51 -04:00
Isaac Connor 252ac5228a fix merge 2016-08-09 08:41:22 -04:00
Isaac Connor 3d65b0d2ad Merge branch 'master' into storageareas 2016-08-08 18:09:11 -04:00
Isaac Connor 2451768295 Merge branch 'master' into storageareas 2016-08-08 18:08:46 -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
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
Isaac Connor 99289e4713 Deprecate MAX_AGED_DIRS. Only check age if the fs event isn't in the db. This should work much better. 2016-08-04 12:22:33 -04:00
Isaac Connor ed5d6b37ee Merge ../ZoneMinder.Steve into storageareas 2016-08-02 13:57:52 -04:00
Isaac Connor 6a0c6cd4f2 Merge branch 'show_other_zones' into storageareas 2016-08-02 13:54:01 -04:00
Isaac Connor 62d3c66e8f Merge branch 'fix_1571' into storageareas 2016-08-02 13:53:32 -04:00
Isaac Connor 25d58f5192 quote the password 2016-08-02 13:22:44 -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
Isaac Connor 208337635a Merge branch 'master' into storageareas 2016-08-01 19:30:01 -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
Isaac Connor 45fadaf297 Use Monitor Id instead of Name when writing diag images. The name symlink might not exist 2016-07-26 13:08:32 -04:00
Isaac Connor 541f879b26 when time_base is not set in codec, set it to video_st->time_base 2016-07-25 21:42:50 -04:00
Isaac Connor c58c3efcf5 fix to 2016-07-25 15:34:53 -04:00
Isaac Connor b9bba6bde5 fix to 2016-07-25 15:32:57 -04:00
Isaac Connor 8db20a4543 change test for prevDTS >= dts to just prevDTS > dts 2016-07-25 13:23:44 -04: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
Isaac Connor b9a15d1465 fix missed to conversion 2016-07-23 13:37:00 -04: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
Isaac Connor 4c1c95e3a5 only include the state if canEdit(system) otherwise it gives an auth error 2016-07-22 16:04:42 -04:00
Isaac Connor 32f9b2755e add more height to the logout popup 2016-07-22 16:04:18 -04:00
Isaac Connor 8194876454 always put popup links in a, even if it is disabled 2016-07-22 16:03:57 -04:00