Isaac Connor
|
4466bd9b16
|
Always just default to scale from monitor
|
2020-04-29 16:35:20 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
eebd0a274d
|
Fix no redirect on login with palemoon browser
|
2020-04-29 16:34:27 -04:00 |
|
Isaac Connor
|
8b0f88a707
|
Use auth_relay instead of auth_hash if AUTH_RELAY==plain or none.
|
2020-04-29 16:34:07 -04:00 |
|
Isaac Connor
|
9ec89f20d3
|
Add auth relay information when auth_relay is something other than hashed.
|
2020-04-29 16:33:41 -04:00 |
|
Isaac Connor
|
5e88181380
|
Pass event object to data-on-click events
|
2020-04-29 16:32:55 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
a6ee817bc4
|
Fix auth by hash
|
2020-04-28 19:00:42 -04:00 |
Isaac Connor
|
5cd37adad4
|
Merge pull request #2924 from Dvanderploeg/zoom_out_fix
Corrected zoom out button call
|
2020-04-28 09:57:52 -04:00 |
David van der Ploeg
|
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 |
|
Isaac Connor
|
e21ffbea7d
|
Merge branch 'fix_zms'
|
2020-04-26 18:43:39 -04:00 |
|
Isaac Connor
|
ae9a5766f5
|
Merge branch 'release-1.34' into fix_zms
|
2020-04-26 18:19:30 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
c6c8a23c02
|
sun_path is defined to be 108 bytes. No need for 4095. Quiets compiler warnings
|
2020-04-24 18:03:00 -04:00 |
|
Isaac Connor
|
b0c5abc2c2
|
Quiet compiler warnings.
|
2020-04-24 17:51:00 -04:00 |
|
Isaac Connor
|
23f9a861d0
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-04-24 17:05:40 -04:00 |
|
Isaac Connor
|
ed7c0815de
|
Merge branch 'release-1.34'
|
2020-04-24 17:05:32 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
1f6df771b2
|
Merge pull request #2922 from makers-mark/master
Update zm_update-1.35.2.sql
|
2020-04-24 13:00:15 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
e79a9d5abf
|
Can't set this policy yet as we havn't deprecate trusty for 1.34
|
2020-04-23 18:33:58 -04:00 |
|
Isaac Connor
|
6e38a820bd
|
Bump version to 10.34.10 for release
|
2020-04-23 18:28:26 -04:00 |
|
Isaac Connor
|
01a2880100
|
fix build outside of build directory
|
2020-04-23 18:18:04 -04:00 |
|
Isaac Connor
|
496fd6b15a
|
reorganize to reduce code depth
|
2020-04-23 18:17:20 -04:00 |
|
Isaac Connor
|
775b0d1ccd
|
fix XSS in monitor Name
|
2020-04-23 18:16:38 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
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 |
Pliable Pixels
|
df4fab5fbf
|
re-enable fragmented mp4 recordings
|
2020-04-23 18:11:10 -04:00 |
|
Isaac Connor
|
b8781301f8
|
Drop lock around openFile so that we don't hang
|
2020-04-23 18:08:14 -04:00 |
|
Isaac Connor
|
d31216330c
|
Only align buffers to 32bit if using a 32bit pix format. Fixes #2819
|
2020-04-23 18:07:07 -04:00 |
makers-mark
|
acc7dbeb8e
|
Update zm_update-1.35.2.sql
|
2020-04-23 18:01:01 -04:00 |
hax0kartik
|
32c137bb8e
|
Do not look for gnutls if libjwt is not found
|
2020-04-23 18:00:00 -04:00 |
|
Isaac Connor
|
bc9137bd93
|
defend against XSS in Monitor Name
|
2020-04-23 17:56:05 -04:00 |
|
Isaac Connor
|
0f91797d85
|
defend against XSS in Monitor Name
|
2020-04-23 17:53:54 -04:00 |
|
Isaac Connor
|
189d4a6f02
|
add Emailed status to events list
|
2020-04-23 17:52:18 -04:00 |
|
Isaac Connor
|
8be08d942a
|
Scale must be an integer value so use '0' instead of auto
|
2020-04-23 17:40:42 -04:00 |
|
Isaac Connor
|
9d42d0e2f0
|
silence warning when no language is set
|
2020-04-23 17:38:15 -04:00 |
|
Isaac Connor
|
b3a8ac0b2a
|
tidy up, be more efficient and warn when language files are not found.
|
2020-04-23 17:37:46 -04:00 |
|
Isaac Connor
|
d90177fb74
|
handle a 0 value for scale
|
2020-04-23 16:41:00 -04:00 |
|
Isaac Connor
|
56a43741c5
|
Handle a zero value for scale
|
2020-04-23 16:37:26 -04:00 |
|
Isaac Connor
|
bf99daf494
|
Merge branch 'rate_dropdown'
|
2020-04-23 16:36:34 -04:00 |
|
Isaac Connor
|
5503458874
|
correct label_size array and add translations
|
2020-04-23 16:32:19 -04:00 |
|
Isaac Connor
|
010b230804
|
Fix value of auto in width dropdown. Allow a 0 value for scale.
|
2020-04-23 16:30:39 -04:00 |
|
Isaac Connor
|
8ef70f9080
|
defend against XSS in Monitor Name
|
2020-04-23 16:28:19 -04:00 |
|
Isaac Connor
|
25cd13f8ad
|
When sending eventCmdReq, pass eventCmdParms since it might have been updated.
|
2020-04-23 16:25:35 -04:00 |
|
Isaac Connor
|
da79f761ad
|
add monitorStreamReplayBuffer to javascript vars. Use it to determine whether to update fast forward and reverse buttons
|
2020-04-23 16:17:27 -04:00 |