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
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
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
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
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
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
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
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
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
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
c6eedd434c
Make delete dialog disappear on success. Fixes #3377
2021-10-22 20:59:04 -04:00
d1596dee02
Fix removing uneeded checked
2021-10-17 19:08:12 -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
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
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
e394248baf
Add ajax controls to realtime change the v4l2 ctrls
2021-10-05 19:49:42 -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
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
c7aa41502a
Fix js error in montage review when using scaled mode. Fixes #3351
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
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
03892796eb
whitespace
2021-09-25 16:10:50 -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
7aa955abd2
Fix js error in montage review when using scaled mode. Fixes #3351
2021-09-14 10:26:17 -04:00
15adc47c61
Merge branch 'master' into add_manufacturer_model_to_monitors
2021-09-10 18:24:44 -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
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
2640791b89
spacing
2021-08-23 18:13:19 -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
7127a944a1
Use event->canView so that events in snapshots can be exported
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
92a924044a
turn Save, SaveAs and Execute into submit buttons. Put Id into the form action so that it shows up in the url bar. Disable putting the form contents into the url bar in parse_rows.
2021-08-12 13:44:49 -04:00
066bb891af
Fix url to ajax endpoint for deleting snapshots.
2021-08-06 19:18:27 -04:00
f0b2f75d91
Cleanup, split export and download functions in snapshot.
2021-08-06 19:18:02 -04:00
f2a1d06f64
Snapshot exports are now flat, without frame images
2021-08-06 13:18:31 -04:00
eecf568041
Pass exportStructure around so that it can be used to put the right filename to the jpg in the html. Fix flat zips. Fix video files being included if exportMisc is true.
2021-08-06 13:18:06 -04:00
222909feb3
zmu may still output results even if it encounters errors, so continue even if we have an error return status from zmu.
2021-08-05 14:48:14 -04:00
7db25a5e1b
Continue to work even if opener isn't defined, which it isn't anymore because we got rid of popups. Fixes save button on monitorprobe.
2021-08-05 14:48:14 -04:00
acdd8bb08b
Merge script sections just to remove bytes per view.
2021-08-05 14:48:14 -04:00
0bcbff5dd5
Turn on export functionality for snapshots
2021-08-05 13:30:52 -04:00
bed41ca44b
Support specifying the export filename by passing the export_root
2021-08-05 13:30:52 -04:00
5bc9cfaa6a
Fix styling of the shutdown button
2021-08-05 13:30:52 -04:00
cb32630dc0
Update Dark Skin to fix modal being light and some other issues
...
Fixed Modal style as per post to forums, then also fixed text area and select being white. Adjusted some other colours to work better. Console hover could be better still
2021-08-01 13:33:22 +10:00
4ff4e1f780
add Manufacturer and Model dropdown/text inputs to monitor edit view
2021-07-07 09:47:55 -04:00
54f676a501
Add ManufacturerId_onchange and ModelId_onchange to hide/show the text input for custom entry
2021-07-07 09:47:32 -04:00
821031f10e
Remove some debug logging
2021-06-13 18:20:57 -04:00
af46f8cad5
Merge an old stash allowing passing an alternate buttonconfig parameter to show/get Modal
2021-06-12 12:22:15 -04:00
268da411d9
Use getStat instead of other jquery code to update the event data. Don't refresh before rename ajax finishes. Deprecate the n/a handling in getStat. Not sure why it's needed. Sync update eventData with what is returned by ajax status call. Fixes #3265
2021-06-08 16:58:51 -04:00
91892c79b1
Remove 25x and options. Browsers do not support them. Add 16x which is the max. Fixes #3284
2021-06-08 16:58:50 -04:00
2cbb24d7b9
Fixed bug in onvifprobe
...
The arguments for "/usr/bin/zmonvif-probe.pl" was always `probe 1.1,1.2 1` with the last argument always being `1` instead of the network interface name selected in the menu.
This change fixes this issue by using the selected interface name instead of the boolean return value of the `isset()` function.
2021-06-03 02:26:24 +02:00
e4d3394888
fix missing namespace on warning
2021-06-02 18:35:13 -04:00
9a03c2c16a
Default to UTC when no timezone set so that montagereview continues working. Fixes #3274
2021-06-02 18:35:13 -04:00
f2bee0704a
LocalCamera: Remove support for V4L1
...
Kernel support for Video4Linux 1 was removed in 2.6.38 (March 2011). It's time to drop support on our side.
2021-05-31 23:29:29 +02:00
4825370a7f
Apply height css to limit height of logout modal and apply overflow:auto to add a scrollbar if needed so that we don't have to scroll to logout.
2021-05-31 10:19:58 -04:00
225123dd11
Allow [] characters in url to work with ipv6. Fixes #3261
2021-05-26 18:50:26 -04:00
80800785be
Fix getting border width on firefox. Need to specify which border. Went a little further and split x and y axis borders in the maxfit2. Fixes #3249
2021-05-25 13:15:04 -04:00
Isaac Connor
Isaac Connor
Peter Keresztes Schmidt
Steven Gilvarry
Xulunix