Commit Graph

8004 Commits

Author SHA1 Message Date
zhiyang7 35ca55e4eb Add hevc wasm player 2022-03-09 15:57:12 +08:00
Isaac Connor bfbba5474f Add auth relay to status ajax request. clear statusTimer instead of streamTimer 2021-12-10 16:37:46 -05:00
Isaac Connor 756aa56710 Detect group hierarchy loops and break them. 2021-12-03 13:27:05 -05:00
Isaac Connor 9764875449 Move init of ctx up before we setup the monitors. I think in some cases we can calls functions that assume ctx has a value. Uncaught%20TypeError%3A%20Cannot%20read%20properties%20of%20undefined%20(reading%20'getImageData') 2021-11-29 13:55:23 -05:00
Isaac Connor 0f476998d4 kill the background timer when switching to history so that we don't cause a javascript error. comment out debugging and use native javascript instead of jquery. 2021-11-29 13:54:42 -05:00
Isaac Connor 5adf5dab50 Remove text-nowrap from cause/notes column 2021-11-29 13:53:50 -05:00
Isaac Connor 4030fa8bc4 Fix NULL and add special 0 case for Storage area specification in filter 2021-11-29 13:51:50 -05:00
Isaac Connor c14d7889a5 Fix task=>action so that deleting works. Pause streaming before delete to prevent errors being logged due to missing files 2021-11-29 13:48:44 -05:00
Isaac Connor a0b60aa4f7 Restore inclusion of video files in export when not including images. Fixes #3324 2021-11-17 11:04:48 -05:00
Isaac Connor cb8ccaaa49 Set to never timeout while generating video 2021-11-16 15:00:04 -05:00
Isaac Connor 498d565034 In multi-server when viewing an event it may be coming from a different server than the serverhost. Use monitorUrl instead of thisUrl in ajax calls and include auth data. Fixes failed ajax when viewing h264 using zms on a multi-server environment 2021-11-16 15:00:04 -05:00
Isaac Connor 51e7aa0983 Fix use of thisUrl instead of monitorUrl when getting stream status. Fix changing stream image due to use of jquery. 2021-11-16 15:00:04 -05:00
Isaac Connor f8e6fae013 spacing and check for permission to view the specific event instead of events in general 2021-11-16 15:00:04 -05:00
Isaac Connor 4b08b0ae84 Add title to Download button 2021-11-16 15:00:04 -05:00
Isaac Connor d5f9eb11c6 WHen saving v4l settings redirect back to watch instead of console. 2021-11-16 15:00:04 -05:00
Isaac Connor 1b3e0eda13 dbError is supposed to take the sql that caused the error. So pass something to satisfy php 2021-11-16 15:00:04 -05:00
Isaac Connor 90e3345440 implement Event::canEdit 2021-11-16 15:00:04 -05:00
Isaac Connor 29fe7f76a2 implement UrlToZMS in Monitor 2021-11-16 15:00:04 -05:00
Isaac Connor fa533d04ff Send all stats rows instead of just 1. Handle receiving all rows, and don't list event id and frame id 2021-11-16 15:00:04 -05:00
Isaac Connor bbf1269e6f remove extra , 2021-11-16 15:00:04 -05:00
Isaac Connor 601df481ed Add privacy to options tabs so we can get back to it. 2021-11-16 15:00:04 -05:00
Isaac Connor 00919314e7 Report error if sql fails. Add check for access to specific event. 2021-11-09 10:51:29 -05:00
Isaac Connor 55e739d4ea Whitespace 2021-11-09 10:51:16 -05:00
Isaac Connor dd542d5b30 alert error message is an error is returned instead of rows 2021-11-09 10:50:55 -05:00
Isaac Connor 2aa7293326 Fix event listing when not paginated. 2021-11-02 17:23:46 -04:00
Isaac Connor 7fd8efeaef is no longer in existence 2021-10-28 15:17:33 -04:00
Isaac Connor 94752e0cf3 Make delete dialog disappear on success. Fixes #3377 2021-10-28 15:15:24 -04:00
Isaac Connor bd8ed71ffc Remove debugging 2021-10-28 15:11:42 -04:00
Isaac Connor e344141222 merge fix from master for filters not deleting 2021-10-28 15:10:55 -04:00
Steve Gilvarry 8061b4f71d Define Date formats
Set Locale for time to en_GB.utf8, changed STRF_FMT_DATETIME_SHORTER to %x which is locale aware short date, but does include year. Makes event table wider, not sure if that is a problem for others
2021-10-28 14:41:19 -04:00
Isaac Connor 198d9c0f5a Restore the download button's behaviour. It is a simple link to the mp4, not an export. Also add a handler for the video.js rate control to sync up our non video.js rate dropdown and stored cookie. 2021-10-28 14:37:47 -04:00
Isaac Connor bf7c13558c Always include the download button so that we can assume that it exists in the js. So avoid console errors when no mp4. 2021-10-28 14:37:19 -04:00
Isaac Connor 615ce5d4c2 Set rows on email textarea 2021-10-28 14:36:06 -04:00
Andrea Vezzali 649eec4dae Update italian (it_it) translation (#3357) 2021-10-28 14:35:29 -04:00
Andrea Vezzali 0dbcd680df Update it_it.php 2021-10-28 14:35:16 -04:00
Andrea Vezzali 64b60613d8 Update it_it.php 2021-10-28 14:35:08 -04:00
Isaac Connor 8600a0af87 Add some extra parenthesis to make sure the logic works right 2021-10-28 13:21:50 -04:00
Isaac Connor 67504b4f39 Put back generate video button 2021-10-28 13:16:59 -04:00
Isaac Connor 7568dd63ed add js to manage the generate video button 2021-10-28 13:15:27 -04:00
Isaac Connor 33a067c085 fix validInt to take negative integers. Introduce validCardinal to handle positive integers 2021-10-28 13:11:44 -04:00
Isaac Connor 65418abf98 Add sort_asc, sort_field and limit to the filter QueryString 2021-10-28 13:10:37 -04:00
SzymekCRX 9da9d1840c Critical bug in events.php
Two extra brackets causes fatal error in Ajax request causing 500 HTTP error and problems with listing / deleting events
2021-10-28 13:09:41 -04:00
Isaac Connor d03365c9e7 Use filter->sort_asc and sort_field which will use either the value specified in query, or defaults set in system. url params order and sort will override. 2021-10-28 13:09:31 -04:00
Isaac Connor 48494a22db Add sort-name and sort-order to bootstrap table options. Also set data-remember-order=false. This allows orderings set by filters to work. Fixes #3348 2021-10-28 13:09:00 -04:00
Isaac Connor 1f75af7534 add licensing info for fontawesome. 2021-10-28 13:08:29 -04:00
Isaac Connor 6e68a35861 Remove dead code, remove locking from CopyTo, put locking into MoveTo. 2021-10-28 11:59:23 -04:00
Isaac Connor 22f398dd6f set vertical-align:top on monitor edit labels 2021-10-25 16:55:42 -04:00
Isaac Connor 7517bdc6ec Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36 2021-10-25 16:44:01 -04:00
Isaac Connor b2e1f7ed56 Put actions and options in a div, remove hr's and style the resulting div have the borders and clearing required. Make email options 100% 2021-10-19 13:17:00 -04:00
Isaac Connor a1a8f4d09b remove debug hello 2021-10-19 13:11:50 -04:00