dadcea4884
remove recursive from index
2020-05-05 16:35:14 -04:00
0817ea3bfb
added association method to GroupsController to get Monitor Id/Name of monitors that belong to the group
2020-05-05 16:32:54 -04:00
48df73fe35
Add UserId to Filters
2020-05-04 13:24:48 -04:00
2fb89b6241
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2020-05-02 18:04:20 -04:00
8243dc0b19
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-05-02 11:49:35 -04:00
e9b1eacc6d
Fix not finding stream with old libs
2020-05-02 11:49:28 -04:00
28a3691b9c
Merge branch 'release-1.34'
2020-05-01 19:46:38 -04:00
65b8006cd6
Merge branch 'release-1.34'
2020-05-01 19:44:47 -04:00
3f680e11fa
Bump version for release
2020-05-01 19:23:37 -04:00
eca56c7123
Provide a more useful error message when the monitor's function is set to NONE. Fixes #2877
2020-05-01 19:21:20 -04:00
ef540aa972
sun_path is defined to be 108 bytes. No need for 4095. Quiets compiler warnings
2020-05-01 19:13:50 -04:00
c9f04c9136
Support event_close_mode for record mode
...
Support event_close_mode for record mode (with linked monitor)
2020-05-01 19:10:23 -04:00
6098c4c961
properly close streams and free memory in ffmpeg_input destructor
2020-05-01 19:03:18 -04:00
c5cf6e1a74
undo random addition
2020-05-01 19:01:09 -04:00
050868fad1
fix build on libavtools < 12
2020-05-01 19:00:40 -04:00
9beb5cee3a
use delete[] instead of delete.
2020-05-01 18:55:48 -04:00
c99db3a03f
Remove some hard coded sizes, spacing and typos. Convert inputs to number inputs as appropriate
2020-05-01 18:47:10 -04:00
24aaeee155
dynamically load monitor Object when loading event data. Also dynamically load Storage, but only when the Id is different. Free the various objects in the destructor. Sync up some spacing issues with master.
2020-05-01 18:44:35 -04:00
0085e3d34f
Don't warn about image for WebSite Monitors
2020-05-01 18:15:19 -04:00
2071b2a71e
Guess video file name for in progress events
2020-05-01 18:14:58 -04:00
917c43a54b
If can't connect to db, bail instead of loading config
2020-05-01 18:08:32 -04:00
f96cc66b9d
google code style
2020-05-01 18:06:27 -04:00
683bf3f982
Handle no default set for array defaults. Fixes Warning when saving WebSite type Monitors
2020-05-01 15:32:54 -04:00
9dbeaa2c7b
Add default for Orientation. Fixes saving WebSite type monitors
2020-05-01 15:32:26 -04:00
ffcef8a42a
spacing and make sws_context static global so we don't have to keep initializing it when playing back from mp4 in eventstream.
2020-05-01 15:22:32 -04:00
1bd340d602
spacing in watch.php
2020-05-01 13:30:00 -04:00
6dbc917215
Don't include mootools on login view. It isn't needed and apparently breaks google recaptcha
2020-05-01 13:24:47 -04:00
82188c266e
Fixup Monitor->sendControlCommand. start/stop/quit should be run through zmdc.pl now instead of talking directly to zmcontrol.
2020-05-01 13:23:39 -04:00
45a445ac48
sync up index.php to master, where is a global
2020-05-01 13:21:02 -04:00
ad373a5549
add Zone.php from master
2020-05-01 13:20:42 -04:00
ebfae1f855
turn off debug
2020-05-01 13:17:39 -04:00
ffd7970b07
Merge branch 'release-1.34'
2020-05-01 13:17:10 -04:00
e960e638b3
Remove extra value='s from PTZ buttons. Fix remaining on-click-this on numbered presets
2020-05-01 13:07:29 -04:00
bd7475a450
use on-click instead of on-click-this. We can get the button from event.target. The palemoon browser doesn't have a global event object so this wasn't working
2020-05-01 13:06:15 -04:00
e29c426f04
Pass event object to data-on-click events
2020-05-01 13:04:55 -04:00
89245e0d46
Add auth relay information when auth_relay is something other than hashed.
2020-05-01 13:04:37 -04:00
2da88be307
Use auth_relay instead of auth_hash if AUTH_RELAY==plain or none.
2020-05-01 13:04:16 -04:00
4c9f67eb5a
Fix no redirect on login with palemoon browser
2020-05-01 13:03:56 -04:00
289045500b
Don't use event as a variable name unless we are talking about window evnt. Change controlCmd to take the event and get the button from event.target
2020-05-01 13:03:35 -04:00
daa08e8740
Always just default to scale from monitor
2020-05-01 13:03:17 -04:00
62ddc02d52
quotes to match master
2020-05-01 13:01:34 -04:00
830929a85f
Remove extra value='s from PTZ buttons. Fix remaining on-click-this on numbered presets
2020-05-01 12:53:47 -04:00
14b90903a9
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
2020-05-01 12:50:10 -04:00
0ed6cb7875
Remove extra value='s from PTZ buttons. Fix remaining on-click-this on numbered presets
2020-05-01 10:06:41 -04:00
8d8d37c648
fix eslint
2020-05-01 09:57:46 -04:00
3675ee1c33
Properly delete FramesData as well.
2020-05-01 09:56:27 -04:00
5b07cb2243
Merge pull request #2926 from Dvanderploeg/camera_control_preset_correction
...
Removed value causing preset not to work
2020-05-01 09:33:47 -04:00
1d618136c0
Merge branch 'master' into camera_control_preset_correction
2020-04-30 22:10:54 -06:00
a952984e1c
Removed value causing preset not to work
...
The first value field would not permit the presetGoto
command to be added as a value. The value would then use
the number as the command. Removing it allows the presets to
call the correct command.
2020-04-30 22:05:48 -06:00
434f34f027
use delete[] instead of delete.
2020-04-30 11:04:55 -04:00
Pliable Pixels
Isaac Connor
Joe540
Isaac Connor
Dvanderploeg
David van der Ploeg