Commit Graph

602 Commits

Author SHA1 Message Date
Isaac Connor 74269fea73 make montagereview load event images from the server that the storage is located on 2017-12-22 12:33:30 -08:00
Isaac Connor 0d7fff761c upgrade find_all to take parameters 2017-12-22 11:38:42 -08:00
Isaac Connor cc8ed75eb9 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-12-22 09:03:11 -08:00
Isaac Connor f51259443c fix disk_used_percentage to use db calculated used size 2017-12-22 09:02:49 -08:00
Isaac 9dfad4886d fix saving Monitors 2017-12-22 16:13:00 +01:00
Isaac Connor 915ea93348 source remote server when streaming event 2017-12-21 16:53:46 -08:00
Isaac Connor e9141ca3e8 re-init logger after loading config to actually pick up the appropriate values. This stops the error logging of Info to weblog when weblog is actually set to None. Also update quotes 2017-12-20 10:19:24 -05:00
Isaac Connor e47c8fad88 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-12-19 11:01:42 -05:00
Isaac Connor 2922a86d23 fixes to new Storage Schemes code 2017-12-19 11:01:03 -05:00
Isaac Connor 5f4b2ca53f don't close the session when logging in 2017-12-18 14:35:11 -05:00
Isaac Connor dcfae11fc7 fix typos 2017-12-18 13:16:54 -05:00
Isaac Connor c93de992c2 add Scheme to the list of fields 2017-12-18 13:04:57 -05:00
Isaac Connor d312482a2b add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE 2017-12-18 12:52:26 -05:00
digital-gnome c0fcfe6eb6 Combine possible sort inputs to one in sortQuery, output limitQuery 2017-12-15 08:47:08 -05:00
Isaac Connor 7d7e73977f use stored session group 2017-12-13 16:51:56 -05:00
Isaac Connor abad266c5b introduce chosen to use it to make the filtering dropdowns awesome 2017-12-13 16:15:03 -05:00
Isaac Connor e364641d7b on initial page hit, the cookie might not be set. Use global instead. 2017-12-13 11:21:50 -05:00
Isaac Connor 2643ac9f97 fix a quoting problem that prevented saving config 2017-12-12 11:16:08 -05:00
Isaac Connor bd73e7c2e2 Merge branch 'robots' into storageareas 2017-12-07 10:31:25 -05:00
Isaac Connor d741cc1a72 fix saving Groups 2017-12-04 22:02:56 -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 fb952179cd Fix delete filter (#2010)
Delete filter didn't work because the request does not include 'object'.
2017-12-04 21:26:21 -05:00
Isaac Connor 0171d532fc fix the test for DB_DEBUG 2017-12-04 16:50:56 -05:00
Isaac Connor 6270408c8f rework group MonitorIds and add GroupId filters to api 2017-12-04 15:52:16 -05:00
Isaac Connor 1ccd344bf5 implement Storage Area move 2017-12-04 11:05:50 -05:00
Isaac Connor cb70a3627f Fixes to montagereview and only load event data when in History mode 2017-11-28 14:50:21 -05:00
Isaac Connor dd3f9492ba fix dulicate logic 2017-11-26 15:12:35 -05:00
Isaac Connor b1bb0020d3 turn off database debug 2017-11-24 15:42:44 -05:00
Isaac Connor 4b92a788f7 fix filter execute 2017-11-24 15:37:50 -05:00
Isaac Connor a9f0f3813a Merge branch 'tesla' into storageareas 2017-11-24 09:31:00 -05:00
Isaac Connor 900fbe1e0f update save to a button tag, and add a saveas functionality 2017-11-23 08:26:55 -08:00
Isaac Connor 485567349d Don't calc DiskSpace if it is already defined 2017-11-23 07:29:05 -08:00
Isaac Connor 2a669896c2 Merge branch 'tesla' into storageareas 2017-11-23 08:42:53 -05:00
Isaac Connor 9dd0f29e88 Merge branch 'storageareas' into tesla 2017-11-22 11:41:11 -08: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 095e1ecadb remove extra ), add AnalysisFPS and CaptureFPS 2017-11-21 23:58:13 -05:00
Isaac Connor e2aa278d78 add SaveJPEGs 2017-11-21 23:57:44 -05:00
Isaac Connor e617ffca2d can't use BASE_URL since it will be empty. Have to construct a full URL when using MIN_STREAMING_PORT 2017-11-21 21:00:27 -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 57a53f6fdd spacing and fixes 2017-11-09 15:03:23 -05:00
Isaac Connor 821717b06e turn off debug 2017-11-08 11:26:13 -05:00
Isaac Connor 59a87c14d3 fix error message 2017-11-08 11:17:46 -05:00
Isaac Connor 625170bffc fix getVideoStream to getVideoStreamHTML. Change how scaling works 2017-11-08 11:17:30 -05:00
Isaac Connor bef7c0ed94 Only start a monitor if it has a Function 2017-11-05 11:54:00 -05:00
Isaac Connor 63c788ef0e handle when sql error occurs and no params given 2017-11-03 15:45:11 -04:00
Isaac Connor f39353a4a3 add missing breaks 2017-11-03 15:44:53 -04:00