Commit Graph

10345 Commits

Author SHA1 Message Date
Isaac Connor d4cf9ec66a
Merge pull request #59 from digital-gnome/storageareas-css
Storageareas css
2017-12-05 21:46:59 -05:00
digital-gnome b8660e95c9 Dark theme options menu fixes
Override bootstrap to match dark theme
2017-12-05 21:01:17 -05:00
digital-gnome f47f1a89ea Fix btn-primary css to match current themes 2017-12-05 21:01:16 -05:00
Isaac Connor a64e556047 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-12-05 15:23:37 -08:00
Isaac Connor e46f75c130 fix db update 2017-12-05 15:22:15 -08:00
Isaac Connor e0a18143ad include Group Id in list 2017-12-05 15:20:15 -08:00
Isaac Connor d621222ead fix assignment when should be test 2017-12-05 13:26:21 -08:00
Isaac Connor 6b2eb89a61
Merge pull request #58 from digital-gnome/storageareas-view-button
Storageareas view button & popups
2017-12-05 14:39:03 -05:00
digital-gnome 6edb0247ef Fix popup detection 2017-12-05 13:27:39 -05:00
Isaac Connor 073b055b4c fix Event Moving 2017-12-05 10:21:43 -08:00
Isaac Connor b1a887dbd8 fixes to move Event 2017-12-05 10:02:21 -08:00
digital-gnome 37cdcb89c4 Fix view button in events view 2017-12-05 12:50:49 -05:00
Isaac Connor 82bed8f3fa actually delete the old files when we move an event 2017-12-05 08:43:13 -08:00
Isaac Connor 62cc095c98 always load the storageareas array 2017-12-05 08:31:17 -08:00
Isaac Connor 6454594633 fix popup detection and add disk usage and storage area to event. 2017-12-05 08:30:58 -08:00
Isaac Connor 2cf5b2f60d
Merge pull request #57 from digital-gnome/storageareas-popupfixes
Handle popups that remain popups
2017-12-05 10:28:57 -05:00
digital-gnome 34b708bace Handle popups that should remain popups 2017-12-05 09:40:03 -05:00
Isaac Connor 004a41b122 remove boost dependency. 2017-12-04 22:59:50 -05:00
Isaac Connor d741cc1a72 fix saving Groups 2017-12-04 22:02:56 -05:00
Isaac Connor f7a2db4e49 remove MaxScore from the sorting because it really doesn't make sense to sort by time then maxscore... time is going to be pretty much unique 2017-12-04 21:50:29 -05:00
Isaac Connor 26c9d1991c fix populating the monitors select 2017-12-04 21:49:34 -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
digital-gnome 03ad4898d9 Fix montage monitors jumping on alert (#2013)
The alert class from bootstrap was not overriden on monitors in montage.
2017-12-04 21:25:56 -05:00
Isaac Connor f3d3357365 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-12-04 20:52:43 -05:00
Isaac Connor 6f1e5fcc3b Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-12-04 17:11:28 -05:00
Isaac Connor 4f40b0464c Don't remove MonitorIds column.. just to support downgrading 2017-12-04 17:11:16 -05:00
Isaac Connor 72a50910e6
Merge pull request #56 from digital-gnome/storageareas-fixMontageReviewFilter
Montagereview filter respect groups setting
2017-12-04 17:08:51 -05:00
digital-gnome c72b1f3acf Fix refreshParent on some popups
Some popups wouldn't refresh the parent because after submit the none view page does not include jquery.  This angers javascript and prevents the close function from working.  Only fire header refresh code if there is a view.
2017-12-04 17:04:53 -05:00
Isaac Connor 97c9ae02c2 cleanup 2017-12-04 17:02:38 -05:00
Isaac Connor 1f2f708287 Handle empty strings in MonitorsIds 2017-12-04 17:00:52 -05:00
Isaac Connor 7bba52e0d4 bump version 2017-12-04 16:52:23 -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
digital-gnome ab08769adb Add nice to archive commands
Archiving could hammer io/cpu on the server.  Big archives would cause problems.
2017-12-04 14:48:17 -05:00
digital-gnome 3f62d1e24d Montagereview filter respect groups setting 2017-12-04 14:35:33 -05:00
Isaac Connor 203fe79391 cleanup debug 2017-12-04 11:14:55 -05:00
Isaac Connor 1ccd344bf5 implement Storage Area move 2017-12-04 11:05:50 -05:00
Isaac Connor af1729792f add AutoMove and AutoMoveTo to Filters 2017-12-03 17:04:11 -05:00
Isaac Connor 9aa94bd3ab Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-12-03 16:05:43 -05:00
Isaac Connor e0ef56a012
Merge pull request #53 from digital-gnome/storageareas-unpop
Remove Events/Event/Watch popups
2017-12-03 16:05:22 -05:00
digital-gnome 9ca19b003f Add download button to montagereview 2017-12-03 14:42:09 -05:00
digital-gnome 4f5677eb3b Remove time limit from archive download for exceptionally large files 2017-12-03 14:42:08 -05:00
digital-gnome 3e7c573da5 Add download video option to events view
Creates a new popup window for downloading event video files with no directory structure in the archive
2017-12-03 14:42:07 -05:00
Isaac Connor c04ec1b8a8 fix mem corruption 2017-12-03 12:50:57 -05:00
digital-gnome 7a188a84f7 Add montagereview filter passing
montagereview now accepts any appropriate filters
2017-12-02 12:29:55 -05:00
digital-gnome 6d6b4366de Fix MontageReview filters 2017-12-02 12:29:54 -05:00
digital-gnome 1c201b0efe Fix timeline filters 2017-12-02 12:28:06 -05:00
digital-gnome 66d6e1a4a4 Add header to watch 2017-12-02 12:28:06 -05:00
digital-gnome 11629076f6 Fix Timeline view, add list link 2017-12-02 12:28:06 -05:00