Commit Graph

288 Commits

Author SHA1 Message Date
Isaac Connor bd73e7c2e2 Merge branch 'robots' into storageareas 2017-12-07 10:31:25 -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
Isaac Connor 6270408c8f rework group MonitorIds and add GroupId filters to api 2017-12-04 15:52:16 -05:00
Isaac Connor b565125df9 montage layout improvements 2017-11-22 12:33:34 -05:00
Isaac Connor cd1d2e1721 lots more debugging. re-add status update command on failure 2017-11-22 01:18:07 -05:00
Isaac Connor 489d3ba6ed Merge ../ZoneMinder.master into storageareas 2017-11-21 12:23:17 -05:00
Isaac Connor 12b47cbfe4
Merge pull request #51 from digital-gnome/storageareasFixes
Minor UI fixes
2017-11-20 20:15:32 -05:00
digital-gnome b655689f47 Fix cache_bust
Cache busting was preventing changing css due to leaving symlinks behind.  Adding the css name to each symlink prevents the need for a forced refresh since mtime is the same on unchanged files but filename does not change between css sets.
2017-11-20 12:27:20 -05:00
digital-gnome d8af654338 Fix dvrControls on watch view 2017-11-18 14:05:11 -05:00
Isaac Connor 821717b06e turn off debug 2017-11-08 11:26:13 -05:00
Isaac Connor 625170bffc fix getVideoStream to getVideoStreamHTML. Change how scaling works 2017-11-08 11:17:30 -05:00
Isaac Connor f39353a4a3 add missing breaks 2017-11-03 15:44:53 -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 67bb8c302f add missing / 2017-11-03 10:00:29 -04:00
Isaac Connor 4ef28bb30d don't put the leading / in the cache link 2017-11-03 09:22:43 -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 e6918cd1bd implement crude cache busting code for .js and .css files 2017-11-01 09:41:19 -04:00
Isaac Connor 82fbec697f add IS and IS NOT as filter operators so that we can do IS NULL and IS NOT NULL because = NULL and !=NULL are not valid 2017-10-27 08:37:53 -07:00
Isaac Connor 653d213d62 Add EndTime and DiskSpace to Filters 2017-10-25 11:11:19 -07:00
Isaac Connor ced5015a83 move zmcControl and zmaControl to the Monitor Object 2017-10-23 17:00:59 -07:00
Isaac Connor cf2eace2c7 improve htmlSelect and add Storage and Server filters to console 2017-10-19 09:50:07 -04:00
Isaac Connor 6bf9e28a1e fix use of api when auth not in use and actually specify which monitor to restart 2017-10-16 10:00:41 -07:00
Isaac Connor 67cb3a7d3c better human_filesize function 2017-10-10 12:39:36 -07:00
Isaac Connor a9d3be549f try caching storage 2017-10-10 10:39:17 -07:00
Isaac Connor 7f73f0bf8c do a backtrace when we ca;; generateAuthHash without open session 2017-10-10 11:51:35 -04:00
Andrew Bauer e825e5d61e initial commit to change color of web console systemstats (#1981)
* initial commit to change color of web console systemstats

* use css classes
2017-10-07 18:42:39 -04:00
digital-gnome e23b4a0d5d Fix event path 2017-10-07 12:42:16 -04:00
Isaac Connor b56a976d7a fixes to montage review and cleanup in group filtering/editing 2017-10-05 10:46:04 -04:00
Isaac Connor 87a49ad009 work on infinite depths of groups 2017-10-04 16:40:09 -04:00
Isaac Connor 4be133ed09 remove btn styles from buttons. make groups, cycle, montage, montage review non-popups. Add datetime filters to montagereview. Fix dark skin 2017-09-30 14:19:32 -04:00
Isaac Connor 63e974192c handle case when no filter is specified 2017-07-13 14:57:27 -04:00
Isaac Connor fed4dae7e5 fix width and height in options 2017-07-11 19:13:29 -04:00
Isaac Connor c372787882 fix typo 2017-07-06 10:50:56 -04:00
Isaac Connor 9b4fb05d5b Fix parseFilter because terms is now under Query 2017-07-06 10:47:47 -04:00
Isaac Connor 621d2e0e41 remove debug code 2017-06-28 15:18:12 -04:00
Isaac Connor 8b1459a510 fixes for cambozola on ie, and fixes to setting fixed widths 2017-06-28 15:17:55 -04:00
Isaac Connor 90696331a9 Merge branch 'master' into storageareas 2017-06-26 21:58:11 -04:00
Isaac Connor 965b306ebc continue redoing filters 2017-06-19 13:24:02 -04:00
Isaac Connor 528582fec6 fix tabs 2017-06-09 10:36:38 -04:00
Isaac Connor 1788aabb6c Merge branch 'storageareas' into move_dirs 2017-06-09 10:35:58 -04:00
Isaac Connor 01717a5c14 Merge branch 'master' into filter_by_runstate 2017-06-06 20:34:47 -04:00
Isaac Connor 451714a403 Merge branch 'master' into storageareas 2017-06-04 21:42:56 -04:00
Isaac Connor a1af422d29 the [filter][terms] etc part needs to be urlencoded as well. Becase [] are not valid in urls. 2017-06-01 09:35:38 -04:00
Isaac Connor b6ed806d6c braces and comments 2017-05-30 13:51:00 -04:00
Isaac Connor 1a43334113 Use NULLs instead of '' when saving things 2017-05-30 13:38:57 -04:00
Isaac Connor e9a0474cf7 add back required lines with a comment 2017-05-30 12:04:12 -04:00
Isaac Connor 8a732dff8a add back required lines with a comment 2017-05-30 12:03:31 -04:00
Isaac Connor 0e643f0f93 Merge branch 'master' into storageareas 2017-05-30 11:58:38 -04:00
Isaac Connor c5288a172d fix merge problem 2017-05-30 11:57:20 -04:00
Isaac Connor 00479876f2 fix braces 2017-05-30 11:53:21 -04:00