Commit Graph

14818 Commits

Author SHA1 Message Date
Isaac Connor a7c28be365 change scale to fit value from auto to 0 2020-02-25 12:14:34 -05:00
Isaac Connor 8c7d2c5e1a handle a 0 value for scale 2020-02-25 12:14:07 -05:00
Isaac Connor 4dda37a6ee remove extra } 2020-02-25 12:13:12 -05:00
Isaac Connor e2ff241017 handle a 0 value for scale as the scale to fit value 2020-02-25 12:13:05 -05:00
Isaac Connor 71dd292a8d Revert "Handle a zero value for scale"
This reverts commit a5da6d12f3.
2020-02-25 11:19:09 -05:00
Isaac Connor a5da6d12f3 Handle a zero value for scale 2020-02-25 11:18:28 -05:00
Isaac Connor 8a83449fba Handle a zero value for scale 2020-02-25 11:18:13 -05:00
Isaac Connor 2f89bd28b7 Handle a zero value for scale 2020-02-25 11:18:02 -05:00
Isaac Connor 37abd41e78 Handle a zero value for scale 2020-02-25 11:17:46 -05:00
Isaac Connor 429000c13b Fix value of auto in width dropdown. Allow a 0 value for scale. 2020-02-25 11:14:12 -05:00
Isaac Connor 638e333702 Scale must be an integer value so use '0' instead of auto 2020-02-25 11:13:20 -05:00
Isaac Connor d68d115581 Handle scale==0 to do width=100%. 2020-02-25 11:12:49 -05:00
Isaac Connor 583350ef06 Fix use of array_key_exists instead of property_exists 2020-02-25 11:09:12 -05:00
Isaac Connor 6cf448c74e remove debug and spacing 2020-02-25 11:08:23 -05:00
Patrick f81e7b5b48
add area definition to zone creation via API 2020-02-24 21:04:40 -07:00
Isaac Connor e630550d0f bump version for release 1.34.4 2020-02-24 14:44:19 -05:00
Isaac Connor cc7de97b6a Merge branch 'release-1.34' 2020-02-24 14:39:50 -05:00
Isaac Connor 173d58d8b3
Merge pull request #2852 from connortechnology/Event_list_is_not_filtered_when_Group_is_selected_on_Console
Event list is not filtered when group is selected on console
2020-02-24 14:37:42 -05:00
Isaac Connor 55c99c5ff3 Include filtered monitors for filter query on totals line of event counts. Fixes #2846 2020-02-24 14:34:21 -05:00
Isaac Connor 5ed6d36afe Merge branch 'release-1.34' 2020-02-24 14:12:21 -05:00
Isaac Connor f4521d20e0 Fix applying rotation to x264encoded video which has already been rotated. 2020-02-24 14:12:10 -05:00
Isaac Connor c1dfb8571a revert bogus code in Image(AvFrame) 2020-02-24 14:10:54 -05:00
Isaac Connor a29030c5f8 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-02-24 13:17:32 -05:00
Isaac Connor b389f9660d Merge branch 'fix_class_PTZ_presets_almost_invisible' 2020-02-24 13:17:09 -05:00
Isaac Connor 2d3f72188d
Merge pull request #2851 from connortechnology/fix_class_PTZ_presets_almost_invisible
fix_class_PTZ_presets_almost_invisible
2020-02-24 13:16:19 -05:00
Isaac Connor d0a8d241d2 Don't include controls.css twice if css is base. Don't use special styles for ptz buttons, so that they look like all the other buttons. Fixes #2849 2020-02-24 13:13:54 -05:00
Pliable Pixels 7109bff6a7 mention other values for GPU 2020-02-24 12:44:36 -05:00
Isaac Connor 07749a7322
Merge pull request #2850 from pliablepixels/docfix
mention other values for GPU
2020-02-24 12:43:34 -05:00
Pliable Pixels d494694af9 mention other values for GPU 2020-02-24 12:06:32 -05:00
Isaac Connor c035376f30
Merge pull request #2848 from connortechnology/fix_2819_garbled_output_weird_resolution_24bit
Only align buffers to 32bit if using a 32bit pix format.  Fixes #2819
2020-02-23 18:14:55 -05:00
Isaac Connor d2872becfc Only align buffers to 32bit if using a 32bit pix format. Fixes #2819 2020-02-23 18:14:17 -05:00
hax0kartik b1ce0ec0e8 Fix cmake 2020-02-23 06:18:32 -08:00
Isaac Connor d7f8f201be Fix zoneminder.com url getting undefined being added to it 2020-02-22 10:51:26 -05:00
Isaac Connor e640fc0c26 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-02-22 10:50:07 -05:00
Isaac Connor 63a3f2e453 Fix zoneminder.com url getting undefined being added to it 2020-02-22 10:50:00 -05:00
Andrew Bauer c29f2cb8cf
fix our friend, eslint 2020-02-21 14:22:53 -06:00
Isaac Connor ce8c8a755c fix eslint 2020-02-21 10:29:27 -05:00
Isaac Connor 93fa1cd03c Convert the default filters to insert by specifying the column names to make them less fragile to db changes. Mostly this helps developers who may have other columns defined than what is currently in use in the version they are working on. 2020-02-21 09:48:01 -05:00
Isaac Connor d51fdafbc0 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-02-21 09:37:45 -05:00
Isaac Connor b4729f5aa8 Handle other colours and subpixel formats in Image::Image(AvFrame*) than 32bit RGBA 2020-02-21 09:34:44 -05:00
Isaac Connor 7645196bdc Extend width of ControlDevice and Address to full width 2020-02-21 09:30:31 -05:00
Isaac Connor 869713826a mine code cleanup 2020-02-21 09:29:35 -05:00
hax0kartik 46d77ee849 Add libjwt as a optional library 2020-02-20 07:55:59 -08:00
hax0kartik 1959b2e070 Add optional library jwt 2020-02-20 07:45:33 -08:00
Isaac Connor 6d5fcd15ff Merge branch 'connortechnology-fix_user_self_edit_2841' into release-1.34 2020-02-19 16:57:57 -05:00
Isaac Connor 5aaf58fe27 Merge branch 'fix_user_self_edit_2841' of https://github.com/connortechnology/ZoneMinder into connortechnology-fix_user_self_edit_2841 2020-02-19 16:57:35 -05:00
Isaac Connor 1a87eb40bd Fixes #2841 and maintains login through password change 2020-02-19 16:55:38 -05:00
Isaac Connor e772a3d606 Merge branch 'master' of github.com:/ZoneMinder/zoneminder 2020-02-19 14:53:47 -05:00
Isaac Connor ade95283d9
Merge pull request #2839 from connortechnology/add_alarmed_zone_to_filters
Add alarmed zone to filters
2020-02-19 14:52:19 -05:00
Isaac Connor be75be9bc4
Merge pull request #2815 from connortechnology/improve_filter_emails
Improve filter emails
2020-02-19 14:50:48 -05:00