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
|
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 |
|
Isaac Connor
|
462ea72ef5
|
properly test for existence of popupSizes
|
2017-10-02 12:43:52 -04:00 |
|
Isaac Connor
|
351d8ef24d
|
make the word bandwidth also be part of the link
|
2017-10-02 12:39:39 -04:00 |
|
Isaac Connor
|
d831f98dfb
|
remove debug
|
2017-10-02 12:31:38 -04:00 |
|
Isaac Connor
|
c7ac854cfd
|
always include classic.js
|
2017-10-02 12:30:55 -04:00 |
|
Isaac Connor
|
d8c69ab514
|
error gracefully when popupSizes not defined
|
2017-10-02 12:30:30 -04:00 |
|
Isaac Connor
|
207d57a3e6
|
use xhtmlfooter function to finish off html
|
2017-10-02 11:55:52 -04:00 |
|
Isaac Connor
|
b52944258d
|
use css skin based favicon if it exists.
|
2017-10-02 11:55:36 -04:00 |
|
Isaac Connor
|
16a731af1c
|
fix path when changing status.
|
2017-10-02 11:55:17 -04:00 |
|
Isaac Connor
|
15ba7d2a35
|
fixes
|
2017-10-02 11:25:51 -04:00 |
|
digital-gnome
|
c35face630
|
LengthTypo
|
2017-10-02 10:52:55 -04:00 |
|
Isaac Connor
|
ddb7305aab
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-10-02 09:11:55 -04:00 |
|
Isaac Connor
|
13b192a63e
|
remove title and close
|
2017-10-02 09:03:49 -04:00 |
|
Isaac Connor
|
eaf29d2024
|
add a class to the active view link to highlight it
|
2017-10-02 09:02:57 -04:00 |
|
digital-gnome
|
48a3e5eaa6
|
Move logic to .js file.
|
2017-09-30 16:35:03 -04:00 |
|
digital-gnome
|
e339b9e12a
|
Merge branch 'storageareas-Navigationfix' into storageareas-navigation
|
2017-09-30 15:09:32 -04:00 |
|
digital-gnome
|
7c72ff1fd9
|
Navigation buttons for video.ja
|
2017-09-30 14:25:00 -04:00 |
|
digital-gnome
|
0e2b7d1b52
|
End of video logic
|
2017-09-30 14:25:00 -04:00 |
|
digital-gnome
|
5f203fc813
|
JS logic for video.js navigation
|
2017-09-30 14:24:59 -04:00 |
|
Isaac Connor
|
4be133ed09
|
remove btn styles from buttons. make groups, cycle, montage, montage review non-popups. Add datetime filters to montagereview. Fix dark skin
|
2017-09-30 14:19:32 -04:00 |
|
digital-gnome
|
22af70601e
|
Convert to ampersand in filters
Querys weren't working because it was passing & instead of &. Nothing else appeared to be using these.
|
2017-09-29 21:49:58 -04:00 |
|
digital-gnome
|
5f42bf4fe5
|
Change CSS to class, add class to php
I needed the styling for the video.js buttons. The fallback mjpeg player used ids.
|
2017-09-29 21:47:52 -04:00 |
|
Isaac Connor
|
6a0da487eb
|
add Parent Group selection to Group Edit
|
2017-09-28 12:37:15 -04:00 |
|
Isaac Connor
|
03d25ef10a
|
more visually appearling code for hiding buttons. Remove cellspacing=0 on the table.
|
2017-09-27 17:32:42 -04:00 |
|
Isaac Connor
|
b5699dcac3
|
google code style
|
2017-09-26 17:14:27 -04:00 |
|
Isaac Connor
|
d69b16df24
|
add group filter to montagereview
|
2017-09-26 11:28:19 -04:00 |