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 |
|
Isaac Connor
|
463503b763
|
mostly comments, deal with negative timestamps
|
2017-10-09 14:58:07 -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
|
2163099d6b
|
Merge branch 'storageareas' into zma_to_thread
|
2017-10-08 09:14:04 -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 |
|
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 |
|
Isaac Connor
|
94ab00aebd
|
continue cleanup of Monitor instantiation
|
2017-10-07 11:30:41 -04:00 |
|
Isaac Connor
|
224ca30c86
|
Merge branch 'storageareas' into zma_to_thread
|
2017-10-06 17:10:28 -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 |
|
Isaac Connor
|
40972383c1
|
remove debug
|
2017-10-05 10:48:04 -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
|
20087e69e6
|
TEXT cannot have a default value
|
2017-10-04 22:22:28 -04:00 |
|
Isaac Connor
|
b2426321b0
|
increase the length of MonitorIds in Groups
|
2017-10-04 21:53:47 -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
|
8f8d66189c
|
Google code style
|
2017-10-04 10:48:24 -04:00 |
|
Isaac Connor
|
995809ccb7
|
fix play/pause while editing zone
|
2017-10-04 10:48:14 -04:00 |
|
Isaac Connor
|
42d383da6b
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-10-04 10:04:53 -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
|
c11f310f54
|
fix
|
2017-10-03 14:51:57 -07:00 |
|
APHW2 MFGENG
|
354262c557
|
wip nvsocket
|
2017-10-03 13:28:56 -07:00 |
|
Isaac Connor
|
ad1808d43b
|
warn when path doesn't exist in event::age
|
2017-10-03 13:25:05 -04:00 |
|
Isaac Connor
|
c46769495b
|
Merge pull request #22 from digital-gnome/storageareas-navigation
Storageareas navigation
|
2017-10-03 10:18:44 -04:00 |