mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-22 07:43:09 -04:00
Code Issues Packages Projects Releases Wiki Activity
9,924 Commits 80 Branches 104 Tags
93c79efc729bfed6d533fa08f2acaa46d689ebf7
Commit Graph

3721 Commits

Author SHA1 Message Date
Isaac Connor
57c8cdde63 Merge branch 'storageareas' into put_ffmpeg_into_event_wip 2017-11-14 02:45:34 -05:00
Isaac Connor
93a4dfa3aa remove extra dropdown addition 2017-11-14 02:42:51 -05:00
Isaac Connor
56bb2205d8 add mjpeg support 2017-11-14 01:59:15 -05:00
Isaac Connor
bafdf1fdfc add codecs and containers 2017-11-13 21:41:57 -05:00
Isaac Connor
5717a19215 be able to popup watch view even if the monitor is not running 2017-11-13 20:29:01 -05:00
Isaac Connor
99802945fe be able to popup watch view even if the monitor is not running 2017-11-13 20:28:18 -05:00
Isaac Connor
1632aa7349 fix nvsocket 2017-11-13 14:25:19 -08:00
Isaac Connor
bc3f169a80 add event_id as a paramteter 2017-11-13 11:51:54 -08:00
Isaac Connor
ed72017684 add a mutex 2017-11-13 14:35:47 -05:00
APHW2 MFGENG
d07f36a7ee Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas 2017-11-13 10:27:27 -08:00
APHW2 MFGENG
f093cfbcef add Filtering to monitors index 2017-11-13 10:27:24 -08:00
Isaac Connor
75743d63b6 fixes 2017-11-12 17:02:11 -05:00
APHW2 MFGENG
97058065ff Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas 2017-11-10 10:11:03 -08:00
Isaac Connor
57a53f6fdd spacing and fixes 2017-11-09 15:03:23 -05:00
APHW2 MFGENG
d15d36f389 rework, compiles, won't open h264 2017-11-09 11:50:20 -08:00
Isaac Connor
5efaed0ef4 Merge branch 'storageareas' into ffmpeg_output 2017-11-08 17:22:07 -05:00
Isaac Connor
821717b06e turn off debug 2017-11-08 11:26:13 -05:00
Isaac Connor
aba7ecd9a6 split lines 2017-11-08 11:18:23 -05:00
Isaac Connor
59a87c14d3 fix error message 2017-11-08 11:17:46 -05:00
Isaac Connor
625170bffc fix getVideoStream to getVideoStreamHTML. Change how scaling works 2017-11-08 11:17:30 -05:00
APHW2 MFGENG
4e080b8a36 Merge branch 'storageareas' into ffmpeg_output 
Conflicts:
	scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
	scripts/ZoneMinder/lib/ZoneMinder/Object.pm
 2017-11-07 18:25:33 -08:00
APHW2 MFGENG
c2fab6e959 add the options for nvsocket as an include 2017-11-06 07:31:08 -08:00
Isaac Connor
bef7c0ed94 Only start a monitor if it has a Function 2017-11-05 11:54:00 -05:00
Isaac Connor
7374ced076 0 is a prefectly valid PreEventCount 2017-11-05 10:00:24 -05:00
Isaac Connor
09f3355e18 add /usr/share/zoneminder/www/cache as a temp dir 2017-11-04 14:52:36 -04:00
Isaac Connor
63c788ef0e handle when sql error occurs and no params given 2017-11-03 15:45:11 -04:00
Isaac Connor
f39353a4a3 add missing breaks 2017-11-03 15:44:53 -04:00
Isaac Connor
8432ab5938 change quotes, and limit the # of results to 2 when getting next and previous frames. 2 is because one of them could be the currently selected Event, 2017-11-03 15:09:19 -04:00
Isaac Connor
0ef5c16bcc when doing parseSort, reset the sortfield to StartTime instead of DateTime 2017-11-03 15:07:04 -04:00
Isaac Connor
cab8c4cd5e cleanup Monitor::Capture. Cleanup the return values from Capture and CaptureAndRecord. <0 is error, 0 is things ok, but no video frame. > 0 means we have a frame. Plus google code style 2017-11-03 13:49:42 -04:00
Isaac Connor
54d77519c0 Only show Storage and Server filters if there is more than 1 2017-11-03 12:03:01 -04:00
Isaac Connor
67bb8c302f add missing / 2017-11-03 10:00:29 -04:00
Isaac Connor
09938ef7ee join the echo's into 1 to also get the line breaks 2017-11-03 09:24:13 -04:00
Isaac Connor
073c06f6a8 fix sizing after switching scale. basically re-apply the layout 2017-11-03 09:23:50 -04:00
Isaac Connor
4ef28bb30d don't put the leading / in the cache link 2017-11-03 09:22:43 -04:00
Isaac Connor
5aa61cf1f5 unset the ref so that last monitor isn't duplicated 2017-11-02 07:59:25 -04:00
Isaac Connor
866c875312 Merge branch 'storageareas' into tesla 2017-11-01 12:01:51 -07:00
Isaac Connor
1aea1517bf put back old behaviour for add monitor 2017-11-01 13:09:14 -04:00
Isaac Connor
eb2ee76f57 disable and re-enabled onclick action when editing layout/cancelling edit 2017-11-01 13:08:01 -04:00
Isaac Connor
96e0959c35 clear the cookie for zmMontageLayout 2017-11-01 13:07:35 -04:00
Isaac Connor
0af389c984 populate the Id of the layout when inserting it 2017-11-01 13:07:24 -04:00
Isaac Connor
d4080dcdbd when saving a new layout, auto-select it 2017-11-01 12:19:27 -04:00
Isaac Connor
8e010b3bd0 get rid of experimental code to fix monitor layout. Apparently draggable does it all for us. 2017-11-01 12:00:48 -04:00
Isaac Connor
445fbb06d6 clearFix so that #monitors actually has a height 2017-11-01 11:52:59 -04:00
Isaac Connor
a9d4dfac45 fix the file extension so that mime type works better 2017-11-01 11:52:32 -04:00
Isaac Connor
36e13039c7 Switch to LONGTEXT FROM JSON type 2017-11-01 11:05:21 -04:00
Isaac Connor
25210b7ecf Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-11-01 09:41:22 -04:00
Isaac Connor
e6918cd1bd implement crude cache busting code for .js and .css files 2017-11-01 09:41:19 -04:00
Isaac Connor
33771f92e9 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-10-31 13:32:47 -07:00
Isaac Connor
9473fbecd8 more debug 2017-10-31 13:32:42 -07:00