Isaac Connor
|
3feb4fcc51
|
Merge branch 'master' into master
|
2022-02-02 12:28:17 -05:00 |
Isaac Connor
|
bc4884afe5
|
fix replacement on escape. For some reason needs double bacl slash
|
2022-02-01 10:07:04 -05:00 |
|
Isaac Connor
|
462ec45a07
|
Escape newlines in config values.
|
2022-02-01 09:46:37 -05:00 |
|
Isaac Connor
|
0eb4d95d0e
|
remove geolocation copies from config to javscript land. Now all of config is brought in my skin.js.php
|
2022-01-31 18:33:03 -05:00 |
|
Isaac Connor
|
fe8747e5e7
|
Make ONVIF inputs 100%
|
2022-01-26 11:45:07 -05:00 |
Jonathan Bennett
|
57a697093e
|
Remove redundant JS define
|
2022-01-25 22:38:06 -06:00 |
|
Jonathan Bennett
|
ec9403fb6f
|
Adds Amcrest On-camera Motion Detection
|
2022-01-25 22:38:00 -06:00 |
|
Jonathan Bennett
|
d110987935
|
Fix indentation for ESLint
|
2022-01-22 13:37:44 -06:00 |
|
Jonathan Bennett
|
abbd27d1cb
|
Remove hard-coded config Vars
|
2022-01-22 13:31:47 -06:00 |
|
Jonathan Bennett
|
8125aa633b
|
Merge branch 'ZoneMinder:master' into master
|
2022-01-22 12:20:13 -06:00 |
|
Isaac Connor
|
90f75dae93
|
Make config entries const
|
2022-01-22 12:33:48 -05:00 |
|
Isaac Connor
|
3a0b88c013
|
Don't make private config entries available to js land.
|
2022-01-22 12:31:36 -05:00 |
|
Isaac Connor
|
45db266ede
|
Put full config available to javascript
|
2022-01-22 12:07:18 -05:00 |
|
Jonathan Bennett
|
2e9bda1af1
|
Add firefox specific workaround for Janus streaming
|
2022-01-21 23:21:41 -06:00 |
|
Jonathan Bennett
|
52e48c02b6
|
Add janus_path and janus_secret, allowing for more secure and flexible Janus installs
|
2022-01-21 22:23:41 -06:00 |
|
Isaac Connor
|
5ce701f5cb
|
Use Monitor->getStatusHTML to generate status html
|
2022-01-20 11:53:44 -05:00 |
|
Isaac Connor
|
91d6ff2029
|
Use Monitor->getStatusHTML to generate status html
|
2022-01-20 11:53:35 -05:00 |
|
Isaac Connor
|
57bb91e105
|
add connKey to monitorData
|
2022-01-20 11:53:05 -05:00 |
|
Isaac Connor
|
9c3509a620
|
put an mid in imageFeed id so we can use MOnitorStream.js. Use Monitor->getStatusHTML to generate status html
|
2022-01-20 11:52:54 -05:00 |
|
Isaac Connor
|
e73659843a
|
Rework to use MonitorStream.js
|
2022-01-20 11:52:01 -05:00 |
|
Isaac Connor
|
7748616992
|
If rate > 1600, limit it to 1600 to prevent logged errors
|
2022-01-20 11:51:08 -05:00 |
|
Isaac Connor
|
24a9dcbf47
|
If rate > 1600, limit it to 1600 to prevent logged errors
|
2022-01-20 11:50:53 -05:00 |
|
Isaac Connor
|
97f2c0a02b
|
Load ajaxQueue
|
2022-01-20 11:50:25 -05:00 |
|
Isaac Connor
|
db866fa668
|
Implement zm_setcookie to simplify setting cookies, set samesite, deal with older php etc. Use it.
|
2022-01-20 09:46:38 -05:00 |
|
Jonathan Bennett
|
fb832e7d1b
|
Adds janus_enable_audio, a switch to try to enable audio in live stream viewing.
|
2022-01-19 00:14:52 -06:00 |
|
Jonathan Bennett
|
688f505f28
|
Adds better error handling, changes expected location of janus.js
|
2022-01-16 19:44:52 -06:00 |
|
Jonathan Bennett
|
59056b4103
|
Refactor Montage view js -- Janus in MonitorStream
|
2022-01-15 01:33:17 -06:00 |
|
Isaac Connor
|
8d757d37a6
|
fix eslint
|
2022-01-14 16:43:59 -05:00 |
|
Jonathan Bennett
|
2beffeb1b4
|
Add Janus to Cycle view. Remove debug Alert() messages
|
2022-01-12 22:47:35 -06:00 |
|
Jonathan Bennett
|
50c824f3bb
|
Janus cleanup, adds support to the "watch" view
|
2022-01-11 21:21:58 -06:00 |
|
Jonathan Bennett
|
2729e1de22
|
Merge branch 'ZoneMinder:master' into janus
|
2022-01-11 10:37:29 -06:00 |
|
Jonathan Bennett
|
3a9c16aeea
|
First working Janus build
|
2022-01-10 23:22:37 -06:00 |
|
Isaac Connor
|
3f7e4c67a0
|
Provide better logging when there is no data passwed to setAlarmCues
|
2022-01-10 15:25:15 -05:00 |
|
Isaac Connor
|
71ff1e3cea
|
Add translates for analyse button. Fixup styles
|
2022-01-07 16:30:14 -05:00 |
|
Isaac Connor
|
a679455a0b
|
Merge branch 'master' into merge_work_on_zms
|
2022-01-07 16:22:51 -05:00 |
|
Isaac Connor
|
deaff43f66
|
use let/const
|
2022-01-07 16:22:24 -05:00 |
|
Isaac Connor
|
8f372e6a6c
|
Add useful title to frame image telling us which we are looking at
|
2022-01-07 16:22:11 -05:00 |
|
Isaac Connor
|
038bff0df2
|
Add analyse button
|
2022-01-07 16:06:53 -05:00 |
|
Isaac Connor
|
1a3bee102f
|
analyze->analyse, fixup how we show enabled/disabled and start with analysis frame displayed
|
2022-01-07 16:06:38 -05:00 |
|
Isaac Connor
|
7219809364
|
Add CMD_ANALYZE_ON/OFF
|
2022-01-07 14:00:36 -05:00 |
|
Isaac Connor
|
c914f00126
|
browser doesn't seem to like step=0.01
add analyze_frames button handling and update to jquery instead of mootools styles
|
2022-01-07 13:59:45 -05:00 |
|
Jonathan Bennett
|
1333d8c751
|
Adds ONVIF Motion Detection Support
|
2022-01-06 16:45:15 -06:00 |
|
Isaac Connor
|
e7a33a3dbe
|
Add Importance to monitors view
|
2021-12-28 13:51:47 -05:00 |
|
Isaac Connor
|
46b95e28ec
|
Fix commas
|
2021-12-28 13:51:36 -05:00 |
|
Isaac Connor
|
87962a3723
|
Invert Importance so that Normal is the auto-selected first value
|
2021-12-28 13:48:37 -05:00 |
|
Isaac Connor
|
bdcb7950cd
|
Fix export from event view due to conflict with function name in skin.js
|
2021-12-26 11:51:32 -05:00 |
|
Isaac Connor
|
80166a1ab5
|
Fix preset labels not being populated and causing javascript errors when they are.
|
2021-12-22 11:25:46 -05:00 |
|
Isaac Connor
|
c081637036
|
Fixes to specifying width and height of image due to us jquery. Implement changeRate/MaxFPS. Cleanup use of auth_hash in JSON.
|
2021-12-16 16:38:15 -05:00 |
|
Isaac Connor
|
7c3ab46408
|
fix missing quote
|
2021-12-16 09:35:21 -05:00 |
|
Isaac Connor
|
8215b04fb0
|
remove padding from container in watch view so that image can go right to edge. Add 1px padding to sidebar for better visual separation.
|
2021-12-15 14:49:40 -05:00 |