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

7348 Commits

Author SHA1 Message Date
Isaac Connor 3dc2170a69 Merge ../ZoneMinder.master 2016-08-12 12:48:34 -04:00
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
Steve Gilvarry 44df4a830d Merge branch 'feature-h264-videostorage' into monitor_packetqueue 2016-08-11 20:44:48 +10:00
Steve Gilvarry 7c5cc6f35e Merge branch 'feature-h264-videostorage' of https://github.com/SteveGilvarry/ZoneMinder into feature-h264-videostorage 2016-08-11 20:35:04 +10:00
Steve Gilvarry 158f8c802e Merge pull request #6 from connortechnology/Rotation 
Rotation
 2016-08-11 09:52:23 +10:00
Isaac Connor 1277f3c792 need arpa/inet for reverse lookups 2016-08-10 12:32:58 -04:00
Isaac Connor 6ac1a70b9c Merge my Rotation/Orientation work and fixes for bad h264 streams 2016-08-10 12:22:04 -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 be057acfed Merge ../ZoneMinder.Steve into Steve 2016-08-10 11:04:43 -04:00
Isaac Connor 8ee86f5d00 Merge pull request #1589 from SteveGilvarry/feature-h264-videostorage 
Merging Master into Feature-h264-videostorage
 2016-08-10 11:02:03 -04:00
Steve Gilvarry 21c46bb519 Merge branch 'feature-h264-videostorage' into monitor_packetqueue 2016-08-11 00:52:35 +10:00
Steve Gilvarry 5d8159462c Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-08-11 00:51:46 +10:00
Isaac Connor d6dfe3dc72 Merge pull request #3 from ZoneMinder/master 
updates from ZoneMinder/ZoneMinder
 2016-08-10 10:19:24 -04: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 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
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
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