Commit Graph

1645 Commits

Author SHA1 Message Date
digital-gnome 1ae3fca599 Fast forward and rewind show active
FF and RW show as active if they are active
2017-11-11 14:49:42 -05:00
digital-gnome 0c59c5ba88 Fix databar jumping
dataBar items would jump around when navigating between events dues to automatic spacing and different string lengths.  This locks them in place and should allow for most reasonable event sizes.
2017-11-11 14:49:42 -05:00
digital-gnome 95622cc3b0 pause on delete
Pausing on delete lets a slow network user know that the click worked.
2017-11-11 14:49:42 -05:00
digital-gnome e6ba5162ef choose correct video download
Use download mp4 link if it's a videojs event, otherwise use the video generator link.
2017-11-11 14:49:42 -05:00
digital-gnome 1007add771 add row highlighting
Both other css sets have this
2017-11-11 14:49:42 -05:00
digital-gnome ab87848899 Add visual cue to archived events
The asterisk didn't do it for me.  Added a faint cast to the row.
2017-11-11 14:49:42 -05:00
Isaac Connor 57a53f6fdd spacing and fixes 2017-11-09 15:03:23 -05:00
Isaac Connor aba7ecd9a6 split lines 2017-11-08 11:18:23 -05:00
Isaac Connor 7374ced076 0 is a prefectly valid PreEventCount 2017-11-05 10:00:24 -05:00
Isaac Connor 09f3355e18 add /usr/share/zoneminder/www/cache as a temp dir 2017-11-04 14:52:36 -04:00
Isaac Connor cab8c4cd5e cleanup Monitor::Capture. Cleanup the return values from Capture and CaptureAndRecord. <0 is error, 0 is things ok, but no video frame. > 0 means we have a frame. Plus google code style 2017-11-03 13:49:42 -04:00
Isaac Connor 54d77519c0 Only show Storage and Server filters if there is more than 1 2017-11-03 12:03:01 -04:00
Isaac Connor 09938ef7ee join the echo's into 1 to also get the line breaks 2017-11-03 09:24:13 -04:00
Isaac Connor 073c06f6a8 fix sizing after switching scale. basically re-apply the layout 2017-11-03 09:23:50 -04:00
Isaac Connor 5aa61cf1f5 unset the ref so that last monitor isn't duplicated 2017-11-02 07:59:25 -04:00
Isaac Connor 866c875312 Merge branch 'storageareas' into tesla 2017-11-01 12:01:51 -07:00
Isaac Connor 1aea1517bf put back old behaviour for add monitor 2017-11-01 13:09:14 -04:00
Isaac Connor eb2ee76f57 disable and re-enabled onclick action when editing layout/cancelling edit 2017-11-01 13:08:01 -04:00
Isaac Connor d4080dcdbd when saving a new layout, auto-select it 2017-11-01 12:19:27 -04:00
Isaac Connor 8e010b3bd0 get rid of experimental code to fix monitor layout. Apparently draggable does it all for us. 2017-11-01 12:00:48 -04:00
Isaac Connor 445fbb06d6 clearFix so that #monitors actually has a height 2017-11-01 11:52:59 -04:00
Isaac Connor 36e13039c7 Switch to LONGTEXT FROM JSON type 2017-11-01 11:05:21 -04:00
Isaac Connor 25210b7ecf Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-11-01 09:41:22 -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 33771f92e9 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-10-31 13:32:47 -07:00
Isaac Connor 9473fbecd8 more debug 2017-10-31 13:32:42 -07:00
Isaac Connor 3deb8a35bb fixes 2017-10-30 21:38:27 -04:00
Isaac Connor b5491102ef Fix saving MontageLayouts 2017-10-30 20:21:16 -04:00
Isaac Connor 52110adfa9 update code because we are now including the entire object in the layouts array 2017-10-30 16:32:14 -04:00
Isaac Connor efe8b2db7e update code because we are now including the entire object in the layouts array 2017-10-30 16:32:03 -04:00
Isaac Connor c69e2468b0 add edit and save layout 2017-10-30 16:30:15 -04:00
Isaac Connor a6c790b374 use a shared include for the filters bar 2017-10-30 07:37:08 -07:00
Isaac Connor c16e101120 rough in add monitors import wizard 2017-10-27 20:52:08 -07:00
Isaac Connor eb48759ff8 wip 2017-10-27 13:37:51 -07:00
Isaac Connor 71222d7f2f rework how montage layouts are done, pull from db now 2017-10-27 12:06:26 -07: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 bc150574c7 wip import 2017-10-26 18:56:10 -07:00
Isaac Connor 12b611b9d5 When in live mode say Camera Offline instead of no data 2017-10-25 13:02:28 -07:00
Isaac Connor 653d213d62 Add EndTime and DiskSpace to Filters 2017-10-25 11:11:19 -07:00
Isaac Connor ea84bd1e69 add a Status Filter 2017-10-25 09:04:54 -07:00
Isaac Connor b6dde354be rename AnalysisFPS to AnalysisFPSLimit 2017-10-24 17:34:32 -07:00
Isaac Connor e9600bc5d3 add monitors.php 2017-10-24 16:25:11 -07:00
Isaac Connor ea669b4750 increase size of group edit popup 2017-10-24 16:09:12 -07:00
Isaac Connor 6905c6a1fb add CpuLoad t Servers list 2017-10-24 16:08:52 -07:00
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 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