Isaac Connor
|
a9ef5bf731
|
Add STATE_UNKNOWN and correct values of other states
|
2021-12-09 12:36:03 -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
|
45559123af
|
Add numCoords, Coords, Area, AlarmRGB to Zone object. Also add Points(), AreaCoords, svg_polygon utility functions to it.
|
2021-12-05 17:45:26 -05:00 |
Isaac Connor
|
1277e75278
|
Detect group hierarchy loops and break them.
|
2021-12-03 13:25:50 -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
|
836fe8c2b1
|
spacing
|
2021-11-17 18:57:44 -05:00 |
Isaac Connor
|
b1d881b118
|
Report more saving errors to ui
|
2021-11-17 18:57:36 -05:00 |
Isaac Connor
|
a0666e777a
|
Merge branch 'master' into add_manufacturer_model_to_monitors
|
2021-11-17 17:45:47 -05:00 |
Isaac Connor
|
c37d8eeded
|
spacing and report save errors
|
2021-11-17 17:45:38 -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
|
78a803abf8
|
Add Model and Manufacturer to telemetry listing
|
2021-11-16 09:47:34 -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
|
529e889d99
|
remove extra ,
|
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
|
8d0463bbff
|
Implement getElement, setScale in MonitorStream.js
|
2021-11-12 15:11:48 -05:00 |
Isaac Connor
|
98e29e7ef6
|
implement UrlToZMS in Monitor
|
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
|
944c04e5b4
|
Whitespace
|
2021-11-12 15:11:48 -05:00 |
Isaac Connor
|
9036728bdc
|
Report error if sql fails. Add check for access to specific event.
|
2021-11-12 15:11:48 -05:00 |
Isaac Connor
|
3ac5402699
|
Pretty up the v4l field names
|
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
|
193f349e38
|
implement Event::canEdit
|
2021-11-12 13:37:01 -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
|
ed84b59671
|
remove extra ,
|
2021-11-10 14:23:36 -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
|
474f65cff3
|
Implement getElement, setScale in MonitorStream.js
|
2021-11-10 14:20:19 -05:00 |
Isaac Connor
|
4c2d50c1f4
|
implement UrlToZMS in Monitor
|
2021-11-10 14:18:58 -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
|
e617eb8615
|
Whitespace
|
2021-11-09 13:59:14 -05:00 |
Isaac Connor
|
ce81099489
|
Report error if sql fails. Add check for access to specific event.
|
2021-11-09 13:59:14 -05:00 |
Isaac Connor
|
6609c154f2
|
Pretty up the v4l field names
|
2021-11-07 11:28:34 -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
|
3208059040
|
Fix event listing when not paginated.
|
2021-11-02 17:24:05 -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
|
5955e4b410
|
add licensing info for fontawesome.
|
2021-10-28 10:46:50 -04:00 |
SzymekCRX
|
2bcad7bf5e
|
Critical bug in events.php
Two extra brackets causes fatal error in Ajax request causing 500 HTTP error and problems with listing / deleting events
|
2021-10-28 07:43:44 +02: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
|
0c222f66ee
|
Add sort_asc, sort_field and limit to the filter QueryString
|
2021-10-25 12:34:51 -04:00 |
Isaac Connor
|
8afed25d18
|
Use filter->sort_asc and sort_field which will use either the value specified in query, or defaults set in system. url params order and sort will override.
|
2021-10-25 12:34:28 -04:00 |
Isaac Connor
|
c6eedd434c
|
Make delete dialog disappear on success. Fixes #3377
|
2021-10-22 20:59:04 -04:00 |
Isaac Connor
|
16d0e269df
|
WHen saving v4l settings redirect back to watch instead of console.
|
2021-10-19 12:39:37 -04:00 |
Isaac Connor
|
d1596dee02
|
Fix removing uneeded checked
|
2021-10-17 19:08:12 -04:00 |
Isaac Connor
|
d960f9b6af
|
Fix settings being blank due to missing v4l2-ctl
|
2021-10-16 13:19:19 -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
|
809cb651c0
|
remove debug hello
|
2021-10-14 17:56:16 -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
|
d71a5932f5
|
Turn off useless shm display in header. Add ram and swap usage
|
2021-10-14 13:33:29 -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 |
Isaac Connor
|
26ac52aaa9
|
Fix scaling the image after changeScale. Limit stream scale to 100, let browser do the scaling
|
2021-10-14 13:00:49 -04:00 |
Isaac Connor
|
00f9cb791c
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2021-10-13 13:43:10 -04:00 |
Isaac Connor
|
f60282eaf5
|
Test for existence of AutoEmail and AutoMessage. Fixes #3369 issue 2.
|
2021-10-13 11:58:22 -04:00 |
Isaac Connor
|
aafec8ead6
|
Put actions and options in a div, remove hr's and style the resulting div have the borders and clearing required. Make email options 100%
|
2021-10-12 13:22:41 -04:00 |
Isaac Connor
|
0ba3d863a6
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2021-10-12 12:25:01 -04:00 |
Isaac Connor
|
505f3d1b32
|
Merge pull request #3366 from haade-administrator/patch-1
Update translation
|
2021-10-06 09:11:22 -04:00 |
Isaac Connor
|
a465403c72
|
Handle when SERVER['HTTP_HOST'] is not set
|
2021-10-05 19:49:42 -04:00 |
Isaac Connor
|
e394248baf
|
Add ajax controls to realtime change the v4l2 ctrls
|
2021-10-05 19:49:42 -04:00 |
Isaac Connor
|
94cd3a6e69
|
Use v4l2-ctrl to list the available controls and display all of them. Use range sliders where appropriate.
|
2021-10-05 19:49:42 -04:00 |