Isaac Connor
|
798b4838bd
|
increase group popup height
|
2017-10-10 16:03:02 -04:00 |
|
Isaac Connor
|
3c7ef72c68
|
Merge sjc04p1fviap01.teslamotors.com:ZoneMinder into storageareas
|
2017-10-10 15:40:02 -04:00 |
Isaac Connor
|
a286b60150
|
use already loaded Storage object when lading events
|
2017-10-10 12:39:53 -07:00 |
|
Isaac Connor
|
67cb3a7d3c
|
better human_filesize function
|
2017-10-10 12:39:36 -07:00 |
|
Isaac Connor
|
aaffe475d8
|
turn off debug
|
2017-10-10 12:39:23 -07:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
45ec51ed95
|
Merge sjc04p1fviap01.teslamotors.com:ZoneMinder into storageareas
|
2017-10-10 15:15:47 -04:00 |
|
Isaac Connor
|
c7626cab94
|
fix dash
|
2017-10-10 12:15:41 -07:00 |
|
Isaac Connor
|
48d5a16253
|
Merge sjc04p1fviap01.teslamotors.com:ZoneMinder into storageareas
|
2017-10-10 15:12:14 -04:00 |
|
Isaac Connor
|
7f50a13074
|
add Event disk space recalc to zmaudit
|
2017-10-10 12:11:59 -07:00 |
|
Isaac Connor
|
8ea335d45e
|
whitespace
|
2017-10-10 15:08:24 -04: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
|
9cbcc43e3d
|
Merge sjc04p1fviap02.teslamotors.com:ZoneMinder into storageareas
|
2017-10-10 13:41:32 -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
|
a9d3be549f
|
try caching storage
|
2017-10-10 10:39:17 -07:00 |
|
Isaac Connor
|
76d37d4c95
|
update db record when we findout the disk space of an event
|
2017-10-10 13:02:26 -04:00 |
|
Isaac Connor
|
9f22b3ccf4
|
bump version
|
2017-10-10 12:59:26 -04:00 |
|
Isaac Connor
|
7b2163f824
|
add debug
|
2017-10-10 12:58:06 -04:00 |
|
Isaac Connor
|
6bb331b8a5
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-10-10 11:51:48 -04:00 |
|
Isaac Connor
|
7f73f0bf8c
|
do a backtrace when we ca;; generateAuthHash without open session
|
2017-10-10 11:51:35 -04:00 |
|
Isaac Connor
|
d0f0ab1afe
|
refreshparent when saving group
|
2017-10-10 11:51:11 -04: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
|
219b7e0f36
|
output failing sql
|
2017-10-08 09:13:56 -04:00 |
|
Isaac Connor
|
7b7d477ab2
|
spacing, increase debug level of discovered formats. Don't crash if device returns more than 64 formats
|
2017-10-08 09:13:37 -04:00 |
Andrew Bauer
|
e825e5d61e
|
initial commit to change color of web console systemstats (#1981)
* initial commit to change color of web console systemstats
* use css classes
|
2017-10-07 18:42:39 -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
|
d0541b0837
|
Merge pull request #27 from digital-gnome/eventnavFix
Fix nearevents path
|
2017-10-07 12:49:50 -04:00 |
|
digital-gnome
|
e23b4a0d5d
|
Fix event path
|
2017-10-07 12:42:16 -04:00 |
|
Isaac Connor
|
f230aa01ef
|
turn off debug
|
2017-10-07 11:31:48 -04:00 |
Pliable Pixels
|
a8fc832481
|
fix for monitor API edit perm (#1995)
|
2017-10-07 09:55:13 -04:00 |
|
Isaac Connor
|
df1fa97e0c
|
handle nulls in StorageId and device
|
2017-10-06 16:17: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
|
ee87b29189
|
fix new gruop not being savable
|
2017-10-05 16:12:05 -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 |
|
Isaac Connor
|
09242d72b3
|
implement alternate ports for streaming
|
2017-10-05 16:05:41 -04:00 |
|
digital-gnome
|
6952e84c01
|
Only load imageFeed if needed
|
2017-10-05 11:20:42 -04:00 |