Commit Graph

15112 Commits

Author SHA1 Message Date
Isaac Connor dd25cb3b4e We always build onvif 2020-05-09 17:34:15 -04:00
Isaac Connor 98a112d3c0 code style 2020-05-09 17:21:57 -04:00
Isaac Connor 1026a22e97 delete old Makefiles 2020-05-09 16:46:55 -04:00
Isaac Connor 81fe14c80f remove cruft 2020-05-09 16:45:04 -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 7938952a90 Fix botched merge in ONVIF.PM 2020-05-09 12:22:11 -04:00
Isaac Connor 8bebb2b890 fix use of printMsg 2020-05-09 11:49:02 -04:00
Isaac Connor 408da1be27 Merge branch 'release-1.34' 2020-05-08 18:46:19 -04:00
Isaac Connor f2ec6b13e6 Add focal builds 2020-05-08 18:45:21 -04:00
Isaac Connor 8d74a973fc Bump version to 1.34.12 for release 2020-05-08 18:00:49 -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 1f6e68c129 Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-05-08 17:26:02 -04:00
Isaac Connor 0412f04592 Merge branch 'release-1.34' 2020-05-08 17:25:14 -04:00
Isaac Connor f101e58480 Split db user creation and permission granting into two commands, as needed by newer mysql. Also auto-install apache rewrite module for api. 2020-05-08 17:20:41 -04:00
Isaac Connor 00c9624868 Update postinst for mysql8. Can't set permissions and create user in one line. 2020-05-08 17:17:36 -04:00
Isaac Connor 05ccdb9bed libswresample is at version 3. libavresample is 4. 2020-05-08 10:36:07 -04:00
Isaac Connor f1d794c11b spacing and escape sql fields 2020-05-07 13:57:37 -04:00
Isaac Connor 50095b3147 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-05-07 13:44:44 -04:00
Isaac Connor a798e874fe Spacing 2020-05-07 13:44:32 -04:00
Isaac Connor fcf6eb2631 Add setting the codecpar->codec_type as well. Fixes detecting stream type 2020-05-07 13:44:02 -04:00
Isaac Connor 40633830d0 Code style/spacing 2020-05-07 13:43:35 -04:00
Isaac Connor b1b258ab9b Code Style and use backtick escapes on sql column names, specifically Function 2020-05-07 13:43:05 -04:00
Isaac Connor 6939f9953a code style, merge Debug lines and consult zm_terminate in the main while loop 2020-05-07 13:41:39 -04:00
Isaac Connor 87d0eb88b7 code style, merge Debug lines and consult zm_terminate in the main while loop 2020-05-07 13:41:29 -04:00
Isaac Connor 09740d72a4 code style, merge Debug lines and consult zm_terminate in the main while loop 2020-05-07 13:41:09 -04:00
Isaac Connor 7489d66557 use is_video_stream utility function. 2020-05-07 13:40:32 -04:00
Isaac Connor 9f73a55087 Make params to is_video_* a const because we don
't alter it
2020-05-07 13:39:32 -04:00
Isaac Connor bab15217f5 Make zm_terminate available to anyone who includes zm.h 2020-05-07 13:38:56 -04:00
Isaac Connor 7643c9d375
Create SECURITY.md
Initial verison
2020-05-06 20:48:10 -04:00
Isaac Connor 5a15701873 remove annoying () 2020-05-05 18:07:28 -04:00
Isaac Connor ac31abd30c Make onvif handle no resolution graceully 2020-05-05 18:07:12 -04:00
Isaac Connor d281d2243c bump version so that Frames.Id update runs 2020-05-05 18:05:23 -04:00
Isaac Connor 30adcb7cf5 Add a db update to alter Frames.Id to a bigint 2020-05-05 18:04:24 -04:00
Isaac Connor 85eb525e8f
Merge pull request #2928 from pliablepixels/dev
added association method to GroupsController to get Monitor Id/Name o…
2020-05-05 17:15:52 -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 8243dc0b19 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-05-02 11:49:35 -04:00
Isaac Connor e9b1eacc6d Fix not finding stream with old libs 2020-05-02 11:49:28 -04:00
Isaac Connor 28a3691b9c Merge branch 'release-1.34' 2020-05-01 19:46:38 -04:00
Isaac Connor 65b8006cd6 Merge branch 'release-1.34' 2020-05-01 19:44:47 -04:00
Isaac Connor 3f680e11fa Bump version for release 2020-05-01 19:23:37 -04:00
Isaac Connor eca56c7123 Provide a more useful error message when the monitor's function is set to NONE. Fixes #2877 2020-05-01 19:21:20 -04:00
Isaac Connor ef540aa972 sun_path is defined to be 108 bytes. No need for 4095. Quiets compiler warnings 2020-05-01 19:13:50 -04:00
Joe540 c9f04c9136 Support event_close_mode for record mode
Support event_close_mode for record mode (with linked monitor)
2020-05-01 19:10:23 -04:00
Isaac Connor 6098c4c961 properly close streams and free memory in ffmpeg_input destructor 2020-05-01 19:03:18 -04:00
Isaac Connor c5cf6e1a74 undo random addition 2020-05-01 19:01:09 -04:00
Isaac Connor 050868fad1 fix build on libavtools < 12 2020-05-01 19:00:40 -04:00
Isaac Connor 9beb5cee3a use delete[] instead of delete. 2020-05-01 18:55:48 -04:00