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 |
|
Isaac Connor
|
17eca9f495
|
bump version to 1.35.0 for db upgrade
|
2020-02-19 14:50:16 -05:00 |
|
Isaac Connor
|
0d91f5965d
|
Merge pull request #2840 from connortechnology/onvif_multicast_route
Onvif multicast route
|
2020-02-19 14:48:50 -05:00 |
|
Isaac Connor
|
300402013c
|
Merge branch 'master' into improve_filter_emails
|
2020-02-19 14:44:37 -05:00 |
|
Isaac Connor
|
c488756eb8
|
Merge branch 'master' into fix_remote_http
|
2020-02-19 14:42:24 -05:00 |
|
Isaac Connor
|
5d494329db
|
Merge branch 'master' into onvif_multicast_route
|
2020-02-19 14:29:22 -05:00 |
|
Isaac Connor
|
25c77f57e0
|
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
|
2020-02-19 14:29:04 -05:00 |
|
Isaac Connor
|
ec4d565f07
|
set the net interface used in TransportUDP when specified
|
2020-02-19 14:28:53 -05:00 |
|
Isaac Connor
|
b8d0192bcd
|
Add optional net_interface after soap version to discover command
|
2020-02-19 14:28:23 -05:00 |
|
Isaac Connor
|
2315bed56d
|
Add set_net_interface function and use the when setting up the multicast socket
|
2020-02-19 14:27:36 -05:00 |
|
Isaac Connor
|
dab5c520fe
|
Merge branch 'master' into add_alarmed_zone_to_filters
|
2020-02-19 14:20:08 -05:00 |
|
Isaac Connor
|
a599028de4
|
If Filter attr is AlarmedZoneId we can only support the EXISTS operator
|
2020-02-19 14:18:28 -05:00 |
|
Isaac Connor
|
3b1458bb88
|
add Emailed status to events list
|
2020-02-19 14:17:44 -05:00 |
|
Isaac Connor
|
58fe753bee
|
Merge pull request #2838 from ZoneMinder/release-1.34
bump version to 1.34.3
|
2020-02-19 14:03:24 -05:00 |
|
Isaac Connor
|
ea2eba4110
|
bump version to 1.34.3
|
2020-02-19 13:50:27 -05:00 |
|
Isaac Connor
|
258ae23fb9
|
out an error if name contains invalid characters
|
2020-02-19 09:42:54 -05:00 |
|
Isaac Connor
|
292f0ea077
|
Merge pull request #2837 from zlodag/master
#2833 Added monitor presets and controls for D-Link DCS-5020L, and minor bug fix in zmcamtool
|
2020-02-19 09:24:21 -05:00 |
zlodag
|
0c97bff645
|
monitor presets and controls for D-Link DCS-5020L
|
2020-02-19 22:50:09 +13:00 |
|
zlodag
|
1168db9df0
|
Fixed regexp in zmcamtool to accept names for currently existing MonitorPresets
|
2020-02-19 22:47:40 +13:00 |
|
Isaac Connor
|
cac7ddd89d
|
Discover that authority also contains port. Remove redundant stuff.
|
2020-02-18 16:48:08 -05:00 |
|
Isaac Connor
|
9a21ebf696
|
Remove unneeded test for :80
|
2020-02-18 15:10:44 -05:00 |
|
Isaac Connor
|
789db4e5a6
|
Fix filter new rows missing their onchange event on attribute dropdown. Fixes #2817
|
2020-02-18 13:29:06 -05:00 |
|
Isaac Connor
|
568c42cfa9
|
Use URI to better handle ControlAddress parsing.
|
2020-02-18 13:05:45 -05:00 |
|
Isaac Connor
|
223b618f74
|
quotes
|
2020-02-18 11:08:05 -05:00 |
|
Isaac Connor
|
fc8f94c315
|
Merge branch 'master' into improve_filter_emails
|
2020-02-17 16:42:44 -05:00 |
|
Isaac Connor
|
179da58bc8
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-02-17 16:32:52 -05:00 |
|
Isaac Connor
|
c337fb921d
|
Don't die if no MetaDataConfigurations
|
2020-02-17 16:32:37 -05:00 |