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
6a9ed9c457
Use data-onclick instead of data-on-click-this.
2021-05-25 11:22:43 -04:00
f6fcc2144f
jquery.js doesn't exist, so link jquery.min.js instead
2021-05-22 13:59:32 -04:00
4c99baf725
Use data-onclick instead of data-on-click-this. Load form by id instead of passed in element. Fixes #3250
2021-05-22 13:59:10 -04:00
1caeb67a3e
fix behaviour of reverse and fast forward buttons. Fixes #3251
2021-05-22 13:39:42 -04:00
e16d71b9c6
spacing, code style, code comments
2021-05-22 13:39:42 -04:00
a4df8df5e5
Fix status of delete button when archived. Change title to say that you can't delete due to archived
2021-05-19 20:32:26 -04:00
f6a271c90d
Merge pull request #3240 from connortechnology/fix_3237
...
fix warnings not being displayed
2021-05-19 20:32:11 -04:00
e246083be5
Add StartDateTime Attr in sort dropdown
2021-05-12 10:32:03 -04:00
363b017977
If error was unauthorized, do a reload.
2021-05-12 10:32:03 -04:00
f3b4ccf758
Fix scaling when scale to fit
2021-05-10 11:08:16 -04:00
bc11e6a95b
Include pre event count in min estimated ram use
2021-05-08 15:47:29 -04:00
da8128aba1
Merge branch 'master' into add_manufacturer_model_to_monitors
2021-05-07 19:16:35 -04:00
ff0d6e8e0f
remove duplicated getModal and pass fid=fid to getModal
2021-05-07 15:34:08 -04:00
ea3bffb402
make getModal take additional query parameters
2021-05-07 15:33:49 -04:00
9e6367c7c3
look for 264 instead of x264
2021-05-06 17:33:04 -04:00
373fae2511
BadEncoder Params and PathNotEncoded are warnings, not errors
2021-05-06 11:05:05 -04:00
b8f0d90000
Put back Estimated Ram Use. Rework it to provide min/max
2021-05-06 10:17:46 -04:00
0adc2d96d6
Revert "remove estimated ram use stuff as it is no longer possible"
...
This reverts commit 2e675a338b
2021-05-06 09:54:06 -04:00
f4bbacb3f4
add VideoWriter and Codec filters so that you can't select an h265 encoder for h264 etc
2021-05-05 16:48:49 -04:00
ed97ff495b
Unhide Codec, hide OutputContainer
2021-05-05 16:48:01 -04:00
09e5c47f3e
Hide COntainer and OutputCodec options. I don't want people playing with them righ tnow.
2021-05-05 14:03:38 -04:00
2dfe66663d
Remove mjpeg and mpeg options. They don't make sense. Add classes so we can hide Encoder and OutputContainer options
2021-05-05 14:03:02 -04:00
0b6e414998
Enable/Disable Snapshots based on ZM_FEATURES_SNAPSHOTS config setting
2021-05-04 13:19:40 -04:00
24d9bfa257
Add a test for invalid characters in Path for Ffmpeg monitors
2021-05-04 10:45:27 -04:00
d92c95a420
if analysis frame doesn't exist revert back to capt
2021-05-03 15:18:35 -04:00
b70cd053d6
spacing and quotes
2021-05-02 12:43:17 -04:00
b84efac0e5
left align Server head
2021-04-28 19:00:15 -04:00
953882a6da
Dirty hack to fix up/down arrows on pagination number input
2021-04-27 16:31:25 -04:00
1dbfa0790a
web: fix eslint errors
2021-04-24 01:42:13 +02:00
f59904ea7e
Add ModectDuringPTS checkbox on Control tab
2021-04-23 14:52:29 -04:00
4d9fb5b225
Don't show live thumbnail if we do not have Stream permission. Do not show groups if not view permission. Do not make them links to montage if no stream permission
2021-04-23 09:51:38 -04:00
354a3d9f09
Add on-mouseup and on-mousedown processing
2021-04-21 12:20:06 -04:00
79cede7cac
Merge branch 'release-1.34'
2021-04-20 09:24:49 -04:00
70313ce152
Revert "Add on-mouseup and on-mousedown processing"
...
This reverts commit e0c0598e13
2021-04-19 17:15:35 -04:00
ffb2d937e1
Revert "Use on-mousedown and on-mouseup if doing continuous"
...
This reverts commit d7fa28142f
2021-04-19 17:15:20 -04:00
80835614d5
Define timeout
2021-04-19 15:49:06 -04:00
506e5f84c9
Remove getCurrentLocation label that says Longitude
2021-04-19 15:45:18 -04:00
df26c25ac9
Add continuous mouseup/down functionailty for Zoom,White,Iris,Focus
2021-04-17 16:32:06 -04:00
d598edc7df
Implement duplicate RTSPSTreamName check
2021-04-17 12:50:26 -04:00
23f1b68e8a
Merge branch 'continuous' into cont_mast
2021-04-16 11:28:10 -04:00
f3ea08c4a1
Merge branch 'continuous' into cont_mast
2021-04-16 11:27:48 -04:00
3d1b0e2724
Apply onmouseup/down to other ptz buttons
2021-04-16 11:27:08 -04:00
c880618d5f
If no button is associated with the event, assume it is a mouseup
2021-04-16 10:24:48 -04:00
e0c0598e13
Add on-mouseup and on-mousedown processing
2021-04-16 10:15:57 -04:00
d7fa28142f
Use on-mousedown and on-mouseup if doing continuous
2021-04-16 10:15:07 -04:00
113e495a7d
Fix margin in ptz buttons
2021-04-14 14:00:24 -04:00
24cfc8583f
Include auth relay in getNavBar request. COOKIES will expire so we need this.
2021-04-14 13:00:16 -04:00
3921231cd5
Use some styles for user view to split it into two columns
2021-04-12 16:00:11 -04:00
04cc8ed34f
Split user info into two columns
2021-04-12 15:59:31 -04:00
f3773a89ad
Add Snpahot permission
2021-04-12 15:59:31 -04:00
f59a72a638
Use Snapshots permission instead of Events permission for Snapshots
2021-04-12 15:59:31 -04:00
7e579fd851
Implement Snapshots user permission
2021-04-12 15:59:31 -04:00
a07374e206
Fix password getting unset in global user object. Add Snapshots to user permissions
2021-04-12 15:59:31 -04:00
a3078d61f7
Default monitor filter bar to showing. Remove container-fluid which was adding padding at right and left. It should go elsewhere if needed.
2021-04-12 15:59:31 -04:00
ed29021179
Rough in an importance setting in monitor that we can use to decrease the log level of certain events like PrimeCapture for cameras that we don't care about
2021-04-11 12:59:18 -04:00
64ab6dff95
fix missing )
2021-04-10 18:16:59 -04:00
1ccb8d7aef
Include Event Summaries when loading Monitors
2021-04-09 19:46:57 -04:00
2b1e0df6be
FIx auth= not getting updated
2021-04-09 18:46:41 -04:00
492a352bed
Use updated auth_hash when sending alarm requests
2021-04-09 18:33:32 -04:00
73082a2d33
Remove the H264/X264 from the dropdown labels. Could be H265 or other
2021-04-01 11:53:57 -04:00
ba9acd3037
Add test for no encoder settings
2021-04-01 11:53:57 -04:00
80e5076d2a
cache bust jquery and bootstrap
2021-03-31 18:27:43 -04:00
790cdf879a
Add D1-PAL resolution
2021-03-31 11:05:17 -04:00
3d01008510
use json_encode($User) instead of specific elements. For some reason $user['Id'] isn't defined for me atm.
2021-03-30 18:20:23 -04:00
78c5531357
Increase width of LabelFormat to fit our default. Incrase various number inputs to fit up/down arrows
2021-03-30 13:32:02 -04:00
e9641938f0
Fix eslint
2021-03-27 18:25:04 -04:00
96e641b381
handle if error message doesn't exist
2021-03-27 13:42:00 -04:00
4ee3380e3a
If auth is not turned on, redirect to console
2021-03-27 13:41:49 -04:00
4e9a5cff8e
Style MaxImageBufferCount
2021-03-26 17:02:38 -04:00
8e1b2ccbc7
Add MaxImageBufferCount
2021-03-26 17:02:17 -04:00
2e675a338b
remove estimated ram use stuff as it is no longer possible
2021-03-26 14:31:18 -04:00
badb1c6131
Add MaxImageBufferCount, remove estimated ram us
2021-03-26 14:31:04 -04:00
c78e6a7cc7
Fix scroll bars on options view
2021-03-26 08:16:15 -04:00
4fab9fe458
fix error due to missing columns
2021-03-25 17:29:35 -04:00
37a8f007c8
remove unised function
2021-03-23 13:53:25 -04:00
16b33536ed
Turn off second Log in header
2021-03-22 17:49:59 -04:00
1dc32a0eed
Use getBodyTopHTML so that we get error reporting
2021-03-22 13:00:08 -04:00
c7b22dae81
get rid of nextId entirely. Don't want to use it anywhere other than setting the name
2021-03-22 12:07:23 -04:00
613ed1faf2
Update estimated ram use when we use the dropdown to change resolution
2021-03-22 12:06:48 -04:00
be653980f3
fix eslint
2021-03-21 18:17:13 -04:00
858ae8b11f
fix alignment and min width of datetime column in logs view
2021-03-21 18:17:13 -04:00
Isaac Connor
Isaac Connor
Peter Keresztes Schmidt
Steven Gilvarry
Xulunix
root