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 |
Isaac Connor
|
3835087c9d
|
Merge branch 'master' into multistream
|
2022-01-18 20:16:08 -05: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 |
|
Isaac Connor
|
2a83e26fb2
|
Move Recording to General tab. Improve help links
|
2022-01-11 10:46:08 -05:00 |
|
Isaac Connor
|
4c16557192
|
When error with ajax, delay fetchImage and add logging
|
2022-01-11 10:45:40 -05:00 |
|
Isaac Connor
|
6219989884
|
replace function with appropriate Analysing/Capturing settings. Remove function popup.
|
2022-01-11 10:45:11 -05:00 |
|
Jonathan Bennett
|
3a9c16aeea
|
First working Janus build
|
2022-01-10 23:22:37 -06:00 |
|
Isaac Connor
|
fd3a70172d
|
Merge branch 'master' into multistream
|
2022-01-10 17:51:50 -05: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
|
aefed4e174
|
Merge branch 'master' into multistream
|
2022-01-05 18:03:44 -05:00 |
|
Isaac Connor
|
6bd04de5f6
|
Merge branch 'master' into multistream
|
2021-12-31 17:53:36 -05: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 |
|
Isaac Connor
|
81ffc6df4e
|
Remove text-nowrap from cause/notes column
|
2021-11-24 12:06:13 -05:00 |
|
Isaac Connor
|
46a835b28a
|
fix error when no monitors defined and we are adding one.Fixes #3385
|
2021-11-22 14:26:48 -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
|
9160ee932f
|
remove debug
|
2021-11-17 18:57:53 -05:00 |
|
Isaac Connor
|
7e1df53aa6
|
Merge branch 'master' into add_manufacturer_model_to_monitors
|
2021-11-17 13:52:53 -05:00 |
|
Isaac Connor
|
4945a016cf
|
Restore inclusion of video files in export when not including images. Fixes #3324
|
2021-11-17 11:04:28 -05:00 |
|
Isaac Connor
|
03897bf68e
|
Add privacy to options tabs so we can get back to it.
|
2021-11-16 09:49:49 -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
|
8872b8be63
|
spacing
|
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
|
a7fd65d844
|
Put SCALE_BASE in skin.js.php as it is used in many places.
|
2021-11-12 15:11:48 -05:00 |
|
Isaac Connor
|
6f3e22f2a0
|
If no bottom element is specified, take the last child of content in scaleToFit
|
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
|
caeaf91cad
|
Only list available ids if there are some
|
2021-11-12 15:11:48 -05:00 |
|
Isaac Connor
|
1561adbef9
|
Add title to Download button
|
2021-11-12 15:11:41 -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
|
2c0c257d76
|
spacing
|
2021-11-10 14:25:45 -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
|
43c1886267
|
Put SCALE_BASE in skin.js.php as it is used in many places.
|
2021-11-10 14:21:38 -05:00 |
|
Isaac Connor
|
b8f6172110
|
If no bottom element is specified, take the last child of content in scaleToFit
|
2021-11-10 14:21:12 -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 |
|
Isaac Connor
|
7abbfc2fb5
|
alert error message is an error is returned instead of rows
|
2021-11-09 13:59:14 -05:00 |
|
Isaac Connor
|
f737e3e945
|
Only list available ids if there are some
|
2021-11-06 09:58:31 -04:00 |
|
Isaac Connor
|
1fd99424bb
|
Merge branch 'master' into add_manufacturer_model_to_monitors
|
2021-11-05 10:13:41 -04:00 |
|
Isaac Connor
|
0e3f694097
|
Rename bootstrap with version so we don't have to cache bust it, so that .map loading works.
|
2021-10-31 15:19:26 -04:00 |
|
Isaac Connor
|
97164fd4d7
|
Fix use of thisUrl instead of monitorUrl when getting stream status. Fix changing stream image due to use of jquery.
|
2021-10-31 14:44:36 -04:00 |
|
Isaac Connor
|
224b34d69d
|
Send all stats rows instead of just 1. Handle receiving all rows, and don't list event id and frame id
|
2021-10-29 18:54:23 -04:00 |
|
Isaac Connor
|
1168fc52a5
|
spacing and check for permission to view the specific event instead of events in general
|
2021-10-29 18:53:23 -04:00 |
|
Isaac Connor
|
b4314e5d46
|
Remove debugging
|
2021-10-28 15:12:24 -04:00 |
|
Isaac Connor
|
fee69d3bc2
|
is no longer in existence
|
2021-10-28 10:46:50 -04:00 |
|
Isaac Connor
|
0c157904e6
|
add js to manage the generate video button
|
2021-10-28 10:46:50 -04:00 |
|
Isaac Connor
|
2a160f045d
|
Put back generate video button
|
2021-10-28 10:46:50 -04:00 |
|
Isaac Connor
|
d56de57494
|
set vertical-align:top on monitor edit labels
|
2021-10-25 16:55:23 -04:00 |
|
Isaac Connor
|
a55bd23bf6
|
Add some extra parenthesis to make sure the logic works right
|
2021-10-25 16:55:23 -04:00 |
|
Isaac Connor
|
7f573b147f
|
Continue altering monitor view to do Capturing, Analysing, Recording
|
2021-10-25 16:54:53 -04:00 |
|
Isaac Connor
|
51e77438fa
|
Add sort-name and sort-order to bootstrap table options. Also set data-remember-order=false. This allows orderings set by filters to work. Fixes #3348
|
2021-10-25 12:35:46 -04:00 |
|
Isaac Connor
|
c6eedd434c
|
Make delete dialog disappear on success. Fixes #3377
|
2021-10-22 20:59:04 -04:00 |
|
Isaac Connor
|
d1596dee02
|
Fix removing uneeded checked
|
2021-10-17 19:08:12 -04:00 |
|
Isaac Connor
|
45b7c7b105
|
add Capturing, Analysing, AnalysisSource, Recording, RecordingSource, SecondPath
|
2021-10-16 20:36:19 -04:00 |
|
Isaac Connor
|
d8b51fcf38
|
add function for onchange for Capturing, Analysing, Recordin, SecondPath
|
2021-10-16 20:35:37 -04:00 |
|
Isaac Connor
|
1606f7918a
|
Show ram/swap usage in bytes instead of kb. Correct title of ram vs swap.
|
2021-10-15 09:40:58 -04:00 |