Commit Graph

6441 Commits

Author SHA1 Message Date
Romain ODDONE 8121787ee6 make monitors table (console view) responsive 2020-05-27 10:08:08 +02:00
Isaac Connor eb41e4fb39 Fix the array for the de-interlacing options 2020-05-24 11:09:13 -04:00
Isaac Connor 85e1dcadf4 Fix the array for the de-interlacing options 2020-05-24 11:07:52 -04:00
Isaac Connor e72c357fd0 Unable to probe should not be fatal 2020-05-23 16:13:48 -04:00
Isaac Connor a9cec3ebbd spacing 2020-05-23 16:13:29 -04:00
Isaac Connor d7680e1a44 Spacing 2020-05-23 10:15:48 -04:00
Isaac Connor 46a13237b5 fix eslint errors 2020-05-22 09:28:15 -04:00
Isaac Connor 23900cbf01 fix 2020-05-21 13:34:09 -04:00
Isaac Connor 59c08410c1 Put the size of SHM in the title of the shm space used element 2020-05-21 13:32:33 -04:00
Isaac Connor ce15e1c921 remove debug, don't pass element through event handler anymore on layout ddm 2020-05-20 09:42:29 -04:00
Isaac Connor cc04ced406 load zmMontageLayout ddm explicitly instead of passing event element 2020-05-20 09:42:06 -04:00
Isaac Connor 3faf20516f add changeInterface handler 2020-05-19 16:58:45 -04:00
Isaac Connor 074e270e79 populate network interfaces list, rescan on change. 2020-05-19 16:58:26 -04:00
Isaac Connor cc01a04efc remove debug, don't pass element through event handler anymore on layout ddm 2020-05-19 16:57:45 -04:00
Isaac Connor 270ab36ff4 load zmMontageLayout ddm explicitly instead of passing event element 2020-05-19 16:56:58 -04:00
Isaac Connor 3c2e26ac32 Merge branch 'release-1.34' 2020-05-15 16:02:29 -04:00
Isaac Connor 4dc693022e Failure to parse output shouldn't be fatal. Just skp to the next instead. Use json_encode instead of serialize 2020-05-15 16:02:19 -04:00
Isaac Connor 6bb2c09a72 Merge branch 'release-1.34' 2020-05-15 11:41:34 -04:00
Isaac Connor c4c4c5bcbf fix Crud submodule version 2020-05-15 11:34:34 -04:00
Isaac Connor 424a4ed0b1 add onclick to div.zoom 2020-05-15 11:34:23 -04:00
Isaac Connor 0dd426d64c handle range being set to an empty value. Fixes zoom out on timeline. Fix on-click to data-on-click 2020-05-15 11:33:10 -04:00
Isaac Connor 94b29c6c7a replace inline javascript in timeline zoom 2020-05-15 10:44:48 -04:00
Isaac Connor 992ac144a9 Fix ONVIF_User => ONVIF_Username 2020-05-13 16:04:26 -04:00
Isaac Connor 880b456d93 Rrename MetaConfig to ONVIF 2020-05-13 15:30:56 -04:00
Isaac Connor 88a910793c Spacing 2020-05-13 08:06:55 -04:00
Isaac Connor edd718afd2 xtell and ytell are data-xtell and data-ytell fixes #2932 2020-05-13 08:02:49 -04:00
Isaac Connor 807efde523 xtell and ytell are data-xtell and data-ytell fixes #2932 2020-05-13 08:01:04 -04:00
Isaac Connor 69e5feb28b Add ONVIF* to Monitor object 2020-05-12 15:47:00 -04:00
Isaac Connor c83621822f Rename Config* to ONVIF_* 2020-05-12 15:46:07 -04:00
Isaac Connor 1f3cf266a2 Merge branch 'master' of github.com:zoneminder/ZoneMinder into onvif_updated_to_upstream 2020-05-12 11:20:49 -04:00
Isaac Connor 89939efc9b Fixup my updates to the MetaConfig tab of monitor view 2020-05-12 11:15:29 -04:00
Isaac Connor 3f50277e1c Revert effort to escape column names. Not smart enough. 2020-05-12 09:21:05 -04:00
Isaac Connor eadff23465 Fix missing ) 2020-05-12 09:16:37 -04:00
Isaac Connor c5f082e7ac fix escaping column names 2020-05-12 09:06:57 -04:00
Isaac Connor 92ba017328 Spacing 2020-05-11 09:19:33 -04:00
Isaac Connor 582102c2c6 Fix use of backticks for newer mysql 2020-05-11 09:19:16 -04:00
Isaac Connor 81cd338545 Merge branch 'master' of github.com:zoneminder/ZoneMinder 2020-05-11 08:34:19 -04:00
Isaac Connor d23258cb23 Allow for backticks in sort column 2020-05-11 08:34:07 -04:00
Isaac Connor 75082064fd Merge branch 'master' of github.com:zoneminder/ZoneMinder into onvif_updated_to_upstream 2020-05-09 16:40:17 -04:00
Isaac Connor 732bb5416f Merge branch 'master' into onvif_updated 2020-05-09 16:26:29 -04:00
Isaac Connor 408da1be27 Merge branch 'release-1.34' 2020-05-08 18:46:19 -04:00
Isaac Connor 24c09a8207 Accept 0 as a value for scale meaning scale to fit 2020-05-08 17:55:12 -04:00
Isaac Connor 8195223a86 merge some php 2020-05-08 17:54:51 -04:00
Isaac Connor f1d794c11b spacing and escape sql fields 2020-05-07 13:57:37 -04:00
Isaac Connor d71de221ae If auth is turned on, add a UserId dropdown to filters 2020-05-07 11:00:50 -04:00
Isaac Connor e01538419f Add FilterUser to language 2020-05-07 10:59:50 -04:00
Isaac Connor a9a490126a Add UserId to Filter object 2020-05-07 10:59:32 -04:00
Isaac Connor 5a15701873 remove annoying () 2020-05-05 18:07:28 -04:00
Pliable Pixels dadcea4884 remove recursive from index 2020-05-05 16:35:14 -04:00
Pliable Pixels 0817ea3bfb added association method to GroupsController to get Monitor Id/Name of monitors that belong to the group 2020-05-05 16:32:54 -04:00
Isaac Connor 28a3691b9c Merge branch 'release-1.34' 2020-05-01 19:46:38 -04:00
Isaac Connor c99db3a03f Remove some hard coded sizes, spacing and typos. Convert inputs to number inputs as appropriate 2020-05-01 18:47:10 -04:00
Isaac Connor 0085e3d34f Don't warn about image for WebSite Monitors 2020-05-01 18:15:19 -04:00
Isaac Connor 683bf3f982 Handle no default set for array defaults. Fixes Warning when saving WebSite type Monitors 2020-05-01 15:32:54 -04:00
Isaac Connor 9dbeaa2c7b Add default for Orientation. Fixes saving WebSite type monitors 2020-05-01 15:32:26 -04:00
Isaac Connor 1bd340d602 spacing in watch.php 2020-05-01 13:30:00 -04:00
Isaac Connor 6dbc917215 Don't include mootools on login view. It isn't needed and apparently breaks google recaptcha 2020-05-01 13:24:47 -04:00
Isaac Connor 82188c266e Fixup Monitor->sendControlCommand. start/stop/quit should be run through zmdc.pl now instead of talking directly to zmcontrol. 2020-05-01 13:23:39 -04:00
Isaac Connor 45a445ac48 sync up index.php to master, where is a global 2020-05-01 13:21:02 -04:00
Isaac Connor ad373a5549 add Zone.php from master 2020-05-01 13:20:42 -04:00
Isaac Connor ebfae1f855 turn off debug 2020-05-01 13:17:39 -04:00
Isaac Connor e960e638b3 Remove extra value='s from PTZ buttons. Fix remaining on-click-this on numbered presets 2020-05-01 13:07:29 -04:00
Isaac Connor bd7475a450 use on-click instead of on-click-this. We can get the button from event.target. The palemoon browser doesn't have a global event object so this wasn't working 2020-05-01 13:06:15 -04:00
Isaac Connor e29c426f04 Pass event object to data-on-click events 2020-05-01 13:04:55 -04:00
Isaac Connor 89245e0d46 Add auth relay information when auth_relay is something other than hashed. 2020-05-01 13:04:37 -04:00
Isaac Connor 2da88be307 Use auth_relay instead of auth_hash if AUTH_RELAY==plain or none. 2020-05-01 13:04:16 -04:00
Isaac Connor 4c9f67eb5a Fix no redirect on login with palemoon browser 2020-05-01 13:03:56 -04:00
Isaac Connor 289045500b Don't use event as a variable name unless we are talking about window evnt. Change controlCmd to take the event and get the button from event.target 2020-05-01 13:03:35 -04:00
Isaac Connor daa08e8740 Always just default to scale from monitor 2020-05-01 13:03:17 -04:00
Isaac Connor 62ddc02d52 quotes to match master 2020-05-01 13:01:34 -04:00
Isaac Connor 830929a85f Remove extra value='s from PTZ buttons. Fix remaining on-click-this on numbered presets 2020-05-01 12:53:47 -04:00
Isaac Connor 0ed6cb7875 Remove extra value='s from PTZ buttons. Fix remaining on-click-this on numbered presets 2020-05-01 10:06:41 -04:00
Isaac Connor 8d8d37c648 fix eslint 2020-05-01 09:57:46 -04:00
Dvanderploeg 1d618136c0
Merge branch 'master' into camera_control_preset_correction 2020-04-30 22:10:54 -06:00
David van der Ploeg a952984e1c Removed value causing preset not to work
The first value field would not permit the presetGoto
command to be added as a value. The value would then use
the number as the command. Removing it allows the presets to
call the correct command.
2020-04-30 22:05:48 -06:00
Isaac Connor 4466bd9b16 Always just default to scale from monitor 2020-04-29 16:35:20 -04:00
Isaac Connor 74ab2e2e12 Don't use event as a variable name unless we are talking about window evnt. Change controlCmd to take the event and get the button from event.target 2020-04-29 16:35:04 -04:00
Isaac Connor eebd0a274d Fix no redirect on login with palemoon browser 2020-04-29 16:34:27 -04:00
Isaac Connor 8b0f88a707 Use auth_relay instead of auth_hash if AUTH_RELAY==plain or none. 2020-04-29 16:34:07 -04:00
Isaac Connor 9ec89f20d3 Add auth relay information when auth_relay is something other than hashed. 2020-04-29 16:33:41 -04:00
Isaac Connor 5e88181380 Pass event object to data-on-click events 2020-04-29 16:32:55 -04:00
Isaac Connor e78b718168 use on-click instead of on-click-this. We can get the button from event.target. The palemoon browser doesn't have a global event object so this wasn't working 2020-04-29 16:32:26 -04:00
Isaac Connor cb44f2c5de Fixup Monitor->sendControlCommand. start/stop/quit should be run through zmdc.pl now instead of talking directly to zmcontrol. 2020-04-29 16:30:59 -04:00
David van der Ploeg 83b4b6b4db Corrected zoom out button call
The zoom out button wasn't calling the correct function
of "data-on-click-this" causing the request to be ignored.
2020-04-27 21:14:58 -06:00
Isaac Connor cf3785aebf Don't include mootools on login view. It isn't needed and apparently breaks google recaptcha 2020-04-24 12:23:48 -04:00
Isaac Connor 496fd6b15a reorganize to reduce code depth 2020-04-23 18:17:20 -04:00
Isaac Connor 775b0d1ccd fix XSS in monitor Name 2020-04-23 18:16:38 -04:00
Isaac Connor bc9137bd93 defend against XSS in Monitor Name 2020-04-23 17:56:05 -04:00
Isaac Connor 0f91797d85 defend against XSS in Monitor Name 2020-04-23 17:53:54 -04:00
Isaac Connor 189d4a6f02 add Emailed status to events list 2020-04-23 17:52:18 -04:00
Isaac Connor 8be08d942a Scale must be an integer value so use '0' instead of auto 2020-04-23 17:40:42 -04:00
Isaac Connor 9d42d0e2f0 silence warning when no language is set 2020-04-23 17:38:15 -04:00
Isaac Connor b3a8ac0b2a tidy up, be more efficient and warn when language files are not found. 2020-04-23 17:37:46 -04:00
Isaac Connor d90177fb74 handle a 0 value for scale 2020-04-23 16:41:00 -04:00
Isaac Connor 56a43741c5 Handle a zero value for scale 2020-04-23 16:37:26 -04:00
Isaac Connor bf99daf494 Merge branch 'rate_dropdown' 2020-04-23 16:36:34 -04:00
Isaac Connor 5503458874 correct label_size array and add translations 2020-04-23 16:32:19 -04:00
Isaac Connor 010b230804 Fix value of auto in width dropdown. Allow a 0 value for scale. 2020-04-23 16:30:39 -04:00
Isaac Connor 8ef70f9080 defend against XSS in Monitor Name 2020-04-23 16:28:19 -04:00
Isaac Connor 25cd13f8ad When sending eventCmdReq, pass eventCmdParms since it might have been updated. 2020-04-23 16:25:35 -04:00
Isaac Connor da79f761ad add monitorStreamReplayBuffer to javascript vars. Use it to determine whether to update fast forward and reverse buttons 2020-04-23 16:17:27 -04:00
Isaac Connor 908e892d48 Merge branch 'fix_auth_timeouts' 2020-04-23 16:15:30 -04:00
Isaac Connor 81d329af2f spacing, eslint 2020-04-23 16:12:04 -04:00
Isaac Connor 5bf068791b Merge branch 'rate_dropdown' into release-1.34 2020-04-23 16:11:59 -04:00
Isaac Connor 91e78410a9 Stop the montagereview update while we reload the page 2020-04-23 16:08:36 -04:00
Isaac Connor 9a3f699644 Use a little less ram by passing by reference 2020-04-23 16:07:59 -04:00
Isaac Connor d3f2dd4d6a fix 2020-04-23 16:07:23 -04:00
Isaac Connor 7d0421a02c defend against XSS in Monitor Name 2020-04-23 16:06:44 -04:00
Isaac Connor 93a37671c2 Merge branch 'release-1.34' 2020-04-23 16:01:52 -04:00
Isaac Connor 8e2c76df61 minor code cleanup, adding monitor click event in a previous for loop instead of iterating again 2020-04-23 15:59:12 -04:00
Isaac Connor 63aaf76f0d handle a 0 value for scale as the scale to fit value 2020-04-23 15:57:42 -04:00
Isaac Connor 6a9a8f1d5f check length of returned tr array to prevent errors in js log 2020-04-23 15:55:46 -04:00
Isaac Connor 12252f1f37 defend against XSS in Monitor Name 2020-04-23 15:54:12 -04:00
Isaac Connor 7347ef4030 Handle a zero value for scale 2020-04-23 15:52:47 -04:00
Isaac Connor b7fd4e26a5 defend against XSS in Monitor Name 2020-04-23 15:51:29 -04:00
Isaac Connor bab609426d spacing in views/event.php 2020-04-23 15:47:10 -04:00
Isaac Connor 4e9f0b3463 defend against XSS in Monitor Name 2020-04-23 15:46:05 -04:00
Isaac Connor b6c1a328a8 Fix XSS from monitor Name, group Name, storage Name, server Name 2020-04-23 15:45:02 -04:00
Isaac Connor 8d2ce34149 include id in monitors dropdown so that it is searchable 2020-04-23 15:44:27 -04:00
Isaac Connor 91b1d7bbeb alter setButtonState to take either an id or an element so that we can log the missing element 2020-04-23 15:43:36 -04:00
Isaac Connor a6f5ae2601 fix cyclePlay button not working. Move SetButtonState into skin.js 2020-04-23 15:42:30 -04:00
Isaac Connor ced36a5333 remove debug and spacing 2020-04-23 15:40:35 -04:00
Isaac Connor 96774bd038 fix inline javascript in ptz buttons 2020-04-23 15:39:31 -04:00
Isaac Connor 042086b565 Extend width of ControlDevice and Address to full width 2020-04-23 15:38:40 -04:00
Isaac Connor 617b74b8bb fix botched merge 2020-04-23 15:28:38 -04:00
out a7e49bd62a update chinese translation (~ ̄▽ ̄)~ 2020-04-23 15:27:06 -04:00
Isaac Connor c0b7aad2c8 add passive to addEventListener 2020-04-23 15:23:53 -04:00
Isaac Connor 17896b656a cleanup and revert adding Event stack trace 2020-04-23 15:23:11 -04:00
Isaac Connor 54995ab0d1 handle sort_asc not being set. Handle term['val'] not being set. 2020-04-23 15:18:05 -04:00
Isaac Connor f06dc3f171 Update group save action, using Group object methods. Fixes errors on new MariaDB 2020-04-23 15:16:22 -04:00
Isaac Connor b05916fc50 Use === when testing for empty value and setting defaults 2020-04-23 15:08:01 -04:00
Isaac Connor eb26c5f798 Fix use of array_key_exists instead of property_exists 2020-04-23 15:07:28 -04:00
Isaac Connor f5bf474ba6 filter bad characters out of Monitor Name 2020-04-23 14:59:21 -04:00
Isaac Connor 6f08322f7f add ability to set a filter_regexp in the defaults for an object to have new values be altered before saving 2020-04-23 11:12:47 -04:00
Isaac Connor daff14df9b Allow users without System::View to read servers.json 2020-04-23 11:10:30 -04:00
Pliable Pixels 9b77f77ac3 better logs 2020-04-23 11:09:39 -04:00
Isaac Connor c3a80e7e40 Add MonitorId to event data returned for status request 2020-04-23 11:07:07 -04:00
Isaac Connor 59f9f37fff cleanup. Don't output errors that break json response 2020-04-23 11:06:41 -04:00
Isaac Connor e770be2e13 Merge branch 'release-1.34' 2020-04-23 10:26:16 -04:00
Isaac Connor 055c20c3cc fix eslint 2020-04-23 10:23:46 -04:00
Isaac Connor eab08783e9 Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-04-23 10:10:08 -04:00
Isaac Connor 264ba6525b Remove debug 2020-04-21 12:19:18 -04:00
Isaac Connor b384d233ae add async and defer to recaptcha load 2020-04-21 09:20:33 -04:00
Isaac Connor 543628d0ee cleanup, and add missing </ul> in the navbar when not logged in which seems to be causing the recaptcha render to fail 2020-04-21 09:20:04 -04:00
Isaac Connor d0e83fcfcb handle case where g-recaptcha-response is not in the request, due to failure to render the recaptcha 2020-04-21 09:19:29 -04:00
Isaac Connor 3e8de7dd6c Move the script include for recaptcha into the view instead of the xhtmlHeaders function. Fixes #2918 2020-04-21 08:30:42 -04:00
Isaac Connor ac017a5c72 Add support for strftimes' %r when converting to moment.js formatting 2020-04-18 17:51:34 -04:00
Isaac Connor 3700b9fcbe fix eslint 2020-04-17 11:04:07 -04:00
Isaac Connor 2194ed8b59 spacing in views/event.php 2020-04-17 09:46:10 -04:00
Isaac Connor 7d4e1fe895 Test for opening file before getting it's size. Remove some debug in view_video 2020-04-17 09:45:40 -04:00
Isaac Connor b74d8d7487 Add support for strftimes' %r when converting to moment.js formatting 2020-04-17 09:44:07 -04:00
Isaac Connor 74e5cc3066 eslint 2020-04-10 14:22:44 -04:00
Isaac Connor 6d4d925f1e Fix XSS from monitor Name, group Name, storage Name, server Name 2020-04-10 12:42:41 -04:00
Isaac Connor d99ec696b4 reorganize to reduce code depth 2020-04-10 12:21:53 -04:00
Isaac Connor bdfdc2a20c add ability to set a filter_regexp in the defaults for an object to have new values be altered before saving 2020-04-10 12:17:09 -04:00
Isaac Connor 81ed022d5a Add a filter_regexp to Monitor Name 2020-04-10 12:16:32 -04:00
Isaac Connor fb70acdf6c fix XSS in monitor Name 2020-04-10 11:32:01 -04:00
Isaac Connor 365f0240ad fix inline javascript in ptz buttons 2020-04-10 11:30:30 -04:00
Isaac Connor 4f8016cc74 spacing in watch.php 2020-04-10 11:16:11 -04:00
Isaac Connor fe96ba0a2a cleanup and revert adding Event stack trace 2020-04-10 11:14:46 -04:00
Isaac Connor da94985508 add back global servers 2020-04-10 11:14:09 -04:00
Isaac Connor 2d748091a2 handle sort_asc not being set. Handle term['val'] not being set. 2020-04-10 11:13:30 -04:00
Isaac Connor a25c3dfb5c Add MonitorId to event data returned for status request 2020-04-10 11:11:24 -04:00
Isaac Connor 45c13176dc cleanup. Don't output errors that break json response 2020-04-10 11:10:57 -04:00
Isaac Connor 85d779a624 defend against XSS in Monitor Name 2020-04-10 11:10:13 -04:00
Isaac Connor 4fe649c776 defend against XSS in Monitor Name 2020-04-10 11:10:09 -04:00
Isaac Connor 105be40ce3 fix 2020-04-10 11:09:46 -04:00
Isaac Connor c8128de673 defend against XSS in Monitor Name 2020-04-10 11:06:39 -04:00
Isaac Connor e9430d48a7 defend against XSS in Monitor Name 2020-04-10 11:06:20 -04:00
Isaac Connor aad0b9362c defend against XSS in Monitor Name 2020-04-10 11:05:48 -04:00
Isaac Connor 7473b0572a defend against XSS in Monitor Name 2020-04-10 11:05:19 -04:00
Isaac Connor 4f4e6a85f9 defend against XSS in Monitor Name 2020-04-10 11:05:12 -04:00
Isaac Connor dca12d8efa Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-04-09 20:41:44 -04:00
Isaac Connor 40d386fe6c Handle Zones without monitor 2020-04-09 20:41:34 -04:00
out c3ab03d3c8 update chinese translation (~ ̄▽ ̄)~ 2020-04-09 15:30:43 +08:00
outline da8c265945
Update with updatelangs.php 2020-04-09 12:35:02 +08:00
Isaac Connor ea8fe7b9a9 check length of returned tr array to prevent errors in js log 2020-04-06 11:59:27 -04:00
Isaac Connor d0fe1b60df Merge branch 'release-1.34' 2020-04-04 16:58:53 -04:00
Isaac Connor 210d380029 CSP must include all Servers. 2020-04-04 16:57:52 -04:00
Isaac Connor 024431808e fix onchange to data-on-change-this in width,height,scale, layout dropdowns 2020-04-04 16:57:24 -04:00
Isaac Connor 571ff260cc Merge branch 'release-1.34' 2020-04-04 16:35:09 -04:00
Isaac Connor e2cb8a656d change exportEvent to expertEvents 2020-04-04 11:53:07 -04:00
Isaac Connor 402c38725b Limit version check popups to once per hour 2020-04-04 11:52:40 -04:00
Isaac Connor 6feffe2aa9 whitespace 2020-04-04 11:51:39 -04:00
Isaac Connor 61e6627fce fix fail to update version reminder due to submit button both submitting and formSubmitting as well as view not being set to version 2020-04-04 11:48:42 -04:00
Isaac Connor f81cfc0513 add 1 month as an option to the version popup dropdown 2020-04-04 11:46:31 -04:00
Isaac Connor 2441ae2924 Improve event export a little bit. Add links to eventFrames and eventDetail html. 2020-04-03 15:34:20 -04:00
Isaac Connor 5d72e3b1b5 ensure no output buffering when downloading an archive. 2020-04-03 15:33:28 -04:00
Isaac Connor 4547332fad Move more styles into export.css. Remove content from dark/export.css and classic/export.css as it is duplicated. 2020-04-03 15:32:22 -04:00
Isaac Connor 4e58a38317 use ini_set(display_errors,0) instead of turning off errors entirely so that we still log errors, just not output them instead of json. 2020-04-03 15:21:31 -04:00
Isaac Connor ef9fbac90c Add Noscript warnings. Whitespace, improve some logic 2020-04-02 18:14:14 -04:00
Isaac Connor 1cc60f0857 fix action on cycle play button 2020-04-02 16:06:27 -04:00
Isaac Connor 87069b99b6 Fix inline-script errors on groups page referenced in #2890 2020-04-02 14:13:28 -04:00
Isaac Connor 3bfcd8eb33 Check for definition of ZM_TIMEZONE before using it. Fixes #2895 2020-04-02 14:00:36 -04:00
Isaac Connor ebac665d4d Must use namespace ZM 2020-03-31 08:54:47 -04:00
Isaac Connor 4dcba55ab6 Include Storage.php and Server.php 2020-03-31 08:53:32 -04:00
Isaac Connor 2fe0096b21 correct label_size array and add translations 2020-03-30 18:34:43 -04:00
Isaac Connor eec634c1b0 Add Source() support for VNC type 2020-03-30 10:10:06 -04:00
Isaac Connor ff061bd48e Fixup VNC input options. Remove some hard coded sizes, spacing and typos. Convert inputs to number inputs as appropriate 2020-03-30 10:09:53 -04:00
Isaac Connor 599960ef05 Update group save action, using Group object methods. Fixes errors on new MariaDB 2020-03-28 10:09:13 -04:00
hax0kartik a781cc2c87 WIP scaling 2020-03-27 14:32:50 -04:00
hax0kartik ae80b3b859 Start implementing VNC 2020-03-27 14:32:50 -04:00
Isaac Connor c3bcdcff64 Use zm_session_start instead of session_start 2020-03-27 14:30:42 -04:00
Isaac Connor 4eed0a9c29 Fix selecting layout after save by using value in session. When applying layout, if height is auto, set the img height to auto. 2020-03-27 14:30:41 -04:00
Isaac Connor 50700031b1 Use zm_session_start instead of session_start 2020-03-27 13:05:12 -04:00
Isaac Connor 1ab294e291 Fix selecting layout after save by using value in session. When applying layout, if height is auto, set the img height to auto. 2020-03-27 12:43:21 -04:00
Isaac Connor 17fbafd7de including the language files must come after auth in order to user the user's language setting 2020-03-27 11:41:04 -04:00
Isaac Connor 4ce944da23 Merge branch 'release-1.34' 2020-03-26 15:38:35 -04:00
Isaac Connor 3e55795cad Handle different command line syntax for zmcontrol.pl 2020-03-26 13:57:43 -04:00
Isaac Connor b354641df3 fix syntax errors in triggers in monitor view 2020-03-26 13:57:19 -04:00
Isaac Connor af36cc3e52 Fix starting and stopping zmcontrol processes across servers. 2020-03-26 13:57:00 -04:00
Isaac Connor 2bd805c1f1 minor code cleanup, adding monitor click event in a previous for loop instead of iterating again 2020-03-24 16:16:32 -04:00
Isaac Connor b611e2616b handle scale=auto 2020-03-24 16:15:24 -04:00
Isaac Connor e06912a995 Merge branch 'release-1.34' 2020-03-21 15:28:27 -04:00
Isaac Connor d3df0defc9 Support missing openssl_random_pseudo_bytes by using alternate functions 2020-03-21 15:28:18 -04:00
Isaac Connor 5a20ef959f Merge branch 'release-1.34' 2020-03-20 11:07:46 -04:00
Isaac Connor d7ea798c09 add modern stracktrace to log messages 2020-03-20 11:06:32 -04:00
Isaac Connor ecaaae90f3 fix streamImg loading when using applet. Also don't alter actParms as it is not a global. 2020-03-20 11:06:01 -04:00
Isaac Connor d54b2e5b21
Merge pull request #2888 from pliablepixels/mp4objdetect
Mp4 animations for objdetect
2020-03-15 10:45:52 -04:00
Pliable Pixels 921c4c5bbd don't return mp4 if objdetect is used 2020-03-14 15:00:33 -04:00
Pliable Pixels 4342506e5b fix media type allocations 2020-03-14 14:24:39 -04:00
Pliable Pixels 4d5f9f7de0 add back gif, make nomenclature consistent of objdetect_subtypes 2020-03-14 14:18:25 -04:00
Isaac Connor f8fa0340fc fix eslint 2020-03-14 09:27:07 -04:00
Pliable Pixels 9a31d545d4 replace GIF function with MP4 2020-03-14 08:08:52 -04:00
Isaac Connor 4c984c3617 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-03-10 18:47:33 -04:00
Isaac Connor 9a3127da06 Merge branch 'rate_dropdown' 2020-03-10 18:47:19 -04:00
Isaac Connor 59bd658a96 replace vjsPause with pauseCLicked. Fix behaviour with rate dropdown and reverse/pause etc. 2020-03-10 18:46:20 -04:00
Isaac Connor 84d719f2dd Merge branch 'release-1.34' into rate_dropdown 2020-03-10 16:06:11 -04:00
Pliable Pixels 49f23cb35b Added options to render objdetect, objdetectanim and objdetectimage 2020-03-10 13:51:55 -04:00
Isaac Connor 0f741d0e1c
Merge pull request #2880 from pliablepixels/1.34-dev
Add ability for image.php to render gif images
2020-03-09 16:30:15 -04:00
Pliable Pixels 38b519c8a6 better error log 2020-03-09 15:58:57 -04:00
Pliable Pixels 6bc8012e04 add support to render gif image that may be created by object detection 2020-03-09 15:56:34 -04:00
Isaac Connor 561479dd93 Merge branch 'release-1.34' 2020-03-09 14:45:00 -04:00
Isaac Connor 5fe1452a1a
Merge pull request #2879 from pliablepixels/1.34-dev
return frame IDs of snapshot and alarm frames for a specific e…
2020-03-09 14:44:41 -04:00
Isaac Connor e8553babfa remove extra spaces, fix eslint 2020-03-09 14:43:54 -04:00
Isaac Connor 3d993eef80 Fix triggers code 2020-03-09 14:39:57 -04:00
Isaac Connor a0bd602339 Use === when testing for empty value and setting defaults 2020-03-09 14:39:22 -04:00
Pliable Pixels a261efe0a7 return relative frameId, also sort score frame by lowest frame to avoid bulk frames incase score is 0 2020-03-09 12:04:40 -04:00
Pliable Pixels 3611d147e6 fix score frameID to return ID not Score 2020-03-09 11:25:07 -04:00
Pliable Pixels c5e838fa33 return global frame IDs of snapshot and alarm frames for a specific event 2020-03-09 11:09:20 -04:00
Isaac Connor f056f787c5 Merge branch 'release-1.34' 2020-03-08 17:24:06 -04:00
Isaac Connor e56976c800 Triggers cannot be null, it is '' instead 2020-03-08 17:23:48 -04:00
Isaac Connor b482993d33 Merge branch 'release-1.34' 2020-03-06 15:04:48 -05:00
Isaac Connor f0791c8118 silence warning when no language is set 2020-03-05 22:13:32 -05:00
Isaac Connor f003daa791 Merge branch 'add_enabled_to_storage' 2020-03-05 15:48:43 -05:00
Isaac Connor d30480e31e add passive to addEventListener 2020-03-05 14:10:35 -05:00
Isaac Connor 53f262a4cb Merge pull request #2870 from pliablepixels/dev
#2866 - fixes incorrect token type comparison
2020-03-04 11:31:16 -05:00
Isaac Connor d60e1a783f Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-03-04 11:22:15 -05:00
Isaac Connor 55f63e8e9d Merge branch 'fix_auth_timeouts' 2020-03-04 11:22:08 -05:00
Isaac Connor 4dae0c4609
Merge pull request #2870 from pliablepixels/dev
#2866 - fixes incorrect token type comparison
2020-03-04 11:21:48 -05:00