Commit Graph

9848 Commits

Author SHA1 Message Date
Isaac Connor 57a53f6fdd spacing and fixes 2017-11-09 15:03:23 -05:00
Isaac Connor 821717b06e turn off debug 2017-11-08 11:26:13 -05:00
Isaac Connor 2570869aa0 bring back libvlc 2017-11-08 11:18:54 -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
Isaac Connor b6548ba137 put curl back, we use it's decoding function for urls 2017-11-07 15:54:13 -05:00
Isaac Connor a9419064ef don't calc fps if no time has passed 2017-11-07 09:35:13 -05:00
Isaac Connor c3cfd096c7 Don't connect to the monitor when doing an eventStream 2017-11-07 09:34:47 -05:00
Isaac Connor 4b8a8e7b56 fix new return value from Capture, 1 signals 1 frame captured 2017-11-05 18:02:09 -05: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 0a3327e2d2 move test for h264 into the code that opens the stream instead of comparing on every capture 2017-11-05 09:59:27 -05:00
Isaac Connor ee96f58ac4 fix fps reporting value when Capture doesn't return a new frame 2017-11-05 09:59:06 -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 fdbd344d74 whitespace 2017-11-03 09:23:08 -04:00
Isaac Connor 4ef28bb30d don't put the leading / in the cache link 2017-11-03 09:22:43 -04:00
Isaac Connor 31b756bd53 add missing tests for StartDateTime etc 2017-11-03 07:18:30 -04:00
Isaac Connor 495cd580aa add more debugging 2017-11-02 11:45:49 -04:00
Isaac Connor a8b679e479 set frameCount for audio packets too so that a long period of just audio will return and update lastframesent etc. 2017-11-02 11:45:33 -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 ca758a6099 Merge branch 'tesla' of github.com:connortechnology/ZoneMinder into tesla 2017-11-01 12:02:43 -07:00
Isaac Connor 866c875312 Merge branch 'storageareas' into tesla 2017-11-01 12:01:51 -07:00
Isaac Connor cb01b96dc0 fixes 2017-11-01 12:01:11 -07:00
Isaac Connor 1aea1517bf put back old behaviour for add monitor 2017-11-01 13:09:14 -04:00
Isaac Connor fe5cbea3e5 Merge branch 'storageareas' into tesla 2017-11-01 13:08:24 -04:00
Isaac Connor c5182f68ee Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-11-01 13:08:06 -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 6217351318
Merge pull request #46 from MalakymR/patch-1
Add default for UpdateDiskSpace in zm_create.sql
2017-11-01 10:07:03 -07:00
MalakymR 5852147678
Add default for UpdateDiskSpace in zm_create.sql
Add default for UpdateDiskSpace
2017-11-01 16:51:01 +00:00
Isaac Connor a7f590a28d add value for the DiskSpace column 2017-11-01 12:37:08 -04:00
Isaac Connor d4080dcdbd when saving a new layout, auto-select it 2017-11-01 12:19:27 -04:00
Isaac Connor ac9116e78b add connkey to logging so I can tell which process is which 2017-11-01 12:01:12 -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 ac6964b159 add position clearing to other Layouts 2017-11-01 11:56:18 -04:00
Isaac Connor b1cb83c8ff Freeform layout has to clear left,top,bottom,right 2017-11-01 11:53:45 -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