Commit Graph

9999 Commits

Author SHA1 Message Date
Isaac Connor 5ba6cf0fb2 Add DiskSpace to Events listings on console 2017-10-24 14:19:36 -07:00
Isaac Connor 82bf507ee9 Add Status, ram, swap to Servers List 2017-10-24 12:43:32 -07:00
Isaac Connor 6c03ae32c2 add code to update the statuses in the Server record every second. This code also reduces the timeout from .1 seconds to 1 second. Should reduce load by zmdc on low power devices. I see no reason to poll that heavily... 2017-10-24 12:31:23 -07:00
Isaac Connor 12fd1c151e add Load and Memory fields to Servers 2017-10-24 11:58:44 -07:00
Isaac Connor 59e50bbbef Update DiskSpace when we create jpg's 2017-10-23 17:04:02 -07:00
Isaac Connor 6b2d0aa59b fix popup when clicking on a monitor on montagereview 2017-10-23 17:03:41 -07:00
Isaac Connor 5e98587ff4 add Server and Storage filters to montagereview 2017-10-23 17:03:18 -07:00
Isaac Connor 9cbd33b439 if there is a selected monitor but it isn't in the available monitors, still show the monitors 2017-10-23 17:02:47 -07:00
Isaac Connor 729fdb4fdd add a popup size for monitors 2017-10-23 17:02:21 -07:00
Isaac Connor b5e59efda5 improve updating diskSpace entries 2017-10-23 17:02:04 -07:00
Isaac Connor d2c8a0240a add a monitors view which is for editing function/enabled/server/storage of multiple monitors 2017-10-23 17:01:43 -07:00
Isaac Connor ced5015a83 move zmcControl and zmaControl to the Monitor Object 2017-10-23 17:00:59 -07:00
Isaac Connor df8fbaccea Fixes 2017-10-23 11:50:45 -07:00
Isaac Connor f99e404730 update the total_disk_space function to do and sql sum on the events that already have a space assigned and only update ones that don't. This reduces ram requirements. 2017-10-23 11:02:36 -07:00
Isaac Connor a836dd5ab3 UPdate DiskSpace when creating frame images from the mp4 2017-10-23 10:55:24 -07:00
Isaac Connor d477067fa6 add Id and Name as a title popup to the cnanvas so if you mouse over it you can see which monitor it is 2017-10-23 10:55:04 -07:00
Isaac Connor 681abd64fc Instead of No Data, make a more general function that will write any text without clearing the image behind it 2017-10-23 10:54:38 -07:00
Isaac Connor ed9da696b3 Rough in save functionality into Event. 2017-10-23 10:53:58 -07:00
Isaac Connor 57bc975454 Rouch in Maps 2017-10-23 10:52:51 -07:00
Isaac Connor bd95cd1de9 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-10-23 09:56:42 -04:00
Isaac Connor 2d3aa08303 include <0 in test on event frame timestamp 2017-10-23 09:56:30 -04:00
Isaac Connor 7ccf06ec3e Merge pull request #40 from digital-gnome/AjaxNavigationAndResizing
Ajax navigation and resizing
2017-10-22 22:44:30 -04:00
digital-gnome 1bddec1548 Bypass refreshParentWindow
This hasn't worked for a while.  It looks like it's the result of a fix for filter window redirecting.  It's possible other things use it but this fixes event deletion without touching anything else.
2017-10-22 17:23:04 -04:00
digital-gnome 298085ae93 Fix archive nulling vid src 2017-10-22 15:02:36 -04:00
digital-gnome 3fe46cbaff Scale to Fit
Added a scale to fit option.  When navigating between events of different size they will fill the window.  Turned on when any event uses it, turned off when any event turns it off.
2017-10-22 12:13:16 -04:00
digital-gnome ecb980c66f Navigation
Videojs navigation now uses ajax.  Feels and is faster.  Some improvements, namely if zms ever crashes we can still navigate.  Both zms and videojs update the address bar so refreshing a page doesn't return you to the first event.
2017-10-21 22:14:46 -04:00
digital-gnome ff8d067639 alarmCues improvements
Consolidate selectors and improve edge cases where skew could cause overflow
2017-10-21 22:14:46 -04:00
digital-gnome 1eb2edd95c Converge initial eventData with ajax
The initial eventData object on page load didn't have most of the information that the ajax call gave it.
2017-10-21 22:14:46 -04:00
digital-gnome f2f2aa8720 Replay improvement and overlays 2017-10-21 22:14:46 -04:00
digital-gnome c6373d3dca whitespace and jquery 2017-10-21 22:14:46 -04:00
Isaac Connor 6fba9fa65a google code style and quotes 2017-10-20 14:54:28 -04:00
Isaac Connor 169b64813b improve Server and Storage dropdown filters 2017-10-20 14:27:29 -04:00
Isaac Connor 422b3d0c33 fix to montage which wasn't adding the auth_hash. Still need to add plain auth 2017-10-19 17:56:50 -04:00
Isaac Connor cd476192e9 add auth hash if available 2017-10-19 17:52:09 -04:00
Isaac Connor fece06c9e3 google code style 2017-10-19 17:12:36 -04:00
Isaac Connor 7090561d35 use jquery 2017-10-19 12:45:34 -07:00
Isaac Connor 7725d46808 use the same port as the stream 2017-10-19 12:45:24 -07:00
Isaac Connor d4b0c504fe fix Server and Storage dropdowns 2017-10-19 12:44:33 -07:00
Isaac Connor 85ebb0716d Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-10-19 09:50:13 -04:00
Isaac Connor cf2eace2c7 improve htmlSelect and add Storage and Server filters to console 2017-10-19 09:50:07 -04:00
Isaac Connor 97227e051e Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-10-18 20:46:41 -04:00
Isaac Connor 666233af54 fix mving capture_file_format to staticCOnfig 2017-10-18 20:46:26 -04:00
Isaac Connor 32ba53cf1b turn off database debugging 2017-10-18 16:37:45 -04:00
Isaac Connor b11a514823 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-10-18 13:27:13 -04:00
Isaac Connor c281467e69 Store server and storage filters in session. Add storage and server filters to console. WIP 2017-10-18 13:24:41 -04:00
Isaac Connor a6ccf9a689 Merge sjc04p1fviap02.teslamotors.com:ZoneMinder into storageareas 2017-10-18 13:23:53 -04:00
Isaac Connor 10accc4226 google code style 2017-10-18 10:23:40 -07:00
Isaac Connor 965e1e8bc1 improve readability of debug statement 2017-10-18 10:22:53 -07:00
Isaac Connor f81471da09 google code style 2017-10-18 10:22:37 -07:00
Isaac Connor 3436c65aab minor logic improvement 2017-10-18 10:22:15 -07:00