Jonathan Bennett
|
fb832e7d1b
|
Adds janus_enable_audio, a switch to try to enable audio in live stream viewing.
|
2022-01-19 00:14:52 -06:00 |
Isaac Connor
|
d00aaa11e9
|
default JanusEnabled to 0 so that we can turn it off
|
2022-01-18 23:02:26 -05:00 |
|
Isaac Connor
|
3241fa59c5
|
Don't redirect if there was an error so that we display it
|
2022-01-18 23:02:26 -05:00 |
|
Jonathan Bennett
|
9e9bdd183c
|
Merge branch 'ZoneMinder:master' into janus
|
2022-01-14 14:05:23 -06:00 |
Isaac Connor
|
7c1ba721aa
|
Preface Debug with ZM
|
2022-01-13 22:15:02 -05:00 |
|
Jonathan Bennett
|
3a9c16aeea
|
First working Janus build
|
2022-01-10 23:22:37 -06:00 |
|
Isaac Connor
|
a679455a0b
|
Merge branch 'master' into merge_work_on_zms
|
2022-01-07 16:22:51 -05:00 |
|
Isaac Connor
|
cfac99be4e
|
better debugging when the row has no Id
|
2022-01-07 16:21:49 -05:00 |
|
Isaac Connor
|
df0a0c7853
|
Add CMD_ANALYZE_ON and OFF
|
2022-01-07 13:50:40 -05:00 |
|
Jonathan Bennett
|
1333d8c751
|
Adds ONVIF Motion Detection Support
|
2022-01-06 16:45:15 -06:00 |
|
Isaac Connor
|
4dd454325c
|
use options[maxfps] instead of always specifying 30fps.
|
2021-12-16 16:36:38 -05:00 |
|
Isaac Connor
|
30e4d72c1d
|
Implement CMD_MAXFPS
|
2021-12-16 16:36:12 -05:00 |
|
Isaac Connor
|
6b18b2889d
|
Add skip_locked and ExecuteInterval
|
2021-12-13 15:01:17 -05:00 |
|
Isaac Connor
|
a9ef5bf731
|
Add STATE_UNKNOWN and correct values of other states
|
2021-12-09 12:36:03 -05:00 |
|
Isaac Connor
|
45559123af
|
Add numCoords, Coords, Area, AlarmRGB to Zone object. Also add Points(), AreaCoords, svg_polygon utility functions to it.
|
2021-12-05 17:45:26 -05:00 |
|
Isaac Connor
|
1277e75278
|
Detect group hierarchy loops and break them.
|
2021-12-03 13:25:50 -05:00 |
|
Isaac Connor
|
21218491f7
|
Add EventStartCommand and EventEndCommand to monitors ui
|
2021-11-26 19:22:07 -05:00 |
|
Isaac Connor
|
836fe8c2b1
|
spacing
|
2021-11-17 18:57:44 -05:00 |
|
Isaac Connor
|
b1d881b118
|
Report more saving errors to ui
|
2021-11-17 18:57:36 -05:00 |
|
Isaac Connor
|
a0666e777a
|
Merge branch 'master' into add_manufacturer_model_to_monitors
|
2021-11-17 17:45:47 -05:00 |
|
Isaac Connor
|
c37d8eeded
|
spacing and report save errors
|
2021-11-17 17:45:38 -05:00 |
|
Isaac Connor
|
71c29afa7b
|
Merge branch 'master' into add_manufacturer_model_to_monitors
|
2021-11-15 09:47:34 -05:00 |
|
Isaac Connor
|
98e29e7ef6
|
implement UrlToZMS in Monitor
|
2021-11-12 15:11:48 -05:00 |
|
Isaac Connor
|
944c04e5b4
|
Whitespace
|
2021-11-12 15:11:48 -05:00 |
|
Isaac Connor
|
193f349e38
|
implement Event::canEdit
|
2021-11-12 13:37:01 -05:00 |
|
Isaac Connor
|
4c2d50c1f4
|
implement UrlToZMS in Monitor
|
2021-11-10 14:18:58 -05:00 |
|
Isaac Connor
|
e617eb8615
|
Whitespace
|
2021-11-09 13:59:14 -05:00 |
|
Isaac Connor
|
1fd99424bb
|
Merge branch 'master' into add_manufacturer_model_to_monitors
|
2021-11-05 10:13:41 -04:00 |
|
Isaac Connor
|
0c222f66ee
|
Add sort_asc, sort_field and limit to the filter QueryString
|
2021-10-25 12:34:51 -04:00 |
|
Isaac Connor
|
16d0e269df
|
WHen saving v4l settings redirect back to watch instead of console.
|
2021-10-19 12:39:37 -04:00 |
|
Isaac Connor
|
a465403c72
|
Handle when SERVER['HTTP_HOST'] is not set
|
2021-10-05 19:49:42 -04:00 |
|
Isaac Connor
|
c72d34f176
|
fix validInt to take negative integers. Introduce validCardinal to handle positive integers
|
2021-10-05 19:49:42 -04:00 |
|
Isaac Connor
|
1f04723f3a
|
dbError is supposed to take the sql that caused the error. So pass something to satisfy php
|
2021-10-05 19:49:42 -04:00 |
|
Isaac Connor
|
2f12615f08
|
assign REQUEST['newMonitor'] to a variable to simplify code. Fixup ModelId and ManufacturerId saving.
|
2021-09-25 10:33:16 -04:00 |
|
Isaac Connor
|
7ca7d40b6f
|
Add defaults for ModelId and ManufacturerId. Fixes the methods for loading them
|
2021-09-25 10:32:04 -04:00 |
|
Isaac Connor
|
227e5794fa
|
Merge branch 'master' into add_manufacturer_model_to_monitors
|
2021-09-08 18:32:46 -04:00 |
|
Isaac Connor
|
b2415643f6
|
Add missing Importance member
|
2021-09-08 13:57:46 -04:00 |
Peter Keresztes Schmidt
|
6e96cbe14a
|
Misc: Merge ZM_HAS_V4L with ZM_HAS_V4L2
|
2021-09-08 00:19:08 +02:00 |
r01k
|
79e041d0f0
|
Fixed bug that caused 'Call to undefined function Error()' in control_functions.php. Exception was being raised due to logger.php not being included in control_functions.php.
|
2021-08-20 22:42:57 -04:00 |
|
Isaac Connor
|
eb1124c406
|
Spacing and quotes
|
2021-08-18 10:53:59 -04:00 |
|
Isaac Connor
|
b9efe627f3
|
implement Event->canView
|
2021-08-18 10:53:59 -04:00 |
|
Isaac Connor
|
301d8fa5fa
|
Change monitor->canView semantics so that a specified monitorId trumps the Monitors:None setting. This is so that the console can be hidden, but the group dropdown still gets populated.
|
2021-08-18 10:53:59 -04:00 |
|
Isaac Connor
|
a311455526
|
clean up code logic so that if we are executing an unchanged filter we don't do the unecessary save.
|
2021-08-12 13:42:36 -04:00 |
|
Isaac Connor
|
cd3359c3eb
|
spacing. Add defaults for AutoMoveTo and AutoCopyTo so that we don't get false changes. redirect is a global, so make it so. Re-null the Id of the filter object after temp execute so that we don't reference a no longer existing filter.
|
2021-08-12 12:53:46 -04:00 |
|
Isaac Connor
|
672de6e84f
|
event may have changed (have endtime set) between load and saving Archived bit. Lock the event which now also reloads it.
|
2021-08-06 19:15:22 -04:00 |
|
Isaac Connor
|
500ced2dc5
|
When locking, use the results to reload the object fields fresh as they may have changed since the object was loaded
|
2021-08-06 19:14:43 -04:00 |
|
Isaac Connor
|
105851b70c
|
Actually delete the snapshot record, not just the event connection
|
2021-08-06 13:17:02 -04:00 |
|
Isaac Connor
|
c6209ce460
|
Store new Model and Manufacturer when saving Monitor
|
2021-07-07 09:47:00 -04:00 |
|
Isaac Connor
|
3bb2b804b3
|
Include Model and Manufacturer to includes in Monitor.php
|
2021-07-07 09:46:36 -04:00 |
|
Isaac Connor
|
24a77d7fb3
|
Add ManufacturerId to Model
|
2021-07-07 09:46:12 -04:00 |