Commit Graph

7982 Commits

Author SHA1 Message Date
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
Isaac Connor c72d34f176 fix validInt to take negative integers. Introduce validCardinal to handle positive integers 2021-10-05 19:49:42 -04:00
Isaac Connor 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
haade a0142d3896
Update translation 2021-10-05 08:15:39 +02:00
Steve Gilvarry 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
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
Andrea Vezzali 2724a238e1
Update italian (it_it) translation (#3357) 2021-09-20 14:02:35 +02:00
Isaac Connor 7aa955abd2 Fix js error in montage review when using scaled mode. Fixes #3351 2021-09-14 10:26:17 -04:00
Andrea Vezzali 3e5d377f7a
Update it_it.php 2021-09-14 15:39:53 +02:00
Andrea Vezzali 966749ff86
Update it_it.php 2021-09-14 15:16:25 +02:00
Andrea Vezzali 97c10fc135
Update it_it translation (#3350) 2021-09-13 13:28:48 +02:00
Isaac Connor 009b3ceffc Fix version of Crud 2021-09-09 13:28:25 -04:00
Isaac Connor e18f8019b0 canView takes a user object, not a string 2021-09-08 19:07:51 -04:00
Isaac Connor b2415643f6 Add missing Importance member 2021-09-08 13:57:46 -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 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
Isaac Connor 2640791b89 spacing 2021-08-23 18:13:19 -04:00
r01k 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
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 8ddec91870 Allow snapshot downloading 2021-08-18 10:53:59 -04:00
Isaac Connor 7127a944a1 Use event->canView so that events in snapshots can be exported 2021-08-18 10:53:59 -04:00
Isaac Connor 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
Isaac Connor eb1124c406 Spacing and quotes 2021-08-18 10:53:59 -04:00
Isaac Connor b9efe627f3 implement Event->canView 2021-08-18 10:53:59 -04:00
Isaac Connor 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
Isaac Connor c12d88d874 Use canView.Snapshots for snapshot permissions instead of canView.Events 2021-08-18 10:53:59 -04:00
Isaac Connor 301d8fa5fa Change monitor->canView semantics so that a specified monitorId trumps the Monitors:None setting. This is so that the console can be hidden, but the group dropdown still gets populated. 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 a311455526 clean up code logic so that if we are executing an unchanged filter we don't do the unecessary save. 2021-08-12 13:42:36 -04:00
Isaac Connor cd3359c3eb spacing. Add defaults for AutoMoveTo and AutoCopyTo so that we don't get false changes. redirect is a global, so make it so. Re-null the Id of the filter object after temp execute so that we don't reference a no longer existing filter. 2021-08-12 12:53:46 -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 672de6e84f event may have changed (have endtime set) between load and saving Archived bit. Lock the event which now also reloads it. 2021-08-06 19:15:22 -04:00