Isaac Connor
886391a547
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-07-31 10:16:05 -04:00
Isaac Connor
363e1dda97
Add some more Monitor defaults, mainly Refresh which gets called in watch.js.php
2018-07-31 10:15:26 -04:00
Roman Dissertori
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
Isaac Connor
2ff47e04da
the updated video-js.css puts the fonts into a font dir.
2018-07-25 17:04:42 -04:00
Isaac Connor
00bdfdcb16
increase height of function popup so that dropdown options fit in it
2018-07-25 09:39:24 -04:00
Isaac Connor
6ab1c3ced8
proper case table header
2018-07-25 09:39:08 -04:00
Isaac Connor
dc57a3c91c
fix spacing/quotes/google code style
2018-07-24 16:41:09 -04:00
Andrew Bauer
f07b1105d3
Merge pull request #2164 from pliablepixels/fixGetCredentials
...
fixed getCredentials not working if called directly
2018-07-17 13:24:01 -05:00
Pliable Pixels
997aa6aa55
fixed getCredentials not working if called directly
2018-07-17 13:57:20 -04:00
Pliable Pixels
d45ca8880a
documentation for new login/logout APIs ( #2163 )
2018-07-17 13:24:47 -04:00
Andrew Bauer
8f05d0b7da
Merge pull request #2162 from Daedilus/Control/IPCAMIOS
...
Control/ipcamios
2018-07-17 09:44:59 -05:00
Daedilus
d90e3daf80
Added default settings for control script IPCAMIOS as per comments in Pull #2161
2018-07-17 08:31:55 -06:00
Daedilus
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
Andrew Bauer
455204135d
fail if zm_path_ffmpeg not set
2018-07-17 06:57:38 -05:00
Daedilus
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
Pliable Pixels
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
Isaac Connor
0d75586fac
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-07-12 15:05:13 -04:00
Isaac Connor
43827953cd
test for existence of HTTP_X_FORWARDED_PROTO
2018-07-12 15:04:54 -04:00
Isaac Connor
82115ed2d3
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-07-12 11:44:26 -04:00
Isaac Connor
4aa289cd66
fix reCaptcha failure still allowing login
2018-07-12 11:44:20 -04:00
Isaac Connor
903127fe85
Merge branch 'storageareas'
2018-07-12 11:39:33 -04:00
Isaac Connor
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
Isaac Connor
06813d3b80
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-07-12 11:35:13 -04:00
Isaac Connor
2767e7cca3
remove unneeded packaging files from chosen.
2018-07-12 11:35:02 -04:00
Isaac Connor
87f68e4a5b
Merge branch 'master' into storageareas
2018-07-12 10:47:18 -04:00
Isaac Connor
dd4392bf12
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-07-12 10:11:18 -04:00
Isaac Connor
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
Andrew Bauer
9f61043931
Update startpackpack.sh
2018-07-12 07:59:27 -05:00
Mike Brown
6a5ff83848
Adding support for HTTP_X_FORWARDED_PROTO
2018-07-11 21:01:37 -05:00
Isaac Connor
0acad44b4a
test for existence of Storage path before trying things like disk_total_space which will fill the html output with php errors.
2018-07-11 17:21:44 -04:00
Isaac Connor
f4a3c3a8f5
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-07-11 16:22:27 -04:00
Andrew Bauer
0e0de00e50
Merge pull request #2153 from connortechnology/cycle_width
...
Cycle width
2018-07-11 15:06:37 -05:00
Isaac Connor
184d6fa2ef
remove extra spaces
2018-07-11 15:51:04 -04:00
Isaac Connor
410b1ad810
Merge branch 'master' into cycle_width
2018-07-11 15:49:44 -04:00
Isaac Connor
856608d720
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-07-11 15:48:27 -04:00
Isaac Connor
05615c5cf4
We should not use a hard path in cache bust
2018-07-11 15:48:01 -04:00
Dmitry Smirnov
7db1fabbe1
Removed "chosen" web site; "prism.js" is not distributable. ( #2154 )
2018-07-11 15:46:43 -04:00
Isaac Connor
115e554d94
Remove erroneous t and convert tabs to spaces
2018-07-11 15:46:11 -04:00
Andrew Bauer
18c3618e28
Arp tool ( #2155 )
...
* let cmake set path to arp
* declare cameras array
* fix probeV4L function
* typo
* fix another typo - my machine is possessed.
* update redhat, debian, ubuntu build dependencies
2018-07-11 15:43:59 -04:00
Isaac Connor
3d97b6343e
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-07-11 11:46:04 -04:00
Isaac Connor
fe5ebe094d
More work just using auth.php instead of cake code. Don't reload the User object
2018-07-11 11:45:49 -04:00
Isaac Connor
b8691e4654
Don't need global cookies. Only open session if needed in userLogin
2018-07-11 11:45:19 -04:00
Andrew Bauer
a6b44d2ab5
remove jscalendar from rpm builds
2018-07-11 10:06:45 -05:00
Isaac Connor
c6ded845d0
Return the user db row ifrom userLogin instead of assuming it will be accessed as a global. Add is_session_started function and use it to detect when we need to start/stop the session in generateAuthHash
2018-07-11 10:34:45 -04:00
Isaac Connor
4f80ca6871
Use userLogin function from auth.php instead of cake code.
2018-07-11 10:33:49 -04:00
Isaac Connor
983e3c45be
Fix spacing and quotes
2018-07-11 09:54:25 -04:00
Isaac Connor
f10509690b
add username and passwordHash to Session so that generateAuthHash works
2018-07-11 09:54:15 -04:00
Isaac Connor
f56d751661
join multiple echos into 1
2018-07-10 13:47:30 -04:00
Isaac Connor
21438d17ac
Fix authenticating User
2018-07-10 13:19:51 -04:00
Isaac Connor
930d929427
Merge branch 'storageareas' into api_auth
2018-07-10 12:46:30 -04:00