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

6091 Commits

Author SHA1 Message Date
Isaac Connor e637915823 add a lock around the socket creating/deleting. 2015-12-04 15:39:37 -05:00
Isaac Connor 3c86965760 Merge branch 'master' into multi-server 
Conflicts:
	web/skins/classic/js/flat.js
 2015-12-04 15:31:30 -05:00
Isaac Connor 11a808556b Merge pull request #1178 from knnniggett/submodulecheck 
Check for the presence of CrudControllerTrait.php instead of .git
 2015-12-04 13:09:03 -05:00
Andrew Bauer 1957c5672f Check for the presence of CrudControllerTrait.php instead of .git 2015-12-04 12:03:18 -06:00
Isaac Connor af59dbee2e == should be = 2015-12-04 10:40:55 -05:00
SteveGilvarry 5390605797 Add v to front of version string in version->parse to force conversion of decimal to dotted decimal versions, and change from ge to > to prevent reapplying current version 2015-12-03 10:23:19 +11:00
SteveGilvarry f4d0581eb5 Merge branch 'master' of https://github.com/SteveGilvarry/ZoneMinder 2015-12-03 09:59:28 +11:00
Isaac Connor f54b8c27ee upgrade montage to use Monitor object and getStreamSrc which knows which server to connect to 2015-12-02 12:10:32 -05:00
Isaac Connor 34f6590107 upgrade montage to use Monitor object and getStreamSrc which knows which server to connect to 2015-12-02 12:10:26 -05:00
Isaac Connor 961dc90b0e add Server function 2015-12-02 11:21:04 -05:00
Isaac Connor 70fb6a6786 output message when not doing dbupdate. put quotes in to fix bash error when ZM_DB_HOST is not defined 2015-12-02 11:17:23 -05:00
Isaac Connor b8fb711593 only do CORS if Origin is set 2015-12-02 11:02:47 -05:00
Isaac Connor 41d92bbf94 need to include Server class 2015-12-02 10:26:11 -05:00
Isaac Connor 62adb756a9 put back CORS validity checking code 2015-12-02 10:12:20 -05:00
Isaac Connor 644080fd41 call CORSHeaders 2015-12-02 10:05:27 -05:00
Isaac Connor 3f8a45bbbb Add a function to setup CORS access headers 2015-12-02 10:05:03 -05:00
Isaac Connor a799a1ce79 Make Server constructor take a row or an id 2015-12-02 10:04:47 -05:00
SteveGilvarry 4f3664b7f8 Bring is more of the h264 code and add some master changes to the duplicated code 2015-12-02 07:17:50 +11:00
Isaac Connor aa91e69a9b add monitorUrl to be used to target the recording server for the monitor 2015-12-01 15:17:49 -05:00
Isaac Connor 342326e159 append monitorUrl to thsiURL to get access to the recording server for the monitor stream 2015-12-01 15:17:25 -05:00
Isaac Connor 95f002c7d6 convert monitor hash accesses to function calls 2015-12-01 15:16:53 -05:00
Isaac Connor c5d57b5b64 convert monitor hash accesses to function calls 2015-12-01 15:16:43 -05:00
Isaac Connor 945949ebc0 fix __call to actually return the value 2015-12-01 15:16:18 -05:00
Isaac Connor 2dfa6d6bae add Url and __call functions 2015-12-01 15:16:07 -05:00
Isaac Connor 382ad0f390 put () after property names of Monitor object 2015-12-01 14:30:24 -05:00
Isaac Connor e85ba683e1 improve constructor to handle numeric as well, and give error when something else 2015-12-01 14:29:57 -05:00
Isaac Connor e4f5f76782 rewrite constructor to take a row as well as an Id 2015-12-01 14:03:55 -05:00
SteveGilvarry 612e326917 Fixes for remote h264 passthrough 2015-11-29 14:59:34 +11:00
SteveGilvarry 8144bba32a Add videostore to remote_rtsp, still need to check stream is h264 2015-11-29 14:57:06 +11:00
Steve Gilvarry 195022cf83 Merge pull request #1174 from SteveGilvarry/feature-h264-videostorage 
Merging master to feature-h264-videostorage
 2015-11-29 13:28:24 +11:00
Steve Gilvarry d9e8f74298 Merge pull request #1173 from knnniggett/submodule 
Error on missing submodules
 2015-11-29 13:22:30 +11:00
SteveGilvarry 220ee5e516 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2015-11-29 13:17:22 +11:00
Steve Gilvarry 0f64276909 Merge pull request #1166 from liucougar/video_timestamp 
use webvvt to overlay timestamp on videos to videos in timeline and event
 2015-11-29 13:11:11 +11:00
Isaac Connor 7514f43ef4 only update db if db is local 2015-11-27 13:54:31 -05:00
Isaac Connor c2a7e0c587 fix size of monitor popup in flat skin 2015-11-25 15:39:46 -05:00
Andrew Bauer 91f700a7cd Update CMakeLists.txt 2015-11-23 10:10:56 -06:00
Isaac Connor f7cc2fb44f Merge branch 'master' into multi-server 
Conflicts:
	src/zm_monitor.cpp
 2015-11-23 10:42:14 -05:00
Isaac Connor 7d97ecb9c9 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-11-23 10:40:08 -05:00
Isaac Connor 4126f1f072 Merge pull request #1168 from knnniggett/swap_path 
fix mem alloc fault in zm_monitor.cpp
 2015-11-21 22:13:47 -05:00
Andy Bauer dabe32a593 Error on missing submodules 2015-11-21 18:21:18 -06:00
Steve Gilvarry 79d486b5aa Test Example of 1.29 Changelog 2015-11-22 10:21:38 +11:00
Steve Gilvarry 3112fe6279 Merge remote-tracking branch 'ZoneMinder/master' 2015-11-22 10:13:42 +11:00
Andy Bauer cbfdc5d88d rpm packaging updates 2015-11-21 15:23:13 -06:00
Andy Bauer e65f91d404 update rpm documentation 2015-11-21 15:18:43 -06:00
Andrew Bauer a9609d2a43 fix mem alloc fault in zm_monitor.cpp 2015-11-21 12:17:23 -06:00
Isaac Connor 4d6c4355db Merge branch 'master' into multi-server 2015-11-20 16:07:50 -05:00
Isaac Connor 37b041b561 add index to recommended default permissions on zmuser 2015-11-20 16:00:57 -05:00
Heng Liu 5ea11a8bfe use webvvt to overlay timestamp (honoring Monitor.LabelFormat) to videos in timeline and event 
also fixed bug which prevented seeking in timeline video preview
 2015-11-18 21:21:56 -08:00
Steve Gilvarry f01b0e84e8 Merge remote-tracking branch 'ZoneMinder/master' 2015-11-18 23:15:38 +11:00
Andy Bauer 9052274d0d Update rpm documentation to reference index permission 2015-11-17 12:20:51 -06:00