Isaac Connor
446d3a92c5
spacing and google code style
2017-10-12 11:43:31 -07:00
Isaac Connor
78d1c1ed20
google code style and quote marks
2017-10-12 11:43:15 -07:00
Isaac Connor
e6c0add17e
add ZM_BANDWIDTH_DEFAULT
2017-10-12 12:09:05 -04:00
Isaac Connor
ac1830a40f
increase height of bandwidth popup
2017-10-12 08:54:29 -07:00
Isaac Connor
8abb8a9259
add Type to Storage
2017-10-12 07:32:48 -07:00
digital-gnome
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
digital-gnome
1c744278e7
rescale fix
...
everything rescales except the buttons.
2017-10-11 21:05:39 -04:00
digital-gnome
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
digital-gnome
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
digital-gnome
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
digital-gnome
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
Isaac Connor
798b4838bd
increase group popup height
2017-10-10 16:03:02 -04:00
Isaac Connor
c7626cab94
fix dash
2017-10-10 12:15:41 -07:00
Isaac Connor
7f50a13074
add Event disk space recalc to zmaudit
2017-10-10 12:11:59 -07:00
Isaac Connor
ffc1ac43f5
put back disk space in header, more debug in caching storagea
2017-10-10 14:06:21 -04:00
Isaac Connor
31e3a2d28d
turn off disk space reporting
2017-10-10 10:41:04 -07:00
Isaac Connor
c1ada1742b
increase function popup height
2017-10-10 10:40:40 -07:00
Isaac Connor
06c61f0324
allow periods in monitor name
2017-10-10 10:40:27 -07:00
Isaac Connor
d0f350d5b2
Merge pull request #29 from digital-gnome/alarmCues-refactor
...
Fix scaling with video.js
2017-10-10 11:09:59 -04:00
Isaac Connor
3af795264d
add actual disk space as a mouseover in nav bar
2017-10-10 10:38:13 -04:00
Isaac Connor
8da7d845b4
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-10-10 09:37:23 -04:00
Isaac Connor
c654d008f0
add monitor selector to montagereview and montage.
2017-10-10 09:36:56 -04:00
Isaac Connor
b6974ea373
Add monitor drorpdown to montagereview
2017-10-09 15:32:09 -04:00
digital-gnome
d5799cbf6f
nph-zms alarmcues
2017-10-08 22:36:15 -04:00
digital-gnome
d4d2c64974
nav buttons inactive
...
should have been this from the start
2017-10-08 21:49:34 -04:00
digital-gnome
65ce6df622
scalingfix
...
changing the scale now works with video.js and alarmcues. some whitespace fixes
2017-10-08 21:46:26 -04:00
digital-gnome
c41ef177c2
JS alarmCues
2017-10-08 21:45:05 -04:00
digital-gnome
c39cf77a9c
removealarmcuesPHP
...
removed the PHP rendering and placement code
2017-10-08 21:42:12 -04:00
Isaac Connor
d4cf84f7e6
Merge pull request #24 from digital-gnome/storageareas-featureAlarmCues
...
Storageareas feature alarm cues
2017-10-07 12:50:37 -04:00
Isaac Connor
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
Isaac Connor
69ab1b18ad
fix new gruop not being savable
2017-10-05 16:12:12 -04:00
Isaac Connor
a7e3c0b458
spacing
2017-10-05 16:11:54 -04:00
Isaac Connor
827e858feb
use a cached Storage object to prevent hitting the db al lot
2017-10-05 16:11:43 -04:00
Isaac Connor
c768e6ed88
add some more utility functions that should be available everywhere
2017-10-05 16:11:21 -04:00
digital-gnome
6952e84c01
Only load imageFeed if needed
2017-10-05 11:20:42 -04:00
Isaac Connor
b56a976d7a
fixes to montage review and cleanup in group filtering/editing
2017-10-05 10:46:04 -04:00
Isaac Connor
de03726675
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-10-05 09:35:32 -04:00
Isaac Connor
91c2e07e64
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-10-04 21:51:38 -04:00
Isaac Connor
6c87ed10c1
add a notice when javascript is turned off
2017-10-04 21:51:30 -04:00
Isaac Connor
87a49ad009
work on infinite depths of groups
2017-10-04 16:40:09 -04:00
digital-gnome
398600d5f2
Placement for alarmCues
2017-10-04 11:09:22 -04:00
digital-gnome
ea4b9486aa
alarmCues CSS
...
also function.php to load new vjs override file
2017-10-04 11:09:22 -04:00
Isaac Connor
54949db0b5
spacing/google code style
2017-10-04 10:48:37 -04:00
Isaac Connor
995809ccb7
fix play/pause while editing zone
2017-10-04 10:48:14 -04:00
digital-gnome
5bbe9b40e7
renderAlarmCues function
...
Generates the html for alarmcues and passes it to JS var
2017-10-03 19:26:48 -04:00
APHW2 MFGENG
354262c557
wip nvsocket
2017-10-03 13:28:56 -07:00
Isaac Connor
c46769495b
Merge pull request #22 from digital-gnome/storageareas-navigation
...
Storageareas navigation
2017-10-03 10:18:44 -04:00
digital-gnome
9b241ee370
Also change class
...
With the css class properly set it turns out this wasn't working.
2017-10-02 15:41:04 -04:00
digital-gnome
33a3e04f43
Fix class selector
2017-10-02 15:40:18 -04:00
Isaac Connor
72ca011e2f
fix favicon
2017-10-02 13:05:23 -04:00