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

7514 Commits

Author SHA1 Message Date
Steve Gilvarry e0a34bce8a Merge pull request #1582 from SteveGilvarry/feature-h264-videostorage 
Merge Master to feature-h264-videostorage
 2016-08-05 23:18:42 +10:00
Steve Gilvarry ea1ae815f1 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-08-05 23:03:06 +10: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
Steve Gilvarry cf84dde613 segfault cause I think I am missing the queue 2016-08-03 23:48:33 +10: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 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
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
Steve Gilvarry 0425c68d59 Merge remote-tracking branch 'upstream/feature-h264-videostorage' into monitor_packetqueue 2016-08-02 20:17:35 +10: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 acb2121618 Merge pull request #1570 from SteveGilvarry/feature-h264-videostorage 
Add libx264-dev and libmp4v2-dev to build requires to save hassle of
 2016-07-31 13:52:44 +10:00
Steve Gilvarry 3543c37f5e Add libx264-dev and libmp4v2-dev to build requires to save hassle of 
ensuring they are installed before build.
 2016-07-31 08:24:52 +10: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
Isaac Connor 6d1f85bcd6 fix spacing and code style, and when logging in, change view to console 2016-07-22 16:03:39 -04:00
Isaac Connor 9262d9d14e remove debug messages on css changing 2016-07-22 16:02:55 -04:00
Isaac Connor 3504c1d8f5 Add Id to the title for each monitor 2016-07-21 15:02:01 -04:00
Isaac Connor 440f8fafdd implement object based versions of getImageSrc and creatListThumbnail 2016-07-20 15:21:23 -04:00
Isaac Connor 8c8461a88e Update to use Event object and object based createListThumbnail function 2016-07-20 15:20:51 -04:00
Isaac Connor b1d0223c30 implement human_filesize 2016-07-20 15:20:21 -04:00
Isaac Connor bce7369984 Merge branch 'disk_space_in_events' into storageareas 2016-07-19 17:36:15 -04:00
Isaac Connor cd43d1fa7a Rough in Event disk space reporting 2016-07-19 17:34:01 -04:00
Isaac Connor a089f11014 add more NULL columns 2016-07-19 17:17:11 -04:00
Steve Gilvarry 14437189ca Merge pull request #5 from knnniggett/patch-1 
Update zoneminder.init
 2016-07-18 21:04:51 +10:00