Isaac Connor
|
a7b553cdbe
|
code style and correct license. Author was contacted and ok'd the change. Fies #2883
|
2020-04-23 10:37:42 -04:00 |
|
Isaac Connor
|
098ab4faae
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-04-23 10:26:25 -04:00 |
|
Isaac Connor
|
e770be2e13
|
Merge branch 'release-1.34'
|
2020-04-23 10:26:16 -04:00 |
|
Isaac Connor
|
055c20c3cc
|
fix eslint
|
2020-04-23 10:23:46 -04:00 |
|
Isaac Connor
|
eab08783e9
|
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
|
2020-04-23 10:10:08 -04:00 |
|
Isaac Connor
|
10d89ed82e
|
Spacing, quotes, improve debug messages.
|
2020-04-23 10:00:11 -04:00 |
Isaac Connor
|
a735f2cd1b
|
Merge pull request #2919 from connortechnology/fix_recaptcha
Fix recaptcha
|
2020-04-22 17:54:15 -04:00 |
|
Isaac Connor
|
4b53c7660e
|
Merge pull request #2911 from hax0kartik/dl-curl
Dynamically load libcurl, libvlc and libvnc
|
2020-04-22 09:49:37 -04:00 |
|
Isaac Connor
|
264ba6525b
|
Remove debug
|
2020-04-21 12:19:18 -04:00 |
|
Isaac Connor
|
b384d233ae
|
add async and defer to recaptcha load
|
2020-04-21 09:20:33 -04:00 |
|
Isaac Connor
|
543628d0ee
|
cleanup, and add missing </ul> in the navbar when not logged in which seems to be causing the recaptcha render to fail
|
2020-04-21 09:20:04 -04:00 |
|
Isaac Connor
|
d0e83fcfcb
|
handle case where g-recaptcha-response is not in the request, due to failure to render the recaptcha
|
2020-04-21 09:19:29 -04:00 |
|
Isaac Connor
|
3e8de7dd6c
|
Move the script include for recaptcha into the view instead of the xhtmlHeaders function. Fixes #2918
|
2020-04-21 08:30:42 -04:00 |
|
Isaac Connor
|
76d88621ac
|
clean up Stream and EventStream Object initializers
|
2020-04-21 08:28:44 -04:00 |
Patrick
|
8fd32b8f1d
|
add area definition to zone creation via API
|
2020-04-18 17:52:42 -04:00 |
|
Isaac Connor
|
ac017a5c72
|
Add support for strftimes' %r when converting to moment.js formatting
|
2020-04-18 17:51:34 -04:00 |
|
Isaac Connor
|
924841ae71
|
Merge pull request #2913 from connortechnology/fix_monitor_loading
Fix monitor loading
|
2020-04-18 17:49:34 -04:00 |
|
Isaac Connor
|
8d7b79bd03
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-04-17 11:04:16 -04:00 |
|
Isaac Connor
|
3700b9fcbe
|
fix eslint
|
2020-04-17 11:04:07 -04:00 |
|
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 |
hax0kartik
|
f15ffee043
|
Do not include the static libvnc library
|
2020-04-14 03:11:28 +05:30 |
|
hax0kartik
|
640dfdd4a0
|
Dynamically load libvnc at runtime
|
2020-04-14 02:46:01 +05:30 |
|
hax0kartik
|
1c4e4abbab
|
Do not look for gnutls if libjwt is not found
|
2020-04-14 00:40:47 +05:30 |
|
hax0kartik
|
143ad394a9
|
Dynamically load libvlc
|
2020-04-14 00:15:06 +05:30 |
|
hax0kartik
|
f4c4441308
|
Convert all fatals in lincurl camera to errors
|
2020-04-13 18:55:29 +05:30 |
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 |