Commit Graph

164 Commits

Author SHA1 Message Date
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 14894dfb00 remove extra comma 2020-10-19 09:08:25 -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 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 586f9f3e52 Use zm_session_start 2020-08-25 11:27:25 -04:00
Isaac Connor 56a43741c5 Handle a zero value for scale 2020-04-23 16:37:26 -04:00
Isaac Connor 5bf068791b Merge branch 'rate_dropdown' into release-1.34 2020-04-23 16:11:59 -04:00
Isaac Connor bab609426d spacing in views/event.php 2020-04-23 15:47:10 -04:00
Isaac Connor 4e9f0b3463 defend against XSS in Monitor Name 2020-04-23 15:46:05 -04:00
Isaac Connor 1c197db619 Merge branch 'master' into rate_dropdown 2020-01-07 14:49:58 -05:00
Isaac Connor d87bf5a156 replace the rate display with a dropdown 2019-12-20 11:02:12 -05:00
Isaac Connor b686649589 fix & instead of &. 2019-12-02 15:34:31 -05:00
Isaac Connor 524a39a224 changeCodec no longer needs to be passed this 2019-10-18 13:40:29 -04:00
Isaac Connor 8ee567442e UPdate replay, scale, codec dropdown onchanges 2019-10-15 15:04:14 -04:00
Isaac Connor ebcacaa660 Use material icons for buttons 2019-09-26 16:26:37 -04:00
Isaac Connor 41fb11d776 Fix Arched lacking () so not working 2019-08-27 15:19:38 -04:00
Isaac Connor 39262d55f5 Also show secondary storage area when viewing event 2019-07-24 11:26:07 -04:00
Isaac Connor 2fc7b3cf4d Don't allow deleting of in-progress recording 2019-05-24 09:31:48 -04:00
Isaac Connor 65fab1b032 add px to width and height of event img 2019-03-21 14:14:45 -04:00
Isaac Connor ae7391689b Add some code doc 2019-03-20 14:28:19 -04:00
Isaac Connor 71cd024fda spacing updates. Use MP4 instead of H264/H265 in viewing codec dropdown 2019-03-19 12:16:31 -04:00
Isaac Connor 6c8eac1ac8 Merge branch 'storageareas' into h265 2019-03-06 11:10:01 -05:00
Isaac Connor 8dd8888975
Php namespace (#2537)
* experiment with namespaces on the Server class

* experiment with namespaces on the Server class

* Implement the ZM namespace on objects

* Implement the ZM namespace on objects

* Implement the ZM namespace on objects
2019-02-22 09:19:07 -05:00
Isaac Connor 87d1390fed Merge branch 'storageareas' into h265 2019-01-16 15:20:17 -05:00
Matt N d33fec9c3f Add a CSP script-src policy with nonce-source and convert more inline event handlers (#2413)
* Add Content-Security-Policy-Report-Only: script-src 'self' 'nonce-' policy

* Use @data-on-click-this to attach inline click event handlers which expect being called with 'this'

Only handle ones that don't return a value.

* Use @data-on-click to attach inline click event handlers with no args and no return value

* Use @data-on-click-true to attach inline click event handlers with 'true' as the only argument

* Enforce a script-src CSP on views without inline JS

* Convert some onchange attributes to data-on-change
2019-01-16 09:59:58 -05:00
Isaac Connor f726666f54 Merge branch 'master' into h265 2019-01-14 12:36:11 -05:00
Isaac Connor 3f5a2a2aa6 disable delete button when event is archived. 2019-01-07 15:56:23 -05:00
Isaac Connor e0a9c4a21e fix event popup detection 2018-12-24 11:23:58 -05:00
Isaac Connor 1130d6650a Fix spacing and pass popup to previous/next event so that popups stay as popups 2018-12-21 10:50:19 -05:00
Isaac Connor 4272225a17 Merge branch 'master' into h265 2018-11-30 16:42:16 -05:00
Isaac Connor 605397b565 Fix rate resetting by storing it in a cookie and using that on initial event load. Fixes #2319 2018-11-29 09:43:21 -05:00
Isaac Connor e24a308481 Merge branch 'master' into h265 2018-11-14 17:15:37 -05:00
Isaac Connor 82abd04f36 Add type=button to buttons so they don't act like submit buttons 2018-11-07 13:19:42 -05:00
Isaac Connor a8329465fb Merge branch 'master' into h265 2018-10-22 10:30:01 -04:00
Isaac Connor c88dc690a6 Make getNearEvents smarter. When Sorting by something other than Id, include Id in the sort so that events with identical starttime for example maintain the correct chronological order. 2018-09-28 13:24:50 -04:00
Isaac Connor 6fcf65459f show video tag version if codec set to auto and DefaultVIdeo exists 2018-09-11 08:43:42 -04:00
Isaac Connor 884ba078c7 Store codec in session for monitor 2018-09-10 15:09:08 -04:00
Isaac Connor 03f769eacc Rough in codec specification for Events 2018-09-10 12:22:55 -04:00
Isaac Connor 7f850890cb whitespace 2018-04-06 14:42:20 -04:00
Steve Gilvarry 1c740de5dc
Add Return False to Event Back 2018-03-04 13:37:30 +11:00
Isaac Connor 212bfd4a2c add Monitor to info shown on event 2018-01-17 12:20:15 -08:00
Isaac Connor bd73e7c2e2 Merge branch 'robots' into storageareas 2017-12-07 10:31:25 -05:00
digital-gnome 6edb0247ef Fix popup detection 2017-12-05 13:27:39 -05:00
Isaac Connor 6454594633 fix popup detection and add disk usage and storage area to event. 2017-12-05 08:30:58 -08:00
digital-gnome 34b708bace Handle popups that should remain popups 2017-12-05 09:40:03 -05:00
digital-gnome f8d3c07586 Add h264 event view functionality and new feature alarmCues (#2012)
* Fix nearEventsQuery

Removed dbEscape from getNearEvents previous event because it only returns 0.  Now matches next.  Changed getEventDefaultVideoPath function to return a web path rather than the absolute path based on ic0ns branch.  Also added start times to allow for videoJS replaymode.

* Unescape filters

Filters need to be unescaped

* Add initial values to page load

* Add replay modes to videojs

* rough in figuring out a frame in between bulk frames

* Add alarmCues

Add a graphical indication of where alarm frames happened in an event.  Similar to what zmNinja shows.

* Add remaining buttons to videojs

Functionality for all buttons on videojs streams.  FF/RW buttons show as active when they are active.

* Whitespace and fix Bulkframe calcs

* Fix zms events trying to generate with mp4 code

ZMS events would attempt to generate frames as though they were an mp4/passthrough type because the full eventpath wasn't passed

* ZMS scrub bar

Move zms scrub bar to bottom of image feed.  Make it simpler and more like videojs style.

* Wrap event feeds properly

* Fix dvrControls on watch view

* Add scaleToFit

Add a scaleToFit option to event view

* Add navigation for videoJS streams

Disables nav buttons at beginning and end of events.  Handles switching from zms to videojs.  If zms crashes changes next event function to reload page instead of ajax.

* Add scaleToFit to watch and frame view

Adds scaleToFit to watch view.  Since frame view uses the watch cookie this required changes to frame view

* Add transition to zoom

* Change stills view to match stream

Move stills slider bar to match scrub bar on streams.  Allow it to resize, make it larger.  Add alarmcues.

* Add Stills for every event

Add stills for every event.  Match size to stream size

* Progressbox transitions
2017-12-04 21:26:59 -05:00
digital-gnome 064ce99eac Scalecontrol in wrong place 2017-12-02 12:28:05 -05:00
digital-gnome bf5c928e38 Event view compress header
Combine all three lines of event view to 2.
2017-12-02 12:28:05 -05:00
digital-gnome b3ef499e46 remove event popup 2017-12-02 12:28:04 -05:00
digital-gnome c92b3a9408 Converge stills view and stream view
Make the stills view look more like stream view.  Moved slider up to be like a scrub bar, added alarmcues.
2017-11-26 19:08:07 -05:00