Commit Graph

1328 Commits

Author SHA1 Message Date
Isaac Connor 26c9d1991c fix populating the monitors select 2017-12-04 21:49:34 -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
Isaac Connor 6270408c8f rework group MonitorIds and add GroupId filters to api 2017-12-04 15:52:16 -05:00
digital-gnome 3f62d1e24d Montagereview filter respect groups setting 2017-12-04 14:35:33 -05:00
Isaac Connor 1ccd344bf5 implement Storage Area move 2017-12-04 11:05:50 -05:00
Isaac Connor 9aa94bd3ab Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-12-03 16:05:43 -05:00
digital-gnome 9ca19b003f Add download button to montagereview 2017-12-03 14:42:09 -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
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 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
digital-gnome 58159963fa Fix back on timeline view 2017-12-02 12:28:05 -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 50d5a8991d Events header
Moved all non-event links to the header
2017-12-02 12:28:05 -05:00
digital-gnome e6568d01a3 Remove timeline popup 2017-12-02 12:28:05 -05:00
digital-gnome 9d1bbfab42 Remove unused code from event 2017-12-02 12:28:05 -05:00
digital-gnome 725814d41d Remove unused code from events 2017-12-02 12:28:05 -05:00
digital-gnome 7a5dfb71dc Remove no longer used max from events 2017-12-02 12:28:05 -05:00
digital-gnome b3ef499e46 remove event popup 2017-12-02 12:28:04 -05:00
digital-gnome f02cd2e615 Remove watch popup 2017-12-02 12:28:04 -05:00
digital-gnome 1289269e6f Change filter to work without popup 2017-12-02 12:28:04 -05:00
digital-gnome adc1b924da Remove events popup 2017-12-02 12:25:53 -05:00
digital-gnome e34b8abaca Cleanup events view header 2017-12-02 12:25:53 -05:00
Isaac Connor 9d5447aa6a
Merge pull request #55 from digital-gnome/storageareas-updateNavbar
Add navbar refresh to all pages that use it
2017-12-02 10:44:01 -05:00
Isaac Connor e64497c16a
Merge pull request #54 from digital-gnome/storageareas-uifixes
Storageareas uifixes
2017-12-01 16:30:29 -05:00
Isaac Connor ca3d6546bd sorty by name when listing monitors by name 2017-12-01 12:30:21 -08:00
Isaac Connor 5e953cefea fix old cookie causing errors loading layouts 2017-12-01 12:30:07 -08:00
digital-gnome 0a995aea78 Add navbar refresh to all pages that use it 2017-11-30 16:33:46 -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 dfb69a2c5b Merge branch 'tesla' into storageareas 2017-11-28 06:29:42 -05:00
Isaac Connor 00c5590a71 add Monitor count to servers 2017-11-27 11:56:48 -08: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
digital-gnome 18dc515ba4 stills view loads image when slider used
Stills view now loads the selected image if an image is being viewed and the slider is used.
2017-11-26 19:08:07 -05:00
digital-gnome 136f0e90f5 Fix autoscale on stills view
Switching from stills view and changing the window would make stream view go crazy.  Changed to autoscale on switch
2017-11-26 19:08:07 -05:00
digital-gnome b506466a70 Change alarmcues to accept arbitrary containing element 2017-11-26 19:08:07 -05:00
digital-gnome b5db885a31 Add scaleToFit to frame view
Changes navigation to use flexbox because absolute positioning was messing with scaletofit.  Also makes frame view respect scale choice
2017-11-26 19:08:06 -05:00
digital-gnome 55699a9b9b Change scaleToFit to choose what to fit
Adds 4th input to choose what element is the last thing to fit.
2017-11-26 19:08:06 -05:00
digital-gnome 68e54400e2 Add scaleToFit to watch view 2017-11-26 19:08:06 -05:00
digital-gnome 3920420aa9 Convert scaleToFit to shared function 2017-11-26 19:08:06 -05:00
Isaac Connor 428d923874 make StatusFIlter do something 2017-11-26 17:39:49 -05:00
Isaac Connor 39e490e5e5 fix monitor dropdown 2017-11-26 17:32:41 -05:00
Isaac Connor 4fbdacef05 fix event counts 2017-11-26 17:03:36 -05:00
Isaac Connor d6bc727c9c use htmlSelect to create the Colours dropdown, which fixes a problem caused when I inverted the Colours array 2017-11-26 11:12:00 -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 2a669896c2 Merge branch 'tesla' into storageareas 2017-11-23 08:42:53 -05:00
Isaac Connor 9d6b417b60 make zmwatch.pl update columns in the Monitors table for Event And DiskSpace counts 2017-11-22 17:03:37 -08:00