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 |
|
Isaac Connor
|
e8cc0d8256
|
set a default on DefaultVideo
|
2017-10-02 15:43:15 -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
|
a1847aff75
|
add in new experimental nvsocket camera
|
2017-10-02 12:57:40 -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
|
b5a5f45e04
|
turn off debug
|
2017-10-02 10:06:07 -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
|
5355e0dc68
|
remove a generated file
|
2017-10-02 09:08:02 -04:00 |
|
Isaac Connor
|
0cc409c97f
|
this should have been added a long time ago.
|
2017-10-02 09:05:19 -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 |
|
digital-gnome
|
febf15812f
|
Add start times to getNearEvents
|
2017-09-29 21:44:57 -04:00 |
|
Isaac Connor
|
6a0da487eb
|
add Parent Group selection to Group Edit
|
2017-09-28 12:37:15 -04:00 |
|
Isaac Connor
|
99c602e83d
|
add ParentId to Groups, bump version
|
2017-09-28 12:23:23 -04:00 |
|
Isaac Connor
|
160a553fb9
|
Don't do csrf for frames view either. If there are a lot of frames, we run out of mem.
|
2017-09-27 17:33:06 -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
|
35482ba53c
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-09-26 16:13:51 -04:00 |
|
Isaac Connor
|
8c1cfb28a5
|
use c-style casts because they work
|
2017-09-26 16:13:26 -04:00 |
|
Isaac Connor
|
94fd113b63
|
use c-style casts because they work
|
2017-09-26 16:12:20 -04:00 |
|
Isaac Connor
|
1ba0a52769
|
remove const... which is preventing us from building on trusty
|
2017-09-26 12:53:54 -04:00 |
|
Isaac Connor
|
d69b16df24
|
add group filter to montagereview
|
2017-09-26 11:28:19 -04:00 |
|
Isaac Connor
|
bc1b770c14
|
add translation for AddNewStorage
|
2017-09-26 11:27:55 -04:00 |
|
Isaac Connor
|
766b31dc0e
|
Merge pull request #20 from digital-gnome/webfixes2
Webfixes2
|
2017-09-26 11:01:37 -04:00 |
|
Isaac Connor
|
38a4ca1a6f
|
use storageareas when outputting zone diag images
|
2017-09-26 09:33:33 -04:00 |
|
Isaac Connor
|
e277456682
|
put parenthesis back in
|
2017-09-26 09:15:54 -04:00 |