Commit Graph

3413 Commits

Author SHA1 Message Date
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 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 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 e394248baf Add ajax controls to realtime change the v4l2 ctrls 2021-10-05 19:49:42 -04:00
Isaac Connor 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
Isaac Connor 03892796eb whitespace 2021-09-25 16:10:50 -04:00
Isaac Connor 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
Isaac Connor 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
Isaac Connor dd6adc08a8 Set rows on email textarea 2021-09-21 13:01:05 -04:00
Isaac Connor 7aa955abd2 Fix js error in montage review when using scaled mode. Fixes #3351 2021-09-14 10:26:17 -04:00
Peter Keresztes Schmidt 6e96cbe14a Misc: Merge ZM_HAS_V4L with ZM_HAS_V4L2 2021-09-08 00:19:08 +02:00
Isaac Connor d102732a7e add autoplay tag. Fixes #3343 2021-08-29 09:44:04 -04:00
Isaac Connor 2640791b89 spacing 2021-08-23 18:13:19 -04:00
Isaac Connor 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
Isaac Connor 68a7635d9b Only show thumbnail if Function is != None 2021-08-19 18:40:50 -04:00
Isaac Connor 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
Isaac Connor 44823e0c94 spacing remove dead code 2021-08-18 18:40:25 -04:00
Isaac Connor c12d88d874 Use canView.Snapshots for snapshot permissions instead of canView.Events 2021-08-18 10:53:59 -04:00
Isaac Connor 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
Isaac Connor 066bb891af Fix url to ajax endpoint for deleting snapshots. 2021-08-06 19:18:27 -04:00
Isaac Connor f0b2f75d91 Cleanup, split export and download functions in snapshot. 2021-08-06 19:18:02 -04:00
Isaac Connor f2a1d06f64 Snapshot exports are now flat, without frame images 2021-08-06 13:18:31 -04:00
Isaac Connor 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
Isaac Connor 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
Isaac Connor 0bcbff5dd5 Turn on export functionality for snapshots 2021-08-05 13:30:52 -04:00
Isaac Connor 821031f10e Remove some debug logging 2021-06-13 18:20:57 -04:00
Isaac Connor 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
Xulunix 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
Isaac Connor e4d3394888 fix missing namespace on warning 2021-06-02 18:35:13 -04:00
Isaac Connor 9a03c2c16a Default to UTC when no timezone set so that montagereview continues working. Fixes #3274 2021-06-02 18:35:13 -04:00
Peter Keresztes Schmidt 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
Isaac Connor 225123dd11 Allow [] characters in url to work with ipv6. Fixes #3261 2021-05-26 18:50:26 -04:00
Isaac Connor 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 6a9ed9c457 Use data-onclick instead of data-on-click-this. 2021-05-25 11:22:43 -04:00
Isaac Connor 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
Isaac Connor 1caeb67a3e fix behaviour of reverse and fast forward buttons. Fixes #3251 2021-05-22 13:39:42 -04:00
Isaac Connor e16d71b9c6 spacing, code style, code comments 2021-05-22 13:39:42 -04:00
Isaac Connor 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
Isaac Connor f6a271c90d Merge pull request #3240 from connortechnology/fix_3237
fix warnings not being displayed
2021-05-19 20:32:11 -04:00
Isaac Connor e246083be5 Add StartDateTime Attr in sort dropdown 2021-05-12 10:32:03 -04:00
Isaac Connor f3b4ccf758 Fix scaling when scale to fit 2021-05-10 11:08:16 -04:00
Isaac Connor bc11e6a95b Include pre event count in min estimated ram use 2021-05-08 15:47:29 -04:00
Isaac Connor ff0d6e8e0f remove duplicated getModal and pass fid=fid to getModal 2021-05-07 15:34:08 -04:00