Isaac Connor
b58ecca040
Allow RTSPServer to be unselected
2021-02-17 12:07:55 -05:00
Isaac Connor
aa94795b96
When auth is not turned on, show an error instead of login fields.
2021-02-16 16:09:23 -05:00
Isaac Connor
317274248b
Allow mid= and dupId= in monitor view to allow mid reuse. Alphabetically sort Monitors in LinkedMonitors by name
2021-02-16 14:16:59 -05:00
Isaac Connor
71183a6002
fix case of vidWidth. Fixes #3162
2021-02-14 16:28:08 -05:00
Isaac Connor
231c9303fd
Handle null vidWidth
2021-02-11 11:50:05 -05:00
Peter Keresztes Schmidt
687ba03eb4
Drop relicts of zma
2021-02-10 13:26:25 +01:00
Isaac Connor
470739e1d5
Add debugging if streamStatus.status doesn't exist
2021-02-09 14:24:09 -05:00
Isaac Connor
79ac92c76d
spacing
2021-02-09 14:23:47 -05:00
Isaac Connor
c2ac171811
truncate file when logging to 255 chars so it gets into the db
2021-02-09 14:23:15 -05:00
Peter Keresztes Schmidt
6c9983155c
Build: Reindent the CMakeLists
...
Indent with 2 spaces
Also remove expressions form closing tags. They have been made optional a while ago since they make reading rather more difficult.
2021-02-04 22:00:56 +01:00
Isaac Connor
d4e83620b2
Split actions and options columns into 50%
2021-02-03 12:57:17 -05:00
Isaac Connor
a7365323dd
Split actions and options in filters to fit more horizontally
2021-02-03 12:57:17 -05:00
Isaac Connor
c35869fd30
Use jquery offset() to get image position
2021-02-02 23:19:53 -05:00
Isaac Connor
c8af90fd24
Add RTSP Server checkbox
2021-02-02 23:19:52 -05:00
Isaac Connor
2fa0fbe448
Upgrade cakephp to 2.10.24
2021-02-02 23:19:52 -05:00
Isaac Connor
2996fe3da7
fix hiding cloneBtn
2021-02-02 23:19:52 -05:00
Isaac Connor
b35e27d0b6
Use decodeURIComponent instead of decodeURI
2021-02-02 09:12:34 -05:00
Isaac Connor
49d3e5ddbf
decodeURI row.Message
2021-02-02 09:09:53 -05:00
Isaac Connor
105eff7a21
Remove references to zma
2021-02-01 17:29:16 -05:00
Isaac Connor
49209d9e72
populate mid if specified to enable reusing mids. Fix auto-populating resolution dropdown
2021-02-01 16:45:13 -05:00
Isaac Connor
0dc6b60985
Use new insert function to allow re-use of monitor Ids
2021-02-01 16:44:41 -05:00
Isaac Connor
50e5f84df2
introduce insert function to be used when we want specifically to insert a db record instead of being smart about update/insert.
2021-02-01 16:44:04 -05:00
Isaac Connor
da7d9c3756
Add default for Monitor Name
2021-02-01 16:43:24 -05:00
Isaac Connor
a3fe577fc6
Fix margin in ptz buttons
2021-01-31 11:45:11 -05:00
Isaac Connor
ee5d5e3cab
wrap fps text in another div to make the title easier to bring up and include the word fps
2021-01-31 10:19:10 -05:00
Isaac Connor
69b9e40b59
Fix textstatus=>textStatus
2021-01-31 10:09:22 -05:00
Isaac Connor
4ba939e267
role=tabList needs to be role=tablist
2021-01-29 20:37:55 -05:00
Isaac Connor
927d11a6a4
Fix tags not allowed under ul
2021-01-29 20:37:34 -05:00
Isaac Connor
c444e5cf07
spacing
2021-01-29 14:05:04 -05:00
Isaac Connor
ec1a7ec427
scale the event width when calculating if the stats table will fit
2021-01-29 14:03:12 -05:00
Isaac Connor
379538b3db
Make the monitor name at the top a link to monitor edit
2021-01-29 09:53:30 -05:00
Isaac Connor
ae41998d7c
Add a check for passthrough and not ffmpeg
2021-01-29 09:53:11 -05:00
Isaac Connor
5524090a80
Remove sleep function. Not going to work anyways
2021-01-28 16:17:15 -05:00
Isaac Connor
e4c6709eca
ensure options always has width and height set
2021-01-27 13:07:31 -05:00
Isaac Connor
6bfbb5462a
console monitor sort must be a post
2021-01-27 11:48:32 -05:00
Isaac Connor
07fa507efe
improve error message when trying to control a remote camera
2021-01-27 11:48:32 -05:00
Isaac Connor
28a004c324
Must load ServerId so that we can tell if it is local or remote
2021-01-27 11:48:32 -05:00
Isaac Connor
bacf4a1aca
Add 640x360 resolution
2021-01-26 17:54:22 -05:00
Isaac Connor
410b9840d1
fix eslint
2021-01-26 17:44:23 -05:00
Isaac Connor
491cc1dfe3
ImageBufferCount can now be as low as 2
2021-01-26 15:37:32 -05:00
Isaac Connor
69626651ff
ImageBufferCount can now be as low as 2
2021-01-26 15:33:38 -05:00
Isaac Connor
4dcce4ac95
Merge branch 'rtsp_server'
2021-01-26 14:22:10 -05:00
Isaac Connor
671d58f0d0
bump version and put back ZM_MIN_RTSP_PORT setting
2021-01-26 12:35:17 -05:00
Isaac Connor
dc9c7a7e15
handle event not existing a little better.
2021-01-25 18:49:03 -05:00
Isaac Connor
4b5052c351
use my bindButton function on the othe rbuttons
2021-01-25 18:48:47 -05:00
Isaac Connor
1b9f448aca
handle event not existing a little better. Show back button for example.
2021-01-25 18:48:20 -05:00
Isaac Connor
973533c809
Use method to handle case where Event wasn't found
2021-01-25 18:39:57 -05:00
Pliable Pixels
ed2a50f4ae
add permission check
2021-01-23 16:18:40 -05:00
Pliable Pixels
68dac0e406
new api to control daemon
2021-01-23 14:22:52 -05:00
Isaac Connor
ea8f264724
Merge branch 'release-1.34'
2021-01-22 15:54:06 -05:00