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
4466bd9b16
Always just default to scale from monitor
2020-04-29 16:35:20 -04:00
74ab2e2e12
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-04-29 16:35:04 -04:00
eebd0a274d
Fix no redirect on login with palemoon browser
2020-04-29 16:34:27 -04:00
8b0f88a707
Use auth_relay instead of auth_hash if AUTH_RELAY==plain or none.
2020-04-29 16:34:07 -04:00
9ec89f20d3
Add auth relay information when auth_relay is something other than hashed.
2020-04-29 16:33:41 -04:00
5e88181380
Pass event object to data-on-click events
2020-04-29 16:32:55 -04:00
e78b718168
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-04-29 16:32:26 -04:00
cb44f2c5de
Fixup Monitor->sendControlCommand. start/stop/quit should be run through zmdc.pl now instead of talking directly to zmcontrol.
2020-04-29 16:30:59 -04:00
a6ee817bc4
Fix auth by hash
2020-04-28 19:00:42 -04:00
5cd37adad4
Merge pull request #2924 from Dvanderploeg/zoom_out_fix
...
Corrected zoom out button call
2020-04-28 09:57:52 -04:00
83b4b6b4db
Corrected zoom out button call
...
The zoom out button wasn't calling the correct function
of "data-on-click-this" causing the request to be ignored.
2020-04-27 21:14:58 -06:00
e21ffbea7d
Merge branch 'fix_zms'
2020-04-26 18:43:39 -04:00
ae9a5766f5
Merge branch 'release-1.34' into fix_zms
2020-04-26 18:19:30 -04:00
3b11258fbc
Make checkEventLoaded return true if a new event was loaded, false otherwise. The idea is to give more information back to whoever calls it
2020-04-26 15:22:29 -04:00
a7363a4b36
reduce compiler deprecation warnings by using our zm api's that hide support for older ffmpeg versions
2020-04-24 19:05:58 -04:00
7a7f366eb1
Change semantics of zm_send_packetreceive_frame to return the # of bytes consumed. This is inline with how to old deprecated api used to work. The new api consumes the packet, so just return packet size.
2020-04-24 19:05:17 -04:00
c6c8a23c02
sun_path is defined to be 108 bytes. No need for 4095. Quiets compiler warnings
2020-04-24 18:03:00 -04:00
b0c5abc2c2
Quiet compiler warnings.
2020-04-24 17:51:00 -04:00
23f9a861d0
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-04-24 17:05:40 -04:00
ed7c0815de
Merge branch 'release-1.34'
2020-04-24 17:05:32 -04:00
3dd5ac8146
shrink buffers for writing timestamp into. Don't need 64 when 28 will do. Quiets compiler warnings
2020-04-24 16:43:27 -04:00
1f6df771b2
Merge pull request #2922 from makers-mark/master
...
Update zm_update-1.35.2.sql
2020-04-24 13:00:15 -04:00
7c65b32e1e
Don't include mootools on login view. It isn't needed and apparently breaks google recaptcha
2020-04-24 12:25:13 -04:00
cf3785aebf
Don't include mootools on login view. It isn't needed and apparently breaks google recaptcha
2020-04-24 12:23:48 -04:00
e79a9d5abf
Can't set this policy yet as we havn't deprecate trusty for 1.34
2020-04-23 18:33:58 -04:00
6e38a820bd
Bump version to 10.34.10 for release
2020-04-23 18:28:26 -04:00
01a2880100
fix build outside of build directory
2020-04-23 18:18:04 -04:00
496fd6b15a
reorganize to reduce code depth
2020-04-23 18:17:20 -04:00
775b0d1ccd
fix XSS in monitor Name
2020-04-23 18:16:38 -04:00
e274aa471a
Use fputc instead of printf for separator to be a tiny bit more efficient. Report current state when forcing alarm on
2020-04-23 18:13:34 -04:00
00dad82b46
Fix use of strncpy using the entire size of the buffer. You have to -1 for the null char
2020-04-23 18:12:54 -04:00
4aaa02dc24
fix cpplint complaints and remove casts that are unnecessary. Micro-optimisation by using fputs for date_string instead of fprintf
2020-04-23 18:12:44 -04:00
df4fab5fbf
re-enable fragmented mp4 recordings
2020-04-23 18:11:10 -04:00
b8781301f8
Drop lock around openFile so that we don't hang
2020-04-23 18:08:14 -04:00
d31216330c
Only align buffers to 32bit if using a 32bit pix format. Fixes #2819
2020-04-23 18:07:07 -04:00
Isaac Connor
Isaac Connor
Dvanderploeg
David van der Ploeg
Pliable Pixels