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
|
3e550e1461
|
remove "Actual" key from ru lang file since that word is too common.
|
2017-05-10 07:59:04 -05:00 |
|
Andrew Bauer
|
ef6a3b63af
|
Merge branch 'Ru_Translation' of https://github.com/IDDQDesnik/ZoneMinder into IDDQDesnik-Ru_Translation
|
2017-05-10 07:58:31 -05: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 |
|
Andrew Bauer
|
e6c60737e9
|
Merge pull request #1756 from SteveGilvarry/zmf_goodbye
Remove zmf
|
2017-05-10 07:07:22 -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
|
e45316dcd1
|
add debugging
|
2017-05-05 17:53:03 -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
|
fe532ac945
|
make args not required
|
2017-05-05 17:17:39 -04:00 |
Isaac Connor
|
1b0a03c723
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-05-05 16:52:38 -04:00 |
Isaac Connor
|
fd90de5952
|
if no AuthHashGEneratedAt then generate one instead of outputting an error
|
2017-05-05 16:47:50 -04:00 |
|
Isaac Connor
|
deb1cf653a
|
fix dimensions of ptz box
|
2017-05-05 16:47:21 -04:00 |
|
Isaac Connor
|
f66b606e34
|
use isset
|
2017-05-05 16:40:05 -04:00 |
|
Isaac Connor
|
92854f5cba
|
more debug
|
2017-05-05 16:37:30 -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
|
1ff367373f
|
use ZM_AUTH_HASH_SECRET for the key, not the secret
|
2017-05-05 16:15:34 -04:00 |
|
Isaac Connor
|
a0e4e6537e
|
prefer key based tokens over session
|
2017-05-05 16:11:40 -04:00 |
|
Isaac Connor
|
0982c9fdec
|
add Debug lines
|
2017-05-05 16:00:52 -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
|
cccc3df700
|
Merge branch 'master' into storageareas
|
2017-05-03 16:43:44 -04:00 |
|
Andrew Bauer
|
895f5cc7c4
|
Update CMakeLists.txt
install the other bootstrap.php file under lib/cake
|
2017-05-03 13:25:11 -05:00 |
|
Andrew Bauer
|
752959f3fc
|
Update CMakeLists.txt
typo - remove extra "/"
|
2017-05-03 12:35:54 -05:00 |
Joergen Edelbo
|
fb5668c9ef
|
Fix spelling of remSocketFile
|
2017-04-29 09:02:35 +02:00 |
|
Isaac Connor
|
1253fb1723
|
update whitespacing/braces. Add a warning when dbFetchOne is used with a column that isn't in the returned row
|
2017-04-28 14:17:36 -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
|
088fa0192b
|
Merge branch 'master' into storageareas
|
2017-04-25 10:00:14 -04:00 |
Joshua Ruehlig
|
05a141bf78
|
Update database.php
|
2017-04-24 23:40:52 -07:00 |
|
Joshua Ruehlig
|
ca1e8a13fe
|
Update database.php.default
|
2017-04-24 23:40:21 -07:00 |
|
Isaac Connor
|
4b264251ac
|
Merge branch 'zones_on_montage' into storageareas
|
2017-04-24 14:47:38 -04: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
|
23f384407e
|
blah
|
2017-04-24 14:00:47 -04:00 |
|
Isaac Connor
|
12ffa60023
|
fix applying sorting to MOnitors.
|
2017-04-24 11:13:08 -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
|
bafbdc28ed
|
update to whats in master
|
2017-04-21 14:46:40 -04:00 |
|
Isaac Connor
|
a29ec6af62
|
revert to master
|
2017-04-21 14:44:36 -04:00 |