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
7f565e318f
use the untaint version otherwise we die with error 9
2017-10-13 08:59:32 -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
5c7203f2bb
Fix File=> File::Find
2017-10-12 11:42:49 -07:00
e6c0add17e
add ZM_BANDWIDTH_DEFAULT
2017-10-12 12:09:05 -04:00
ad97023732
spacing
2017-10-12 08:54:43 -07: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
e16d852248
make DiskSpace be a bigint
2017-10-11 14:07:01 -04:00
e845af94cc
include params when blowing up a dbQuery
2017-10-11 14:06:18 -04:00
6b188b74c4
add usage() to generate_apache_config.pl
2017-10-11 14:05:59 -04:00
798b4838bd
increase group popup height
2017-10-10 16:03:02 -04:00
3c7ef72c68
Merge sjc04p1fviap01.teslamotors.com:ZoneMinder into storageareas
2017-10-10 15:40: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
45ec51ed95
Merge sjc04p1fviap01.teslamotors.com:ZoneMinder into storageareas
2017-10-10 15:15:47 -04:00
c7626cab94
fix dash
2017-10-10 12:15:41 -07:00
48d5a16253
Merge sjc04p1fviap01.teslamotors.com:ZoneMinder into storageareas
2017-10-10 15:12:14 -04:00
7f50a13074
add Event disk space recalc to zmaudit
2017-10-10 12:11:59 -07:00
8ea335d45e
whitespace
2017-10-10 15:08:24 -04: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
9f22b3ccf4
bump version
2017-10-10 12:59:26 -04:00
7b2163f824
add debug
2017-10-10 12:58:06 -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
digital-gnome
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor