Isaac Connor
|
62f78bfeb7
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-09-04 14:58:48 -04:00 |
|
Isaac Connor
|
ae56a1f363
|
Turn off output buffering in view_video
|
2020-09-04 14:58:43 -04:00 |
Isaac Connor
|
1d94424d78
|
Merge pull request #3034 from mnoorenberghe/event_back_3033
Specify a function name for data-on-click to fix the Back/Close button for Events.
|
2020-09-04 10:41:44 -04:00 |
Matthew Noorenberghe
|
bd829f8aa1
|
Specify a function name for data-on-click to fix the Back/Close button for Events. Fixes #3033
|
2020-09-04 10:25:05 -04:00 |
|
Matthew Noorenberghe
|
77cca7efac
|
eslint --fix
|
2020-09-04 10:02:43 -04:00 |
|
Isaac Connor
|
46790bf401
|
Add monitor json data
|
2020-09-03 18:25:00 -04:00 |
|
Isaac Connor
|
1f810c8947
|
Populate the function modal from the javascript monitors array before viewing.
|
2020-09-03 18:24:45 -04:00 |
|
Isaac Connor
|
1e4d80ee7b
|
Make the function modal monitor-agnostic . It will get populated before being made visisble
|
2020-09-03 18:24:09 -04:00 |
|
Isaac Connor
|
ea5d19412c
|
Only include the function modal once at the end as it will get populated with data before being made visible
|
2020-09-03 18:23:26 -04:00 |
|
Isaac Connor
|
240f4ceabd
|
Fix code warning if no value is selected in htmlSelect
|
2020-09-03 18:21:38 -04:00 |
|
Isaac Connor
|
47971bb8f5
|
Update function action to use Monitor object
|
2020-09-03 18:21:08 -04:00 |
|
Isaac Connor
|
6f5acece66
|
FIx Record Entry
|
2020-09-03 18:20:51 -04:00 |
|
Isaac Connor
|
98874cb6d1
|
provide error message when trying to delete Archived events.
|
2020-09-03 17:04:52 -04:00 |
|
Isaac Connor
|
c934dee233
|
Do not allow the deleting of Archived Events
|
2020-09-03 17:02:48 -04:00 |
|
Isaac Connor
|
94c7708df5
|
Warn when the specified selected value isn't in the passed options. Don't default to adding id in htmlSelect. Shouldbe passed in behaviours
|
2020-09-03 10:42:33 -04:00 |
|
Isaac Connor
|
fb9129a4d3
|
Add missing Mocord option
|
2020-09-03 10:40:10 -04:00 |
|
Isaac Connor
|
d4d0a971d1
|
get rid of errant fo
|
2020-09-03 10:19:59 -04:00 |
|
Isaac Connor
|
dd5e342196
|
use xhtmlFooter
|
2020-09-02 18:17:12 -04:00 |
|
Isaac Connor
|
b0eacba0ee
|
use xhtmlFooter
|
2020-09-02 18:14:45 -04:00 |
|
Isaac Connor
|
22a40edd71
|
spacing
|
2020-09-02 18:12:35 -04:00 |
|
Isaac Connor
|
6abad06db2
|
increase width of frames view
|
2020-09-02 18:12:26 -04:00 |
|
Isaac Connor
|
70b73048cc
|
add csrf checks to frames view
|
2020-09-02 18:11:53 -04:00 |
|
Isaac Connor
|
18671b7c19
|
use xhtmlFooter instead of html since it now contains all the javascript
|
2020-09-02 17:57:32 -04:00 |
|
Isaac Connor
|
69bee20ef5
|
use xhtmlFooter instead of html since it now contains all the javascript
|
2020-09-02 17:56:30 -04:00 |
|
Isaac Connor
|
5b53289fee
|
fix html structure
|
2020-09-02 17:55:34 -04:00 |
|
Isaac Connor
|
7623733840
|
use xhtmlFooter and fix spacing
|
2020-09-02 17:55:23 -04:00 |
|
Isaac Connor
|
b1d4115df8
|
Handle case where IN operator is used with 1 value
|
2020-09-02 17:55:06 -04:00 |
|
Isaac Connor
|
aa4e9600eb
|
Update to use MonitorStream
|
2020-09-02 17:36:01 -04:00 |
|
Isaac Connor
|
e25708ce99
|
use getBodyTopHTML and xhtmlFooter
|
2020-09-02 17:35:46 -04:00 |
|
Isaac Connor
|
fa780c5020
|
use xhtmlFooter instead of html since it now contains all the javascript
|
2020-09-02 17:35:24 -04:00 |
|
Isaac Connor
|
f38692795e
|
use xhtmlFooter instead of html since it now contains all the javascript
|
2020-09-02 17:35:13 -04:00 |
|
Isaac Connor
|
cf1f408e96
|
Don't need pauseString and playStream anymore
|
2020-09-02 17:34:09 -04:00 |
|
Isaac Connor
|
c6bc6704b3
|
use xhtmlFooter instead of html since it now contains all the javascript
|
2020-09-02 17:33:56 -04:00 |
|
Isaac Connor
|
f3873d65e4
|
remove debug
|
2020-09-02 17:33:38 -04:00 |
|
Isaac Connor
|
bc710bc826
|
use xhtmlFooter instead of html since it now contains all the javascript
|
2020-09-02 17:33:09 -04:00 |
|
Isaac Connor
|
a6ad57b393
|
fix html validation errors
|
2020-09-02 17:32:24 -04:00 |
|
Isaac Connor
|
c2760ef768
|
add needed js stuff for streaming
|
2020-09-02 17:28:08 -04:00 |
|
Isaac Connor
|
d243d798ff
|
add needed js stuff for streaming
|
2020-09-02 17:27:59 -04:00 |
|
Isaac Connor
|
5b0123e710
|
Not necessary to specify type=text/css
|
2020-09-02 17:27:31 -04:00 |
|
Isaac Connor
|
77b978ed26
|
Handle non-connected monitor in processCmd. Quit when zm_terminate in checkInitiialized loop
|
2020-09-02 17:22:39 -04:00 |
|
Isaac Connor
|
794474afab
|
Add UNKNOWN status type. test for shared_data in ShmValid()
|
2020-09-02 17:22:00 -04:00 |
|
Isaac Connor
|
0d07f93cd7
|
fix layout of svg
|
2020-09-02 16:37:39 -04:00 |
|
Isaac Connor
|
3a9cec8e4d
|
We no longer care about not being able to connect to the monitor.
|
2020-09-02 16:37:11 -04:00 |
|
Isaac Connor
|
ea3fcb16a6
|
Changes to not just die if not connected to monitor. Instead wait around spitting out an error image.
|
2020-09-02 16:36:05 -04:00 |
|
Isaac Connor
|
43e1ac2ad4
|
Send Text frame when unable to connect to the monitor.
|
2020-09-02 16:35:27 -04:00 |
|
Isaac Connor
|
f60d6ff1a3
|
Use BOUNDARY instead of ZoneMinderFrame
|
2020-09-02 16:34:56 -04:00 |
|
Isaac Connor
|
0cd35518c3
|
Fix id on nav
|
2020-09-02 14:47:07 -04:00 |
|
Isaac Connor
|
ab116a1a6f
|
use xhtmlFooter as it now contains the javascript instead of xhtmlHeader
|
2020-09-02 14:47:00 -04:00 |
|
Isaac Connor
|
84bed1b16a
|
include MonitorStream, fix layout of image stream. Update buttons. start with a static image, MonitorStream will start the streaming
|
2020-09-02 14:46:45 -04:00 |
|
Isaac Connor
|
7b4569392c
|
use xhtmlFooter as it now contains the javascript instead of xhtmlHeader
|
2020-09-02 14:46:08 -04:00 |