Commit Graph

3035 Commits

Author SHA1 Message Date
Isaac Connor 70313ce152 Revert "Add on-mouseup and on-mousedown processing"
This reverts commit e0c0598e13.
2021-04-19 17:15:35 -04:00
Isaac Connor ffb2d937e1 Revert "Use on-mousedown and on-mouseup if doing continuous"
This reverts commit d7fa28142f.
2021-04-19 17:15:20 -04:00
Isaac Connor e0c0598e13 Add on-mouseup and on-mousedown processing 2021-04-16 10:15:57 -04:00
Isaac Connor d7fa28142f Use on-mousedown and on-mouseup if doing continuous 2021-04-16 10:15:07 -04:00
Isaac Connor 113e495a7d Fix margin in ptz buttons 2021-04-14 14:00:24 -04:00
Isaac Connor 64ab6dff95 fix missing ) 2021-04-10 18:16:59 -04:00
Isaac Connor 2b1e0df6be FIx auth= not getting updated 2021-04-09 18:46:41 -04:00
Isaac Connor 492a352bed Use updated auth_hash when sending alarm requests 2021-04-09 18:33:32 -04:00
Isaac Connor 790cdf879a Add D1-PAL resolution 2021-03-31 11:05:17 -04:00
Isaac Connor 7dd9188b3b fix eslint 2021-01-26 18:09:19 -05:00
Isaac Connor d3c84a168a Remove the word All from the mark column on console. I think the UX is pretty universal by now. 2021-01-22 15:51:31 -05:00
Isaac Connor cd9f10695d correct colours in links, navbar buttons. sync colours of monitor filter text inputs to match chosen dropdown. make options sidebar black. Remove redundant layout duplicated from base. 2021-01-22 15:51:04 -05:00
Isaac Connor c7ef587d5d Shirnk colMark because I got rid of the word All in the header. Make the monitor filters inline-block which makes them flow with their label when narrow 2021-01-22 15:47:44 -05:00
Isaac Connor 436cd3397b apply a top/bottom margin to buttons of 1px to create a tiny space between buttons and console table. Remove commented out styles 2021-01-22 15:46:48 -05:00
Isaac Connor a855656b88 Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-12-17 09:27:23 -05:00
Isaac Connor 5602b92699 Fix issue with timeline where it only shows first frame 2020-12-17 09:26:59 -05:00
Isaac Connor ea6478b8a0 Escape column names for mysql 8. Fixes #3092 2020-12-05 16:38:53 -05:00
Isaac Connor 48775e2230 Fix Clear Log by using minTime and maxTime as timestamps. Fix export including unselected filters. Can't just serialize the form asit may contain fields in teh querystring so you get an array of values instead of a single value 2020-12-01 14:24:41 -05:00
Isaac Connor 746882ba85 Get rid of zmEventScaleAuto cookie. Just use the per monitor zmEventScale cookie. Fixes #3070 2020-11-05 13:45:02 -05:00
Isaac Connor 8a6aaa019f Bump version for release to 1.34.22 2020-10-19 14:29:18 -04:00
Isaac Connor 0e63874533 fix calling changeScale when scale is 0 instead of auto 2020-10-19 14:28:21 -04:00
Isaac Connor 127ef9a130 Fix scaling when using ScaleToFit 2020-10-19 14:28:02 -04:00
Isaac Connor 080557d580 add an id to buttons div so that we can use it when calling scaleToFit 2020-10-19 14:27:43 -04:00
Isaac Connor 14894dfb00 remove extra comma 2020-10-19 09:08:25 -04:00
Isaac Connor 220a89b459 fix eslint 2020-10-17 16:17:30 -04:00
Isaac Connor 78cbacae2e When changing rates, if not using video.js, send CMD_VARPLAY to tell zms what to do 2020-10-15 17:18:38 -04:00
Isaac Connor 5869817e0d set playbackrates in video.js to match the ones offered by the zms player. Use the rates array set in includes/config.php 2020-10-15 17:17:20 -04:00
Isaac Connor 7bb227283d Update rates in includes/config.php 2020-10-15 17:15:54 -04:00
Isaac Connor c28ff1f2b4 Include loading EndTime when loading Events data so that we can determine if an event is in-progress
Keep track of last_id which is the last frame id that we have info for. Use it instead of Frame Count to prevent
accessing non-existent frame records
close ffmpeg_input on event change
include duration in status messages because it may change when playing an in-progress event.
when we hit the end of our frame data if it is an in-progress event, reload the event data instead of moving to the next event.
Include X-Timestamp in http headers to match live stream behaviour
Only send time to next event when mode=ALL
Fix scale behaviour on event view
2020-10-08 09:06:56 -04:00
Isaac Connor 044ce61ddb Always do event change detection whether we are paused or not. Because we might be single-stepping. Change progress to a double as that it what it should be. 2020-10-06 16:47:51 -04:00
Isaac Connor 2457dcb16f Minimum value for label position is 0, not 1. 2020-09-22 13:12:39 -04:00
Isaac Connor 3492582b98 add missing css for settings popup 2020-09-19 12:00:32 -04:00
Isaac Connor 6b2773ad8c Handle invalid eid more gracefully. 2020-09-16 14:21:03 -04:00
Isaac Connor 9268db14a7 Fix xss reported by Noccolo Picca relating to not sanitizing connkey 2020-09-16 14:14:31 -04:00
Isaac Connor 74d2ba56db Persist video volume in a cookie so that subsequent events remember the volume level. 2020-08-26 15:15:10 -04:00
Isaac Connor b5ef7b08b9 settings popup has to come from the server hosting the v4l device, so use monitor->UrlToIndex and include auth. 2020-08-25 12:40:22 -04:00
Isaac Connor 6587cdd3de Handle failure to get v4l settings. Fix assignment of values to monitor object. 2020-08-25 12:39:44 -04:00
Isaac Connor b0f5f3617a Always set auth_hash and always set auth_relay, using our handy new get_auth_relay function 2020-08-25 12:39:14 -04:00
Isaac Connor f1fab6361f fix dimensions of v4l settings popup 2020-08-25 12:38:46 -04:00
Isaac Connor 3c29228df5 Use zm_session_start 2020-08-25 11:30:22 -04:00
Isaac Connor 586f9f3e52 Use zm_session_start 2020-08-25 11:27:25 -04:00
Isaac Connor c2d6b8f493 revert code that passed the div hightlightOn/Off. Better to pass index. Fixes js errors. 2020-08-19 14:39:15 -04:00
Isaac Connor d0c21995cd Fixes to function converting from pixels to percent. Adjust to 100 if > 100. 2020-08-19 14:14:32 -04:00
Isaac Connor efec1e7d4f remove debug 2020-08-19 14:13:48 -04:00
Isaac Connor 177df46113 Apply min=0 to filterX and Y so that we don't get negative values 2020-08-19 14:11:16 -04:00
Isaac Connor 16efa9dbb2 Add extra checks for Deleting without an Archived State term and Running in the background without any actions. 2020-08-18 11:17:22 -04:00
Isaac Connor c87886f5a5 Fix v4l2 channel and palette dropdowns allowing the saving of local monitors. 2020-08-15 12:31:30 -04:00
Isaac Connor bafffdb486 Test for configuration of ZM_PATH_SHUTDOWN and provide useul error message 2020-08-10 12:26:37 -04:00
Isaac Connor a001c93321 fix zone editing globals and inputs being too big 2020-08-08 11:41:24 -04:00
Isaac Connor 8533ce7018 fix CSP on polygons 2020-08-08 11:38:54 -04:00