1277e75278
Detect group hierarchy loops and break them.
2021-12-03 13:25:50 -05:00
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
21218491f7
Add EventStartCommand and EventEndCommand to monitors ui
2021-11-26 19:22:07 -05:00
a1bf8f7f5b
Fix NULL and add special 0 case for Storage area specification in filter
2021-11-26 10:35:15 -05:00
81ffc6df4e
Remove text-nowrap from cause/notes column
2021-11-24 12:06:13 -05:00
46a835b28a
fix error when no monitors defined and we are adding one.Fixes #3385
2021-11-22 14:26:48 -05:00
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
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
7b18b22f82
Fix value of unknown Model
2021-11-17 18:58:02 -05:00
9160ee932f
remove debug
2021-11-17 18:57:53 -05:00
836fe8c2b1
spacing
2021-11-17 18:57:44 -05:00
b1d881b118
Report more saving errors to ui
2021-11-17 18:57:36 -05:00
a0666e777a
Merge branch 'master' into add_manufacturer_model_to_monitors
2021-11-17 17:45:47 -05:00
c37d8eeded
spacing and report save errors
2021-11-17 17:45:38 -05:00
7e1df53aa6
Merge branch 'master' into add_manufacturer_model_to_monitors
2021-11-17 13:52:53 -05:00
4945a016cf
Restore inclusion of video files in export when not including images. Fixes #3324
2021-11-17 11:04:28 -05:00
03897bf68e
Add privacy to options tabs so we can get back to it.
2021-11-16 09:49:49 -05:00
78a803abf8
Add Model and Manufacturer to telemetry listing
2021-11-16 09:47:34 -05:00
71c29afa7b
Merge branch 'master' into add_manufacturer_model_to_monitors
2021-11-15 09:47:34 -05:00
c84f42e280
Set to never timeout while generating video
2021-11-12 15:11:48 -05:00
8872b8be63
spacing
2021-11-12 15:11:48 -05:00
795c5bb7d7
setScale to auto
2021-11-12 15:11:48 -05:00
ac03a88550
Include url_to_zms in monitorData
2021-11-12 15:11:48 -05:00
529e889d99
remove extra ,
2021-11-12 15:11:48 -05:00
14e578cdb2
Implement Exit Fullscreen using same button
2021-11-12 15:11:48 -05:00
a7fd65d844
Put SCALE_BASE in skin.js.php as it is used in many places.
2021-11-12 15:11:48 -05:00
6f3e22f2a0
If no bottom element is specified, take the last child of content in scaleToFit
2021-11-12 15:11:48 -05:00
8d0463bbff
Implement getElement, setScale in MonitorStream.js
2021-11-12 15:11:48 -05:00
98e29e7ef6
implement UrlToZMS in Monitor
2021-11-12 15:11:48 -05:00
dc9f7b4d1d
Rough in fullscreen mode on montage
2021-11-12 15:11:48 -05:00
acff4fb9c0
rough in fullscreen mode in watch view
2021-11-12 15:11:48 -05:00
71931f007a
alert error message is an error is returned instead of rows
2021-11-12 15:11:48 -05:00
944c04e5b4
Whitespace
2021-11-12 15:11:48 -05:00
9036728bdc
Report error if sql fails. Add check for access to specific event.
2021-11-12 15:11:48 -05:00
3ac5402699
Pretty up the v4l field names
2021-11-12 15:11:48 -05:00
caeaf91cad
Only list available ids if there are some
2021-11-12 15:11:48 -05:00
1561adbef9
Add title to Download button
2021-11-12 15:11:41 -05:00
193f349e38
implement Event::canEdit
2021-11-12 13:37:01 -05:00
6d30f5431b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2021-11-11 13:58:56 -05:00
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
721769993b
Set to never timeout while generating video
2021-11-10 17:05:46 -05:00
2c0c257d76
spacing
2021-11-10 14:25:45 -05:00
0732d4c1b3
setScale to auto
2021-11-10 14:25:29 -05:00
377219befe
Include url_to_zms in monitorData
2021-11-10 14:25:12 -05:00
ed84b59671
remove extra ,
2021-11-10 14:23:36 -05:00
5d0bd978e4
Implement Exit Fullscreen using same button
2021-11-10 14:22:05 -05:00
43c1886267
Put SCALE_BASE in skin.js.php as it is used in many places.
2021-11-10 14:21:38 -05:00
b8f6172110
If no bottom element is specified, take the last child of content in scaleToFit
2021-11-10 14:21:12 -05:00
474f65cff3
Implement getElement, setScale in MonitorStream.js
2021-11-10 14:20:19 -05:00
4c2d50c1f4
implement UrlToZMS in Monitor
2021-11-10 14:18:58 -05:00
f263da8986
Rough in fullscreen mode on montage
2021-11-09 17:01:13 -05:00
30d4900b45
rough in fullscreen mode in watch view
2021-11-09 17:01:13 -05:00
7abbfc2fb5
alert error message is an error is returned instead of rows
2021-11-09 13:59:14 -05:00
e617eb8615
Whitespace
2021-11-09 13:59:14 -05:00
ce81099489
Report error if sql fails. Add check for access to specific event.
2021-11-09 13:59:14 -05:00
6609c154f2
Pretty up the v4l field names
2021-11-07 11:28:34 -05:00
f737e3e945
Only list available ids if there are some
2021-11-06 09:58:31 -04:00
1fd99424bb
Merge branch 'master' into add_manufacturer_model_to_monitors
2021-11-05 10:13:41 -04:00
3208059040
Fix event listing when not paginated.
2021-11-02 17:24:05 -04:00
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
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
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
1168fc52a5
spacing and check for permission to view the specific event instead of events in general
2021-10-29 18:53:23 -04:00
b4314e5d46
Remove debugging
2021-10-28 15:12:24 -04:00
fee69d3bc2
is no longer in existence
2021-10-28 10:46:50 -04:00
0c157904e6
add js to manage the generate video button
2021-10-28 10:46:50 -04:00
2a160f045d
Put back generate video button
2021-10-28 10:46:50 -04:00
5955e4b410
add licensing info for fontawesome.
2021-10-28 10:46:50 -04:00
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
d56de57494
set vertical-align:top on monitor edit labels
2021-10-25 16:55:23 -04:00
a55bd23bf6
Add some extra parenthesis to make sure the logic works right
2021-10-25 16:55:23 -04:00
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
0c222f66ee
Add sort_asc, sort_field and limit to the filter QueryString
2021-10-25 12:34:51 -04:00
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
c6eedd434c
Make delete dialog disappear on success. Fixes #3377
2021-10-22 20:59:04 -04:00
16d0e269df
WHen saving v4l settings redirect back to watch instead of console.
2021-10-19 12:39:37 -04:00
d1596dee02
Fix removing uneeded checked
2021-10-17 19:08:12 -04:00
d960f9b6af
Fix settings being blank due to missing v4l2-ctl
2021-10-16 13:19:19 -04:00
1606f7918a
Show ram/swap usage in bytes instead of kb. Correct title of ram vs swap.
2021-10-15 09:40:58 -04:00
809cb651c0
remove debug hello
2021-10-14 17:56:16 -04:00
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
d71a5932f5
Turn off useless shm display in header. Add ram and swap usage
2021-10-14 13:33:29 -04:00
452d28a66b
Turn off useless shm display in header. Add ram and swap usage
2021-10-14 13:31:35 -04:00
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
00f9cb791c
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2021-10-13 13:43:10 -04:00
f60282eaf5
Test for existence of AutoEmail and AutoMessage. Fixes #3369 issue 2.
2021-10-13 11:58:22 -04:00
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
0ba3d863a6
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2021-10-12 12:25:01 -04:00
505f3d1b32
Merge pull request #3366 from haade-administrator/patch-1
...
Update translation
2021-10-06 09:11:22 -04:00
a465403c72
Handle when SERVER['HTTP_HOST'] is not set
2021-10-05 19:49:42 -04:00
e394248baf
Add ajax controls to realtime change the v4l2 ctrls
2021-10-05 19:49:42 -04:00
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
c72d34f176
fix validInt to take negative integers. Introduce validCardinal to handle positive integers
2021-10-05 19:49:42 -04:00
1f04723f3a
dbError is supposed to take the sql that caused the error. So pass something to satisfy php
2021-10-05 19:49:42 -04:00
a0142d3896
Update translation
2021-10-05 08:15:39 +02:00
9bbdd36252
Merge branch 'master' into add_manufacturer_model_to_monitors
2021-09-28 19:44:31 -04:00
ee65d3e3dc
add cmaeramodels route
2021-09-27 10:57:06 -04:00
fe734d4e1e
Add Manufacturer and CameraModel hasOne relationships
2021-09-27 10:56:50 -04:00
1c01936f75
add oninput methods to text inputs for new Manufacturer/Model
2021-09-26 14:47:29 -04:00
ee609ad28b
Further develop behavour when typing in text input for new manufacturer or model. If it already exists, select it.
2021-09-26 14:46:56 -04:00
dcd2c16774
Define Date formats
...
Set Locale for time to en_GB.utf8, changed STRF_FMT_DATETIME_SHORTER to %x which is locale aware short date, but does include year. Makes event table wider, not sure if that is a problem for others
2021-09-27 00:58:34 +10:00
f40e2be28a
Add an input for an Id to assign to the new monitor. List 10 available Ids.
2021-09-25 20:56:33 -04:00
43dfeb5b84
whitespace
2021-09-25 20:56:33 -04:00
92f6d3cbae
Restore the download button's behaviour. It is a simple link to the mp4, not an export. Also add a handler for the video.js rate control to sync up our non video.js rate dropdown and stored cookie.
2021-09-25 20:56:33 -04:00
6022dd59eb
Always include the download button so that we can assume that it exists in the js. So avoid console errors when no mp4.
2021-09-25 20:56:33 -04:00
4bdf965dcb
Set rows on email textarea
2021-09-25 20:56:33 -04:00
e75d5a89e9
Update italian (it_it) translation ( #3357 )
2021-09-25 20:56:33 -04:00
c7aa41502a
Fix js error in montage review when using scaled mode. Fixes #3351
2021-09-25 20:56:33 -04:00
787b7f1874
Update it_it.php
2021-09-25 20:56:33 -04:00
c4a49721d2
Update it_it.php
2021-09-25 20:56:33 -04:00
4b4152b837
Update it_it translation ( #3350 )
2021-09-25 20:56:33 -04:00
94c1b3445d
Add an input for an Id to assign to the new monitor. List 10 available Ids.
2021-09-25 20:54:35 -04:00
292b3c1d37
add an ajax request for querying the available models
2021-09-25 20:49:53 -04:00
c66489fb30
rough in api support for Models and Manufacturers
2021-09-25 20:49:30 -04:00
d98d20958c
fixup the Manufacturer and Model ddms and text inputs
2021-09-25 20:48:43 -04:00
fe72056d73
fixup populating Models dropdown after Manufacturer select
2021-09-25 20:48:14 -04:00
34d9f87d6d
remove cruft from ServersController.php
2021-09-25 20:44:16 -04:00
12783f6edf
Add manufacturers, models and servers routes
2021-09-25 20:43:53 -04:00
03892796eb
whitespace
2021-09-25 16:10:50 -04:00
2f12615f08
assign REQUEST['newMonitor'] to a variable to simplify code. Fixup ModelId and ManufacturerId saving.
2021-09-25 10:33:16 -04:00
7ca7d40b6f
Add defaults for ModelId and ManufacturerId. Fixes the methods for loading them
2021-09-25 10:32:04 -04:00
1cb9f98e9b
Restore the download button's behaviour. It is a simple link to the mp4, not an export. Also add a handler for the video.js rate control to sync up our non video.js rate dropdown and stored cookie.
2021-09-21 13:01:05 -04:00
160f775f91
Always include the download button so that we can assume that it exists in the js. So avoid console errors when no mp4.
2021-09-21 13:01:05 -04:00
dd6adc08a8
Set rows on email textarea
2021-09-21 13:01:05 -04:00
2724a238e1
Update italian (it_it) translation ( #3357 )
2021-09-20 14:02:35 +02:00
7aa955abd2
Fix js error in montage review when using scaled mode. Fixes #3351
2021-09-14 10:26:17 -04:00
3e5d377f7a
Update it_it.php
2021-09-14 15:39:53 +02:00
966749ff86
Update it_it.php
2021-09-14 15:16:25 +02:00
97c10fc135
Update it_it translation ( #3350 )
2021-09-13 13:28:48 +02:00
15adc47c61
Merge branch 'master' into add_manufacturer_model_to_monitors
2021-09-10 18:24:44 -04:00
009b3ceffc
Fix version of Crud
2021-09-09 13:28:25 -04:00
e18f8019b0
canView takes a user object, not a string
2021-09-08 19:07:51 -04:00
227e5794fa
Merge branch 'master' into add_manufacturer_model_to_monitors
2021-09-08 18:32:46 -04:00
b2415643f6
Add missing Importance member
2021-09-08 13:57:46 -04:00
6e96cbe14a
Misc: Merge ZM_HAS_V4L with ZM_HAS_V4L2
2021-09-08 00:19:08 +02:00
d102732a7e
add autoplay tag. Fixes #3343
2021-08-29 09:44:04 -04:00
dbe16a9cb4
Don't use AUTH_HASH_IPS when talking to zmu as it doesn't support that at this time.
2021-08-26 10:45:36 -04:00
2640791b89
spacing
2021-08-23 18:13:19 -04:00
79e041d0f0
Fixed bug that caused 'Call to undefined function Error()' in control_functions.php. Exception was being raised due to logger.php not being included in control_functions.php.
2021-08-20 22:42:57 -04:00
4a5bc88882
Always set image width to 100%. it should fill it's div and we will set the width of the div.
2021-08-19 18:57:00 -04:00
68a7635d9b
Only show thumbnail if Function is != None
2021-08-19 18:40:50 -04:00
7a6c244aa7
spacing. When the selected layout is not freeform, calculate the ratio of computed size to stream source size to calculate a value for scale.
2021-08-19 16:05:43 -04:00
44823e0c94
spacing remove dead code
2021-08-18 18:40:25 -04:00
8ddec91870
Allow snapshot downloading
2021-08-18 10:53:59 -04:00
7127a944a1
Use event->canView so that events in snapshots can be exported
2021-08-18 10:53:59 -04:00
ba9a871daf
Move CSP stuff down to view parsing. ajax requests only output json, so CSP shouldn't be relevant. Only end output buffer if there is one. archive view for example clears all output buffers.
2021-08-18 10:53:59 -04:00
eb1124c406
Spacing and quotes
2021-08-18 10:53:59 -04:00
b9efe627f3
implement Event->canView
2021-08-18 10:53:59 -04:00
e7e8996060
Can export events if canView Snapshots. Event->canView will filter events that are not in a snapshot
2021-08-18 10:53:59 -04:00
c12d88d874
Use canView.Snapshots for snapshot permissions instead of canView.Events
2021-08-18 10:53:59 -04:00
Isaac Connor
Isaac Connor
SzymekCRX
haade
Steve Gilvarry
Andrea Vezzali
Peter Keresztes Schmidt
r01k