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
|
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
|
1606f7918a
|
Show ram/swap usage in bytes instead of kb. Correct title of ram vs swap.
|
2021-10-15 09:40:58 -04:00 |
|
Isaac Connor
|
5f381a244f
|
Improvements to export. Fix tar -v, should be tar --version. make table width:100% and iframe height 100%. Always show thumbnail of video. Show Id of event if no other links. generate Images frame content event if no jpegs but there is an mp4. Set timeout to infinity for generating export. Provide more feedback if it breaks. Fix ticker.
|
2021-10-14 17:56:02 -04:00 |
|
Isaac Connor
|
452d28a66b
|
Turn off useless shm display in header. Add ram and swap usage
|
2021-10-14 13:31:35 -04:00 |