Commit Graph

14804 Commits

Author SHA1 Message Date
Isaac Connor 72ba972a2a whitespace 2020-04-05 13:23:36 -04:00
Isaac Connor 9441fe833f satisfy cpplint 2020-04-05 13:23:12 -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 28e21fb0b1 Bump version to 1.34.9 2020-04-04 12:13:07 -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 38555b0dd4 strip leading and trailing " in trigger message. Accept a space instead of a + in enable/disable commands to match on/off 2020-04-04 11:08:19 -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 75e122686e
Merge pull request #2902 from hax0kartik/253-vnc
Fix a memory leak in vnc camera type
2020-03-30 13:40:57 -04:00
hax0kartik 04a6d5e42e Fix a memory leak, shift rfbClientCleanup to Terminate() 2020-03-30 10:11:42 -07:00
Isaac Connor 593ea24cc6 add libvnc dependencies for VNC monitor type 2020-03-30 12:42:27 -04:00
Isaac Connor 3117f29f71 code style and correct license. Author was contacted and ok'd the change. Fies #2883 2020-03-30 10:32:26 -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 2f0b991761 If can't determine latest stable release, then quit 2020-03-30 10:05:19 -04:00
Isaac Connor 53470ed30b
Merge pull request #2901 from hax0kartik/253-vnc
Add vnc as a camera type.
2020-03-30 08:12:47 -04:00
hax0kartik 6886b2b375 Modify Convert to scale as well 2020-03-28 15:17:19 -07:00
Kartik ba8d9ee768
Merge pull request #1 from connortechnology/libvnc
Libvnc
2020-03-28 13:09:17 -07:00
Isaac Connor b93f5d970c sws_scale directly into the image. Allocate and de-allocate sws in Prime and Close. Seems to fix scaling. 2020-03-28 16:03:52 -04:00
Isaac Connor 17a818e2fa Update group save action, using Group object methods. Fixes errors on new MariaDB 2020-03-28 11:59:32 -04:00
Isaac Connor 98598f1441 Add a warning when an email exceeds 10Mb 2020-03-28 11:59:19 -04:00
Isaac Connor e894102cb7 debug 2020-03-28 11:59:05 -04:00
Isaac Connor 38c018ed18 Add a warning when an email exceeds 10Mb 2020-03-28 11:19:06 -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
Isaac Connor 5b98ce5225 Merge branch '253-vnc' of github.com:hax0kartik/zoneminder into libvnc 2020-03-27 14:59:38 -04:00
Isaac Connor dd9c578be6 bumpv ersion to 1.35.2 2020-03-27 14:48:20 -04:00
Isaac Connor fc25a777fd Bump version for db update adding VNC Monitor Type 2020-03-27 14:47:59 -04:00
hax0kartik a781cc2c87 WIP scaling 2020-03-27 14:32:50 -04:00
hax0kartik b615eada41 Add a missing endif 2020-03-27 14:32:50 -04:00
hax0kartik d61e5e42ca Use preprocessors to ensure libvnc monitor is only built when libvnc is found 2020-03-27 14:32:50 -04:00
hax0kartik 457f3e41be Add cmake rules to check for libvnc 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