Commit Graph

19149 Commits

Author SHA1 Message Date
Isaac Connor eeb655fd77 Fix underline 2021-11-29 13:50:07 -05:00
Isaac Connor 4ef5056a91 fix by removing code block 2021-11-29 13:49:55 -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 56fdae0f19 timestamp image before scaling. Fixes lack of scaling when TIMESTAMP_ON_CAPTURE
is off
2021-11-19 12:02:31 -05:00
Isaac Connor 2e62826e6c Bump version for release 2021-11-17 11:05:50 -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 d8eb0b2350
Merge pull request #3383 from BlueMax/musl_build_fix
fix posix/musl build
2021-11-16 15:01:35 -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
BlueMax 8a4a530cf3
fix posix/musl build 2021-11-16 19:50:17 +00:00
Isaac Connor e3d2b14b69 Don't exit(0) on QUIT. Instead set zm_terminate=true so that all the cleanup routines run. 2021-11-09 15:49:25 -05:00
Isaac Connor 9b723d73a1 Set zm_terminate on crash so that other threads exit instead of continuing 2021-11-09 10:51:39 -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 5d93e9a957 av_write_trailer can return a positive value which is not an error 2021-11-02 17:24:54 -04:00
Isaac Connor 2aa7293326 Fix event listing when not paginated. 2021-11-02 17:23:46 -04:00
Isaac Connor 84b8e43034 Only start a transaction if we are not already in a transaction 2021-10-28 15:28:55 -04:00
Isaac Connor 15a7c22b94 layout->layer 2021-10-28 15:26:12 -04:00
ColorfullyZhang d7abdb1505 Set character set as utf8 when connect to mysql to avoid mistakes when there are Chinese characters in storage path. 2021-10-28 15:18:55 -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 06f1ab4d46 Fix Event count subsitutions in emails because they are no longer in Monitor_Status. They are in Event_Summaries. So create a new object for them and use it. 2021-10-28 13:19:43 -04:00
Isaac Connor 42ab65f7a0 Merge pull request #3361 from criadoperez/debian-install
Added Debian 11 (bullseye) installation instructions
2021-10-28 13:17:38 -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 2de36f01db Handle auth to mysql problems more gracefully 2021-10-28 13:15:18 -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