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

5838 Commits

Author SHA1 Message Date
SteveGilvarry 0e449dc54f Merge branch 'video_remote' of https://github.com/SteveGilvarry/ZoneMinder into video_remote 2016-02-05 01:49:57 +11:00
SteveGilvarry fa7ec2179d Bring is more of the h264 code and add some master changes to the duplicated code 2016-02-05 01:47:13 +11:00
SteveGilvarry 64bc7398fc Fixes for remote h264 passthrough 2016-02-05 01:47:13 +11:00
SteveGilvarry 78b0a9d0a9 Add videostore to remote_rtsp, still need to check stream is h264 2016-02-05 01:47:12 +11:00
SteveGilvarry e76d5ad1cb Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-02-04 07:33:40 +11:00
Andrew Bauer 7a98acc868 update changelog to 1.29.0 release 2016-02-03 13:21:10 -06:00
Andrew Bauer 6de2ab504c Explain ZM_SERVER_HOST in multiserver documentation 2016-02-03 12:40:30 -06:00
Andy Bauer 5a8989b168 Minor RPM packaging changes 2016-02-02 11:47:55 -06:00
SteveGilvarry 7301e803ed Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 
Conflicts:
	src/zm_monitor.cpp
	src/zm_monitor.h
 2016-01-30 15:45:08 +11:00
Andrew Bauer a990b23164 Update zoneminder.f22.spec 2016-01-29 21:25:34 -06:00
Andrew Bauer fa50327420 Update zoneminder.f23.spec 2016-01-29 21:24:50 -06:00
Kyle Johnson 96db6d5f65 Merge pull request #1254 from pliablepixels/1253-zms-quit-cmd 
1253 zms quit cmd.  Fixes #1253
 2016-01-29 08:47:26 -07:00
arjunrc 904f584fcb CMD_QUIT definition 2016-01-29 10:00:02 -05:00
arjunrc 38bca6b95d added CMD_QUIT to kill zms via command 2016-01-29 09:58:57 -05:00
arjunrc 47b2cdbb96 added CMD_QUIT to kill zms via command 2016-01-29 09:58:50 -05:00
Andrew Bauer f85ed2d5b4 Merge pull request #1252 from ZoneMinder/multi-server 
Add Debug/Info lines reporting multi-server status
 2016-01-28 07:01:39 -06:00
Isaac Connor f275498790 Add Debug for sql used to load other than local monitors 2016-01-26 21:00:32 -05:00
Isaac Connor 902065a6c1 Add Debug for sql used to load local monitors 2016-01-26 20:59:07 -05:00
Isaac Connor 3a0b28f168 Add Debug/Info lines reporting multi-server status 2016-01-26 20:53:34 -05:00
Andrew Bauer 50b113cd02 Merge pull request #1189 from marcolino7/master 
PTZ - Added autostop to Down command on FI8918W
 2016-01-24 07:40:30 -06:00
Andrew Bauer 2f80f26f92 Merge pull request #1232 from ZoneMinder/remove_google_fonts 
remove Google open Sans external import
 2016-01-23 10:24:49 -06:00
Isaac Connor b2c311c306 Merge pull request #1244 from pliablepixels/do_debian_package-mods 
Do debian package mods
 2016-01-22 09:02:14 -05:00
Pliable Pixels 0ade8abd6a typo 2016-01-20 16:11:35 -05:00
Pliable Pixels 8dd35d6057 modifications for general users 2016-01-20 16:09:12 -05:00
Isaac Connor 25eba33adb Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-01-18 21:39:36 -05:00
Isaac Connor e9c9caf201 Add a local build type 2016-01-18 21:39:33 -05:00
Isaac Connor 74c0d40b19 Merge pull request #1240 from knnniggett/zmtrigger 
zmtrigger - process off+time delay condition
 2016-01-18 10:37:26 -05:00
Andy Bauer 66c66106f5 Process off+time delay condition 2016-01-15 20:31:31 -06:00
Isaac Connor 3ebeaec8ab Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-01-10 20:59:01 -05:00
Isaac Connor 47d4331d62 Add Hostname Column to create script, to match update 2016-01-10 20:58:45 -05:00
Isaac Connor 2d86e7713d increase height of logout popup to fit content 2016-01-08 12:14:01 -05:00
Andrew Bauer 7e4a12e7f7 Merge pull request #1233 from ZoneMinder/multi-server 
Multi server
 2016-01-08 10:11:49 -06:00
Isaac Connor 574d94e9b6 Merge branch 'master' into multi-server 2016-01-08 10:16:26 -05:00
Isaac Connor d48ec1cfbe Add AddNewServer and Hostname entries 2016-01-08 10:15:41 -05:00
Isaac Connor 99dfaa97fa User Name instead of ServerName and Hostname instead of ServerHostname 2016-01-08 10:15:21 -05:00
Isaac Connor d13829c6f3 Add Hostname to list of servers, since we have the space for it. 2016-01-08 10:15:06 -05:00
Isaac Connor 5ce26ac4df Change logrotate defaults to daily/rotate 7, which works better with logcheck 2016-01-08 09:59:03 -05:00
Isaac Connor 53bd342f85 remove Google open Sans external import 2016-01-08 09:46:14 -05:00
Andy Bauer d96757ba13 update changelog 2016-01-06 12:46:01 -06:00
Isaac Connor 3066f66f25 add sphinx-rtd-theme 2016-01-05 13:21:54 -05:00
Isaac Connor 99c5af6036 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-01-05 09:04:21 -05:00
Isaac Connor 41a8249ed9 update my package building script 2016-01-05 09:04:04 -05:00
Andrew Bauer 3a19c3c6e3 Merge pull request #1223 from ZoneMinder/multi-server 
Multi server
 2016-01-05 07:04:49 -06:00
Isaac Connor f0486e5b5e fix dumb mistake, undefing ZM_SERVBER_ID after setting it. 2016-01-04 22:07:07 -05:00
Isaac Connor 44f3b99d24 change logic to show server column if any servers are defined. Reason is that once you have setup 1, you want to know which cameras have not been assigned a server yet 2016-01-04 14:59:04 -05:00
Isaac Connor 6ae1597671 Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server 2016-01-04 14:51:47 -05:00
Isaac Connor 273ab6c5c6 Only show Server column when more than 1 Servers are defined 2016-01-04 14:51:24 -05:00
Andrew Bauer fae3012124 Merge pull request #1222 from ZoneMinder/multi-server 
Multi server
 2016-01-04 13:10:28 -06:00
Isaac Connor f5db14d823 return empty for the non multi-server case 2016-01-04 13:46:05 -05:00
Isaac Connor f72260733c Only do CORSHeaders if there is more than 1 server 2016-01-04 09:38:24 -05:00