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 |
|
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
|
ea671a57f8
|
Add skip_locked and ExecuteInterval
|
2021-12-13 15:01:23 -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
|
1f78776093
|
Don't change colour of dot to warning when not Enabled and not doing analysis. Add reason to the dot
|
2021-12-06 09:48:44 -05:00 |
|
Isaac Connor
|
7b66d751d8
|
cleanup, spacing, use zone object methods to clean up svg zone layers
|
2021-12-05 17:49:24 -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
|
76c4560c25
|
put svg zone styles in one files that can be included where needed
|
2021-12-05 17:46:25 -05:00 |
|
Isaac Connor
|
e6a12d20c6
|
Add svg syles and rename imageFeed to videoFeed
|
2021-12-05 17:45:54 -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
|
21218491f7
|
Add EventStartCommand and EventEndCommand to monitors ui
|
2021-11-26 19:22:07 -05:00 |
|
Isaac Connor
|
a1bf8f7f5b
|
Fix NULL and add special 0 case for Storage area specification in filter
|
2021-11-26 10:35:15 -05:00 |