f2f2aa8720
Replay improvement and overlays
2017-10-21 22:14:46 -04:00
c6373d3dca
whitespace and jquery
2017-10-21 22:14:46 -04:00
6fba9fa65a
google code style and quotes
2017-10-20 14:54:28 -04:00
169b64813b
improve Server and Storage dropdown filters
2017-10-20 14:27:29 -04:00
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
cd476192e9
add auth hash if available
2017-10-19 17:52:09 -04:00
7090561d35
use jquery
2017-10-19 12:45:34 -07:00
7725d46808
use the same port as the stream
2017-10-19 12:45:24 -07:00
d4b0c504fe
fix Server and Storage dropdowns
2017-10-19 12:44:33 -07:00
cf2eace2c7
improve htmlSelect and add Storage and Server filters to console
2017-10-19 09:50:07 -04:00
32ba53cf1b
turn off database debugging
2017-10-18 16:37:45 -04:00
b11a514823
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-10-18 13:27:13 -04:00
c281467e69
Store server and storage filters in session. Add storage and server filters to console. WIP
2017-10-18 13:24:41 -04:00
6e63cd378f
whitespace
2017-10-18 09:44:07 -07:00
32c79f8d23
Add a disk space total to event list
2017-10-18 09:43:51 -07:00
a4fe76a7fc
fix currentTime additions, tweaks, debug
2017-10-17 11:53:58 -07:00
9b809c357b
Fix Bulk frame calculations
2017-10-17 11:53:34 -07:00
1a13157416
adjust times by client and server utc offsets
2017-10-17 10:10:53 -07:00
a0f54371ca
adjust times by client and server utc offsets
2017-10-17 10:10:48 -07:00
c363b5a190
fix some missing break lines in output
2017-10-17 10:10:20 -07:00
e31e106612
fix loading virtual frame from bulk frames
2017-10-17 10:09:30 -07:00
ba4e5572d6
add setting of values to anonymouse member function
2017-10-17 10:09:14 -07:00
92ff3d9606
Tidy up
2017-10-17 11:50:47 -04:00
4cd59611da
fix when filters are in a popup
2017-10-16 13:46:09 -07:00
340b39ad54
Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas
2017-10-16 12:21:26 -07:00
75b4de94a7
fix bad char
2017-10-16 12:21:19 -07:00
2fb0acfcc3
remove cellspacing=
2017-10-16 12:20:26 -07:00
29a50626e0
cleanup
2017-10-16 12:19:38 -07:00
87d9108290
increase width of events
2017-10-16 12:19:22 -07:00
f81bac530d
increase function popup height
2017-10-16 15:16:54 -04:00
9e1893311d
google code style
2017-10-16 15:16:33 -04:00
7ceeef55fc
rough in figuring out a frame in between bulk frames
2017-10-16 15:16:19 -04:00
6bf9e28a1e
fix use of api when auth not in use and actually specify which monitor to restart
2017-10-16 10:00:41 -07:00
2354e9679e
fix seconds calculation when mousing over
2017-10-16 12:26:58 -04:00
69c3fce87e
impose minimum size of timeline, reduce extra redraws on initial load
2017-10-16 12:03:38 -04:00
b862bfd3d2
impose minimum size of timeline, reduce extra redraws on initial load
2017-10-16 12:03:33 -04:00
5c0d8384d9
code style and quotes
2017-10-16 08:31:35 -07:00
ed92abfc76
Add Type to Storage Editing
2017-10-16 08:31:05 -07:00
345d9749ce
Add Type to Storage Editing
2017-10-16 08:31:01 -07:00
8c3c5e4d50
google code style
2017-10-15 16:52:43 -04:00
3a7eee58df
improve navigation
...
Condensed navigation if structure and added handling for crashed zms. Will now reload whatever event is next.
2017-10-15 16:49:50 -04:00
10cdbf30ea
reduce extra ajax calls
2017-10-15 16:46:58 -04:00
3a4a7ada41
progressBar conversion
...
Convert progressBar to jquery and imporove granularity and performance
2017-10-15 16:46:57 -04:00
005190ab44
Merge pull request #36 from digital-gnome/montagereview-ordering
...
MontageReview ordering
2017-10-15 15:23:40 -04:00
d523e0e3f1
remove sorting
...
Don't sort monitors on resize. Fixes labels not matching graphs
2017-10-13 19:53:25 -04:00
bc84be6008
Merge pull request #34 from digital-gnome/flat-skin-scrollbar
...
height 100 causing phantom scroll
2017-10-13 10:06:23 -04:00
590639039a
height 100 causing phantom scroll
...
Fixes phantom scrollbar in flat skin
2017-10-13 09:01:13 -04:00
48cd4cb55c
Merge pull request #33 from digital-gnome/eventvideo-div
...
move eventvideo div close
2017-10-13 06:09:34 -04:00
32f9e64a14
make evenVideo wrap just the video
2017-10-12 19:52:23 -04:00
2913b211db
move eventvideo div close
...
I think I did this. eventVideo div wasn't properly wrapping everything
2017-10-12 17:38:03 -04:00
28ef94fad0
handle an array as a Hint, fixing bandwidth option
2017-10-12 11:43:53 -07:00
446d3a92c5
spacing and google code style
2017-10-12 11:43:31 -07:00
78d1c1ed20
google code style and quote marks
2017-10-12 11:43:15 -07:00
e6c0add17e
add ZM_BANDWIDTH_DEFAULT
2017-10-12 12:09:05 -04:00
ac1830a40f
increase height of bandwidth popup
2017-10-12 08:54:29 -07:00
b96b2636bb
add the update to add Type to Storage
2017-10-12 07:50:43 -07:00
8abb8a9259
add Type to Storage
2017-10-12 07:32:48 -07:00
a1b13a2555
Merge pull request #32 from digital-gnome/navigationPlus
...
Navigation plus
2017-10-12 09:55:13 -04:00
90d3067cab
progressBar offset scope
...
fixes progressBar offset passing a reference instead of a copy by wrapping it in a function. also fixes click events endlessly adding when navigating through zms events.
2017-10-11 21:07:45 -04:00
1c744278e7
rescale fix
...
everything rescales except the buttons.
2017-10-11 21:05:39 -04:00
f702c841f5
navigation handling
...
Navigation can now handle going from videojs streams to zms. It gracefully handles deleting the last event and running out of events. zms limitations means we still can't see mp4 recordings before they are done but we don't get stuck on them anymore.
2017-10-11 21:04:45 -04:00
b9f9dd721b
initialAlarmcues arguements
...
initialAlarmcues now takes an eventId arg. Needed to reload when zms streams switch since they don't reload the page
2017-10-11 20:57:13 -04:00
99dd469a1c
alarmCues fixes
...
use evtStream for width. progressBar isn't always fully loaded in time. Combine skewNone and skewAlarm. Does a more accurate job of keeping everything in line.
2017-10-11 20:49:52 -04:00
067f8a8089
replayAll fixes
...
replayAll now handles end of events gracefully. Fixed bug where back to back continuous events or events that overlap would cause it to try to countdown all of epoch time.
2017-10-11 20:24:39 -04:00
3f01f887aa
only count event size when s3
2017-10-11 14:10:53 -04:00
e845af94cc
include params when blowing up a dbQuery
2017-10-11 14:06:18 -04:00
798b4838bd
increase group popup height
2017-10-10 16:03:02 -04:00
a286b60150
use already loaded Storage object when lading events
2017-10-10 12:39:53 -07:00
67cb3a7d3c
better human_filesize function
2017-10-10 12:39:36 -07:00
aaffe475d8
turn off debug
2017-10-10 12:39:23 -07:00
26699953bb
allow setting Storage object in the Event object so as not to go back to db for it. Fix null test in DiskSpace
2017-10-10 12:39:14 -07:00
c7626cab94
fix dash
2017-10-10 12:15:41 -07:00
7f50a13074
add Event disk space recalc to zmaudit
2017-10-10 12:11:59 -07:00
ffc1ac43f5
put back disk space in header, more debug in caching storagea
2017-10-10 14:06:21 -04:00
9cbcc43e3d
Merge sjc04p1fviap02.teslamotors.com:ZoneMinder into storageareas
2017-10-10 13:41:32 -04:00
31e3a2d28d
turn off disk space reporting
2017-10-10 10:41:04 -07:00
c1ada1742b
increase function popup height
2017-10-10 10:40:40 -07:00
06c61f0324
allow periods in monitor name
2017-10-10 10:40:27 -07:00
a9d3be549f
try caching storage
2017-10-10 10:39:17 -07:00
76d37d4c95
update db record when we findout the disk space of an event
2017-10-10 13:02:26 -04:00
6bb331b8a5
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-10-10 11:51:48 -04:00
7f73f0bf8c
do a backtrace when we ca;; generateAuthHash without open session
2017-10-10 11:51:35 -04:00
d0f0ab1afe
refreshparent when saving group
2017-10-10 11:51:11 -04:00
d0f350d5b2
Merge pull request #29 from digital-gnome/alarmCues-refactor
...
Fix scaling with video.js
2017-10-10 11:09:59 -04:00
3af795264d
add actual disk space as a mouseover in nav bar
2017-10-10 10:38:13 -04:00
8da7d845b4
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-10-10 09:37:23 -04:00
c654d008f0
add monitor selector to montagereview and montage.
2017-10-10 09:36:56 -04:00
b6974ea373
Add monitor drorpdown to montagereview
2017-10-09 15:32:09 -04:00
d5799cbf6f
nph-zms alarmcues
2017-10-08 22:36:15 -04:00
d4d2c64974
nav buttons inactive
...
should have been this from the start
2017-10-08 21:49:34 -04:00
65ce6df622
scalingfix
...
changing the scale now works with video.js and alarmcues. some whitespace fixes
2017-10-08 21:46:26 -04:00
c41ef177c2
JS alarmCues
2017-10-08 21:45:05 -04:00
c39cf77a9c
removealarmcuesPHP
...
removed the PHP rendering and placement code
2017-10-08 21:42:12 -04:00
d4cf84f7e6
Merge pull request #24 from digital-gnome/storageareas-featureAlarmCues
...
Storageareas feature alarm cues
2017-10-07 12:50:37 -04:00
d0541b0837
Merge pull request #27 from digital-gnome/eventnavFix
...
Fix nearevents path
2017-10-07 12:49:50 -04:00
e23b4a0d5d
Fix event path
2017-10-07 12:42:16 -04:00
f230aa01ef
turn off debug
2017-10-07 11:31:48 -04:00
ed3d001c65
Merge pull request #26 from digital-gnome/NPH-ZMS-loading-on-mp4
...
Only load imageFeed if needed
2017-10-05 17:09:45 -04:00
69ab1b18ad
fix new gruop not being savable
2017-10-05 16:12:12 -04:00
a7e3c0b458
spacing
2017-10-05 16:11:54 -04:00
digital-gnome
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor