Isaac Connor
|
68aea50ca9
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-05-15 16:19:57 -04:00 |
Isaac Connor
|
e737d90120
|
If AuthHash not set, return '' instead of php producing a warning
|
2017-05-12 09:05:14 -04:00 |
|
Isaac Connor
|
fd44ff4e60
|
Merge branch 'master' into storageareas
|
2017-05-10 13:16:08 -04:00 |
|
Isaac Connor
|
f832dd30ea
|
Merge pull request #1817 from mnoorenberghe/eslint
Add eslint configuration files extending Google's rules
|
2017-05-10 09:04:51 -04:00 |
Andrew Bauer
|
06009f3b16
|
Merge pull request #1661 from connortechnology/add_scale_to_frame_view
Add scale to frame view
|
2017-05-10 07:56:36 -05:00 |
|
Andrew Bauer
|
62d6509708
|
Merge pull request #1818 from SteveGilvarry/743-Swap_to_PNG
Swap to PNG
|
2017-05-10 07:55:07 -05:00 |
|
Isaac Connor
|
e0256c1a67
|
add local version of js files
|
2017-05-08 21:06:25 -04:00 |
|
Isaac Connor
|
9ac20999b3
|
rough in
|
2017-05-05 21:11:23 -04:00 |
|
Isaac Connor
|
7be2ee0e1b
|
add back videoEvent
|
2017-05-05 17:19:02 -04:00 |
|
Isaac Connor
|
0f5142fa19
|
bring back video popup
|
2017-05-05 17:18:48 -04:00 |
|
Isaac Connor
|
bde887fc9c
|
remove unneeded ;'s
|
2017-05-05 17:17:55 -04:00 |
Isaac Connor
|
deb1cf653a
|
fix dimensions of ptz box
|
2017-05-05 16:47:21 -04:00 |
Isaac Connor
|
cb99d709c5
|
add debug
|
2017-05-05 16:37:12 -04:00 |
|
Isaac Connor
|
64193c3368
|
turn status ajax calls to gets instead of posts
|
2017-05-05 16:18:12 -04:00 |
|
Isaac Connor
|
19b2de6d28
|
add a Download MP4 button
|
2017-05-05 15:13:25 -04:00 |
|
Isaac Connor
|
355eb1beef
|
when mouseover the thumbnail, stream the video
|
2017-05-05 14:25:25 -04:00 |
|
Isaac Connor
|
3b6cf74ed3
|
add auth_hash to ajax calls
|
2017-05-05 11:53:40 -04:00 |
|
Isaac Connor
|
9482114f95
|
add db connections to the header
|
2017-04-28 14:17:09 -04:00 |
|
Isaac Connor
|
20c699366e
|
scale is a percentage, so use the rescale function
|
2017-04-28 11:10:43 -04:00 |
|
Isaac Connor
|
df7161a4ea
|
merge some stuff I did in vueip
|
2017-04-28 10:54:20 -04:00 |
|
Isaac Connor
|
dce39bb2a9
|
Merge branch 'master' into storageareas
|
2017-04-26 15:58:17 -04:00 |
Andrew Bauer
|
1a565a47f2
|
fix skin path in export_functions
|
2017-04-26 12:17:01 -05:00 |
|
Isaac Connor
|
5a2ef571ef
|
fix scaling, zones now work. Add a Show/Hide Zones at the top
|
2017-04-24 14:47:30 -04:00 |
|
Isaac Connor
|
83ba74ad66
|
work in progress, rough in adding the svg zones to montage
|
2017-04-24 11:11:54 -04:00 |
|
Isaac Connor
|
ef6c675c6a
|
work in progress, rough in adding the svg zones to montage
|
2017-04-24 11:11:44 -04:00 |
|
Isaac Connor
|
c8855c03fc
|
don't use a submodule for video.js
|
2017-04-20 10:50:42 -04:00 |
|
Isaac Connor
|
035b464b97
|
Revert "don't use external hosted video.js or moment.js"
This reverts commit fb2f8022a7.
|
2017-04-20 10:45:51 -04:00 |
|
Isaac Connor
|
dd4b93f130
|
add submodule video.js, using release tag v5.18.4
|
2017-04-20 10:35:32 -04:00 |
|
Isaac Connor
|
fb2f8022a7
|
don't use external hosted video.js or moment.js
|
2017-04-20 10:12:47 -04:00 |
|
Isaac Connor
|
3db38eb474
|
limit points to the limits of the monitor
|
2017-04-19 16:12:12 -04:00 |
|
Isaac Connor
|
dd4ea635e8
|
remove rotate, as the video file itself has the rotate set
|
2017-04-19 13:12:15 -04:00 |
|
Isaac Connor
|
71a9763c32
|
add a comment
|
2017-04-19 10:02:31 -04:00 |
|
Isaac Connor
|
f1f54205fb
|
Merge branch 'remove_BOM' into storageareas
|
2017-04-16 09:28:35 -04:00 |
|
Isaac Connor
|
5e0012569f
|
use dos2unix to remove BOM
|
2017-04-16 09:22:37 -04:00 |
|
Isaac Connor
|
f97e074393
|
braces fixes
|
2017-04-12 16:16:56 -04:00 |
|
Isaac Connor
|
d039227f79
|
Merge branch 'master' into storageareas
|
2017-04-12 13:51:10 -04:00 |
|
Isaac Connor
|
92a2d6f4f2
|
hide the video, let's stick with jpeg's, which will be auto-generated
|
2017-04-07 13:20:28 -04:00 |
|
Isaac Connor
|
8f51331472
|
fix timeline view by using view=image instead of direct path
|
2017-04-07 13:20:04 -04:00 |
|
Isaac Connor
|
2b9a0f96d3
|
remove and break over multiple lines
|
2017-04-05 16:10:06 -04:00 |
|
Isaac Connor
|
d611840750
|
whitespace, handle NaN in limitArea
|
2017-04-05 16:09:40 -04:00 |
|
Isaac Connor
|
c5ff45922f
|
fix zone edit height
|
2017-04-05 16:09:06 -04:00 |
|
Andrew Bauer
|
a10d52a3e1
|
Merge pull request #1844 from connortechnology/fix_1812
fix Monitors filtering SQL
|
2017-04-03 20:06:39 -05:00 |
|
Isaac Connor
|
58d119d9ed
|
Merge branch 'fix_1762' into storageareas
|
2017-03-31 13:38:59 -04:00 |
|
Isaac Connor
|
514c83d3e9
|
whitespace and add a test for ->Triggers being an array
|
2017-03-31 12:01:37 -04:00 |
|
Isaac Connor
|
d3f6ab3d29
|
fix Monitors filtering SQL
|
2017-03-30 13:06:54 -04:00 |
|
Isaac Connor
|
56476a7774
|
uppercase SQL
|
2017-03-30 13:05:10 -04:00 |
|
Isaac Connor
|
4f2dcdacb4
|
update, remove styles and fix the sql for limiting monitors
|
2017-03-30 13:04:16 -04:00 |
|
Isaac Connor
|
dd4550406f
|
remove styles from montagereview and stick them in a view-specific css
|
2017-03-30 13:03:46 -04:00 |
|
Isaac Connor
|
7e3b27a130
|
Test for Controllable as well as ControlId
|
2017-03-30 10:49:02 -04:00 |
|
Isaac Connor
|
5ea77f0781
|
Make zones a link to zones_overview
|
2017-03-30 10:45:55 -04:00 |