Isaac Connor
|
d0c36c9888
|
Merge pull request #2913 from connortechnology/fix_monitor_loading
Fix monitor loading
|
2020-04-17 10:26:03 -04:00 |
Isaac Connor
|
2194ed8b59
|
spacing in views/event.php
|
2020-04-17 09:46:10 -04:00 |
Isaac Connor
|
7d4e1fe895
|
Test for opening file before getting it's size. Remove some debug in view_video
|
2020-04-17 09:45:40 -04:00 |
Isaac Connor
|
b74d8d7487
|
Add support for strftimes' %r when converting to moment.js formatting
|
2020-04-17 09:44:07 -04:00 |
Isaac Connor
|
b504110825
|
Correct loading monitor values from db
|
2020-04-16 17:54:20 -04:00 |
Isaac Connor
|
006c0d0029
|
reference ppa for 1.34 instead of ppa for 1.32
|
2020-04-14 17:54:10 -04:00 |
Isaac Connor
|
fc5080d9c7
|
deprecate support for trusty and disco
|
2020-04-14 17:30:16 -04:00 |
Isaac Connor
|
f60f91c834
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-04-14 17:01:58 -04:00 |
Isaac Connor
|
c50509d22a
|
Fix use of strncpy using the entire size of the buffer. You have to -1 for the null char
|
2020-04-14 17:01:50 -04:00 |
Isaac Connor
|
17356a7b3a
|
Use a BOUNDARY define to construct boundary strings. Get rid of code that kills zms when the frame rate drops too low, as dying doesn't help, and some cameras just have a really low frame rate.
|
2020-04-14 17:01:12 -04:00 |
Isaac Connor
|
89b199625a
|
Add Optimised setting to use -O3
|
2020-04-14 16:59:22 -04:00 |
Isaac Connor
|
9193ef4a62
|
Send the first frame twice to fix low framerate display in Chrome
|
2020-04-14 16:44:03 -04:00 |
Isaac Connor
|
8dff7a2c38
|
Merge pull request #2910 from joe540/patch-1
Support event_close_mode for record mode
|
2020-04-13 19:06:56 -04:00 |
Joe540
|
657a353c34
|
Support event_close_mode for record mode
Support event_close_mode for record mode (with linked monitor)
|
2020-04-12 20:42:43 -04:00 |
Isaac Connor
|
74e5cc3066
|
eslint
|
2020-04-10 14:22:44 -04:00 |
Isaac Connor
|
6d4d925f1e
|
Fix XSS from monitor Name, group Name, storage Name, server Name
|
2020-04-10 12:42:41 -04:00 |
Isaac Connor
|
d99ec696b4
|
reorganize to reduce code depth
|
2020-04-10 12:21:53 -04:00 |
Isaac Connor
|
bdfdc2a20c
|
add ability to set a filter_regexp in the defaults for an object to have new values be altered before saving
|
2020-04-10 12:17:09 -04:00 |
Isaac Connor
|
81ed022d5a
|
Add a filter_regexp to Monitor Name
|
2020-04-10 12:16:32 -04:00 |
Isaac Connor
|
fb70acdf6c
|
fix XSS in monitor Name
|
2020-04-10 11:32:01 -04:00 |
Isaac Connor
|
365f0240ad
|
fix inline javascript in ptz buttons
|
2020-04-10 11:30:30 -04:00 |
Isaac Connor
|
4f8016cc74
|
spacing in watch.php
|
2020-04-10 11:16:11 -04:00 |
Isaac Connor
|
fe96ba0a2a
|
cleanup and revert adding Event stack trace
|
2020-04-10 11:14:46 -04:00 |
Isaac Connor
|
da94985508
|
add back global servers
|
2020-04-10 11:14:09 -04:00 |
Isaac Connor
|
2d748091a2
|
handle sort_asc not being set. Handle term['val'] not being set.
|
2020-04-10 11:13:30 -04:00 |
Isaac Connor
|
a25c3dfb5c
|
Add MonitorId to event data returned for status request
|
2020-04-10 11:11:24 -04:00 |
Isaac Connor
|
45c13176dc
|
cleanup. Don't output errors that break json response
|
2020-04-10 11:10:57 -04:00 |
Isaac Connor
|
85d779a624
|
defend against XSS in Monitor Name
|
2020-04-10 11:10:13 -04:00 |
Isaac Connor
|
4fe649c776
|
defend against XSS in Monitor Name
|
2020-04-10 11:10:09 -04:00 |
Isaac Connor
|
105be40ce3
|
fix
|
2020-04-10 11:09:46 -04:00 |
Isaac Connor
|
c8128de673
|
defend against XSS in Monitor Name
|
2020-04-10 11:06:39 -04:00 |
Isaac Connor
|
e9430d48a7
|
defend against XSS in Monitor Name
|
2020-04-10 11:06:20 -04:00 |
Isaac Connor
|
aad0b9362c
|
defend against XSS in Monitor Name
|
2020-04-10 11:05:48 -04:00 |
Isaac Connor
|
7473b0572a
|
defend against XSS in Monitor Name
|
2020-04-10 11:05:19 -04:00 |
Isaac Connor
|
4f4e6a85f9
|
defend against XSS in Monitor Name
|
2020-04-10 11:05:12 -04:00 |
Isaac Connor
|
dca12d8efa
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-04-09 20:41:44 -04:00 |
Isaac Connor
|
40d386fe6c
|
Handle Zones without monitor
|
2020-04-09 20:41:34 -04:00 |
Isaac Connor
|
54758d5a4a
|
Merge pull request #2908 from outline941/zh-translate
Update Chinese translation
|
2020-04-09 09:52:14 -04:00 |
out
|
c3ab03d3c8
|
update chinese translation (~ ̄▽ ̄)~
|
2020-04-09 15:30:43 +08:00 |
outline
|
da8c265945
|
Update with updatelangs.php
|
2020-04-09 12:35:02 +08:00 |
Isaac Connor
|
7f5f0198b3
|
Merge branch 'fix_use_of_sprintf'
|
2020-04-06 11:59:43 -04:00 |
Isaac Connor
|
ea8fe7b9a9
|
check length of returned tr array to prevent errors in js log
|
2020-04-06 11:59:27 -04:00 |
Isaac Connor
|
8193e4ea4e
|
replace snprintf with hex table lookup for speed
|
2020-04-06 11:46:14 -04:00 |
Isaac Connor
|
1e38ba871d
|
Merge branch 'master' into fix_use_of_sprintf
|
2020-04-06 11:23:12 -04:00 |
Isaac Connor
|
c6e0b9be39
|
Merge branch 'master' into fix_use_of_sprintf
|
2020-04-06 11:21:43 -04:00 |
Isaac Connor
|
98e9355723
|
snprintf will put the terminator in. We don't have to.
|
2020-04-06 11:21:02 -04:00 |
Isaac Connor
|
191f05334b
|
Merge pull request #2905 from hax0kartik/fix-compilation
Fix compilation:- atoi should be within `()`
|
2020-04-06 11:00:39 -04:00 |
hax0kartik
|
face73ad7e
|
Fix compilation
|
2020-04-05 22:45:47 -04:00 |
Isaac Connor
|
2827ba38cd
|
use snprintf instead of sprintf. Fix putting a \0 terminator
|
2020-04-05 13:41:03 -04:00 |
Isaac Connor
|
14c28715d8
|
Fix warnings about hashed authentication not being available when using gnutls. Also set cmake_policy(SET CMP0054 NEW) to quiet warnings
|
2020-04-05 13:36:20 -04:00 |