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
|
57bb91e105
|
add connKey to monitorData
|
2022-01-20 11:53:05 -05:00 |
|
Isaac Connor
|
e73659843a
|
Rework to use MonitorStream.js
|
2022-01-20 11:52:01 -05:00 |
|
Isaac Connor
|
24a9dcbf47
|
If rate > 1600, limit it to 1600 to prevent logged errors
|
2022-01-20 11:50:53 -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
|
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
|
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 |
|
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
|
f1db88510e
|
remove debug, fix eslint
|
2021-12-15 09:23:21 -05:00 |
|
Isaac Connor
|
e8edeab641
|
parseInt prevEventId and nextEventID to be sure that our tests for != 0 work. Also don't go to previous event if prevEventId ==0.Maybe Fixes #3390
|
2021-12-15 09:11:55 -05:00 |
|
Isaac Connor
|
f6d0274f74
|
Fix PrevCycle because monIdx was empty.
|
2021-12-14 17:05:56 -05:00 |
|
Isaac Connor
|
5d8db0a320
|
Merge cycle functionality into watch view. Add period dropdown, countdown timer, toggle the sidebar. Fix auth on statusAjax, and don't use status ajax unless we are in still mode. Apply some min-width to fps so they don't jump around. Only update their content if it has changed (fewer browser renders).
|
2021-12-10 15:34:35 -05:00 |
|
Isaac Connor
|
31a1ef6cb4
|
Move state definitions into skin.js.php because they are used in several different views. Add STATE_UNKNOWN to match of with c++ side actual values.
|
2021-12-09 12:35:42 -05:00 |
|
Isaac Connor
|
089c6044f1
|
Add layers toggle button, cleanup code by using ->canView, rename Monitor to monitor, add svg zones layer
|
2021-12-05 17:48:49 -05:00 |
|
Isaac Connor
|
82a4cbaec5
|
Fix task=>action so that deleting works. Pause streaming before delete to prevent errors being logged due to missing files
|
2021-11-29 13:49:07 -05:00 |
|
Isaac Connor
|
81ffc6df4e
|
Remove text-nowrap from cause/notes column
|
2021-11-24 12:06:13 -05:00 |
|
Isaac Connor
|
1f75b017cc
|
kill the background timer when switching to history so that we don't cause a javascript error. comment out debugging and use native javascript instead of jquery.
|
2021-11-22 14:17:50 -05:00 |
|
Isaac Connor
|
cc65c99791
|
Move init of ctx up before we setup the monitors. I think in some cases we can calls functions that assume ctx has a value. Uncaught%20TypeError%3A%20Cannot%20read%20properties%20of%20undefined%20(reading%20'getImageData')
|
2021-11-22 12:53:51 -05:00 |
|
Isaac Connor
|
7b18b22f82
|
Fix value of unknown Model
|
2021-11-17 18:58:02 -05:00 |
|
Isaac Connor
|
71c29afa7b
|
Merge branch 'master' into add_manufacturer_model_to_monitors
|
2021-11-15 09:47:34 -05:00 |
|
Isaac Connor
|
c84f42e280
|
Set to never timeout while generating video
|
2021-11-12 15:11:48 -05:00 |
|
Isaac Connor
|
795c5bb7d7
|
setScale to auto
|
2021-11-12 15:11:48 -05:00 |
|
Isaac Connor
|
ac03a88550
|
Include url_to_zms in monitorData
|
2021-11-12 15:11:48 -05:00 |
|
Isaac Connor
|
14e578cdb2
|
Implement Exit Fullscreen using same button
|
2021-11-12 15:11:48 -05:00 |
|
Isaac Connor
|
dc9f7b4d1d
|
Rough in fullscreen mode on montage
|
2021-11-12 15:11:48 -05:00 |
|
Isaac Connor
|
acff4fb9c0
|
rough in fullscreen mode in watch view
|
2021-11-12 15:11:48 -05:00 |
|
Isaac Connor
|
71931f007a
|
alert error message is an error is returned instead of rows
|
2021-11-12 15:11:48 -05:00 |
|
Isaac Connor
|
6d30f5431b
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2021-11-11 13:58:56 -05:00 |
|
Isaac Connor
|
a0215067e4
|
In multi-server when viewing an event it may be coming from a different server than the serverhost. Use monitorUrl instead of thisUrl in ajax calls and include auth data. Fixes failed ajax when viewing h264 using zms on a multi-server environment
|
2021-11-11 13:58:52 -05:00 |
|
Isaac Connor
|
721769993b
|
Set to never timeout while generating video
|
2021-11-10 17:05:46 -05:00 |
|
Isaac Connor
|
0732d4c1b3
|
setScale to auto
|
2021-11-10 14:25:29 -05:00 |
|
Isaac Connor
|
377219befe
|
Include url_to_zms in monitorData
|
2021-11-10 14:25:12 -05:00 |
|
Isaac Connor
|
5d0bd978e4
|
Implement Exit Fullscreen using same button
|
2021-11-10 14:22:05 -05:00 |
|
Isaac Connor
|
f263da8986
|
Rough in fullscreen mode on montage
|
2021-11-09 17:01:13 -05:00 |
|
Isaac Connor
|
30d4900b45
|
rough in fullscreen mode in watch view
|
2021-11-09 17:01:13 -05:00 |