Commit Graph

14818 Commits

Author SHA1 Message Date
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
hax0kartik 23205cd07f WIP scaling 2020-03-27 11:15:15 -07:00
Isaac Connor a555e09cad Bump version to 1.34.8. Please note that the lack of zm-update-1.34.8.sql is intentional. It is not needed as there are no db updates 2020-03-27 13:15:11 -04:00
Isaac Connor bfa08c3422 MOstly spaces and quotes, remove duplicated db version update and only prepare the sth once. 2020-03-27 13:06:10 -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 c880793fdc bump version to 1.34.7 2020-03-26 15:34:36 -04:00
Isaac Connor b63ec0abd7 Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-03-26 15:11:56 -04:00
Isaac Connor bc950c9a34 Remove <set> and <map> as they are not used 2020-03-26 15:11:39 -04:00
Isaac Connor 79ad2ec87d better debug logging for SLOWFWD and SLOWREV listing new frame_id 2020-03-26 15:08:32 -04:00
Isaac Connor e98f422730 Use %d for values that are actually integer in debug statements 2020-03-26 15:04:28 -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 45299955a1 Fix SLOW FWD not working 2020-03-26 12:21:42 -04:00
Pliable Pixels cf6b24b432 add ES status to telemetry and --show option to display what is being sent to ZM 2020-03-26 12:11:00 -04:00
hax0kartik eed45ae66c Fix 2892 2020-03-26 12:08:44 -04:00
Isaac Connor ea7bea4c6e fix warnings because length() returns long unsigned int, but gnutls_datum_t size is unsigned int. 2020-03-26 12:08:21 -04:00
Isaac Connor a5ec89ab1b use bool instead of my_bool to fix #2886 2020-03-26 12:07:58 -04:00
Isaac Connor cbda9848ab Fix SLOW FWD not working 2020-03-26 12:06:07 -04:00
hax0kartik 8f5a3c1bf2 Add a missing endif 2020-03-26 00:52:34 -07:00
hax0kartik 156728c9b6 Use preprocessors to ensure libvnc monitor is only built when libvnc is found 2020-03-26 00:08:00 -07:00
hax0kartik 5b1409d8df Add cmake rules to check for libvnc 2020-03-25 23:29:22 -07:00
hax0kartik 1d3ad05bb5 Start implementing VNC 2020-03-25 23:21:34 -07: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 adf953dcdd use bool instead of my_bool to fix #2886 2020-03-24 15:30:52 -04:00
Isaac Connor 0ecd35e1c6 fix warnings because length() returns long unsigned int, but gnutls_datum_t size is unsigned int. 2020-03-24 15:30:16 -04:00
Isaac Connor 7fcd71e684 Use fputc instead of printf for separator to be a tiny bit more efficient. Report current state when forcing alarm on 2020-03-24 15:19:16 -04:00
Isaac Connor 188b8a7f2d Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-03-24 14:57:00 -04:00
Isaac Connor 0b5ebbbe59 add focal to ubuntu builds 2020-03-24 14:56:25 -04:00
Isaac Connor 5914cf3cad
Merge pull request #2900 from hax0kartik/2892-fix
Fix issue #2892
2020-03-24 12:46:56 -04:00
hax0kartik a70ab85407 Fix 2892 2020-03-24 09:29:19 -07: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