b72d520e02
implement the ability to pass a disabled option to htmlSelect. Use it to disable the h264 passthrough option for non-ffmpeg monitors. Instead of disappearing it.
2018-08-03 10:02:42 -04:00
a0e67da51d
Improve loging around writing out analysis frames
2018-08-02 15:40:33 -04:00
c8ed12f573
Update ISSUE_TEMPLATE.md
2018-08-02 09:49:40 -05:00
6ad732e419
retrieve greip data rather than the ip ( #2173 )
2018-07-31 14:01:01 -04:00
63153f05be
bump version in rpm specfile
2018-07-31 12:25:00 -05:00
11cedb4335
repeat the update that adds Refresh to Monitors. Bump version.
2018-07-31 10:27:34 -04:00
ee97dc39dc
Add Refresh column to Monitors table. Explicitly put it after ZoneCount in the update.sql
2018-07-31 10:22:13 -04:00
886391a547
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-07-31 10:16:05 -04:00
363e1dda97
Add some more Monitor defaults, mainly Refresh which gets called in watch.js.php
2018-07-31 10:15:26 -04:00
48b91c5544
Bugfix in Control and added new Camera ( #2171 )
...
* fixed control typos
missing word "s" for "Controls" Table for database queries
* added Dericam P2 camera Control
* fixed missing CanReset column
* Update DericamP2.pm
* added some more missing controls
CanSleep, CanWake
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update zm_create.sql.in
2018-07-28 09:26:02 -04:00
bb4861bb8c
Merge branch 'storageareas' into add_export_to_filter
2018-07-25 17:08:20 -04:00
6c1371fac7
Merge branch 'master' into add_export_to_filter
2018-07-25 17:06:49 -04:00
2ff47e04da
the updated video-js.css puts the fonts into a font dir.
2018-07-25 17:04:42 -04:00
00bdfdcb16
increase height of function popup so that dropdown options fit in it
2018-07-25 09:39:24 -04:00
6ab1c3ced8
proper case table header
2018-07-25 09:39:08 -04:00
dc57a3c91c
fix spacing/quotes/google code style
2018-07-24 16:41:09 -04:00
4c4bad7186
Merge branch 'add_export_to_filter' into storageareas
2018-07-17 15:33:19 -04:00
965ffda01e
Add button types. fix extra px in slideheight
2018-07-17 15:32:30 -04:00
f07b1105d3
Merge pull request #2164 from pliablepixels/fixGetCredentials
...
fixed getCredentials not working if called directly
2018-07-17 13:24:01 -05:00
997aa6aa55
fixed getCredentials not working if called directly
2018-07-17 13:57:20 -04:00
d45ca8880a
documentation for new login/logout APIs ( #2163 )
2018-07-17 13:24:47 -04:00
8f05d0b7da
Merge pull request #2162 from Daedilus/Control/IPCAMIOS
...
Control/ipcamios
2018-07-17 09:44:59 -05:00
d90e3daf80
Added default settings for control script IPCAMIOS as per comments in Pull #2161
2018-07-17 08:31:55 -06:00
8a43f4400e
Merge branch 'add_export_to_filter' of github.com:connortechnology/ZoneMinder into add_export_to_filter
2018-07-17 08:27:23 -04:00
a12c7d90ab
Merge branch 'master' into add_export_to_filter
2018-07-17 08:26:58 -04:00
37779ff51d
use a window.location.assign instead of creating a popup to export
2018-07-17 08:26:19 -04:00
683e8716f2
add type=button to button to prevent them from submitting
2018-07-17 08:25:15 -04:00
a41ce9c9fe
default to exporting all event data
2018-07-17 08:24:19 -04:00
26d6b99018
Added new control script for iPhone ip camera software ( #2161 )
...
https://itunes.apple.com/ca/app/ipcamera-high-end-network-camera/id570912928?mt=8
See https://forums.zoneminder.com/viewtopic.php?f=9&t=27386 for details.
2018-07-17 08:09:15 -04:00
455204135d
fail if zm_path_ffmpeg not set
2018-07-17 06:57:38 -05:00
de0a272b3d
Added new control script for iPhone ip camera software
...
https://itunes.apple.com/ca/app/ipcamera-high-end-network-camera/id570912928?mt=8
See https://forums.zoneminder.com/viewtopic.php?f=9&t=27386 for details.
2018-07-16 20:34:27 -06:00
0ff9002adf
2156 api login ( #2157 )
...
* error can be due to bad user or password
* added login/logout and related private functions
* handle case when userLogin fails, current code returns PHP error for and API throw is not called
* formatting
* converted login params to POST, removed user=&pass= for other APIs
* formatting
* add auth check back but leave out login/out
* fixes to make it work across zmN, postman and curl
* added back enabled check
2018-07-15 21:17:35 -04:00
61e7136857
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-07-12 17:03:21 -04:00
cb079ce9f3
Merge branch 'master' into storageareas
2018-07-12 15:05:35 -04:00
0d75586fac
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-07-12 15:05:13 -04:00
43827953cd
test for existence of HTTP_X_FORWARDED_PROTO
2018-07-12 15:04:54 -04:00
05f0338219
use a unique connection key for downloads
2018-07-12 14:07:19 -04:00
43cee7c383
make export work and fix links to jquery.js
2018-07-12 14:07:03 -04:00
95e4341d28
test for existence of DiskSpace in array
2018-07-12 14:05:43 -04:00
e05604e4b3
Alter code style, spacing
2018-07-12 14:05:23 -04:00
82115ed2d3
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-07-12 11:44:26 -04:00
4aa289cd66
fix reCaptcha failure still allowing login
2018-07-12 11:44:20 -04:00
ce22f207e3
Merge branch 'master' into add_export_to_filter
2018-07-12 11:40:32 -04:00
903127fe85
Merge branch 'storageareas'
2018-07-12 11:39:33 -04:00
eb610cd3a1
rewrite the HTTP_X_FORWARDED_PROTO test to just make it part of the if instead of modifying SERVER['HTTPS']
2018-07-12 11:38:58 -04:00
06813d3b80
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-07-12 11:35:13 -04:00
2767e7cca3
remove unneeded packaging files from chosen.
2018-07-12 11:35:02 -04:00
87f68e4a5b
Merge branch 'master' into storageareas
2018-07-12 10:47:18 -04:00
dd4392bf12
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-07-12 10:11:18 -04:00
9f92af5a33
Merge pull request #100 from xenoxaos/http_x_forwarded_proto_support
...
Adding support for HTTP_X_FORWARDED_PROTO
2018-07-12 10:10:36 -04:00
Isaac Connor
Andrew Bauer
Roman Dissertori
Isaac Connor
Pliable Pixels
Pliable Pixels
Daedilus