Isaac Connor
|
84ae91fe24
|
Comment out width and height setting on the imageFrame
|
2022-04-28 15:45:35 -04:00 |
|
Isaac Connor
|
2a7217ec0d
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-04-27 15:55:12 -04:00 |
|
Isaac Connor
|
0cb15d3418
|
Remove extra { breaking ptz
|
2022-04-23 19:29:04 -04:00 |
|
Isaac Connor
|
07e6ae931f
|
Add mid and zid to zone polygon so that we can use them in atached onclicks
|
2022-04-22 15:50:00 -04:00 |
|
Isaac Connor
|
91a5642edc
|
merge
|
2022-04-19 17:07:20 -04:00 |
|
Isaac Connor
|
1eaeccc564
|
Handle zones not being set in options
|
2022-04-19 12:31:43 -04:00 |
|
Isaac Connor
|
7b5ee86ee8
|
Move svg zone display into Monitor->getStreamHTML. Remove most of it because scaling is now automatic. Move styling to css
|
2022-04-10 18:54:01 -04:00 |
|
Isaac Connor
|
e8391ad0be
|
Move collapsed status to Monitor.php and put back setting width and height on the monitorStream container.
|
2022-04-10 17:28:38 -04:00 |
|
Isaac Connor
|
906951e450
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-04-06 10:37:10 -04:00 |
|
Isaac Connor
|
0e337cd8bf
|
Remove support for Cambozola which no longer works or is needed.
|
2022-04-06 10:37:02 -04:00 |
|
Isaac Connor
|
4fd027fbcc
|
Fix test for chrome version 7 by not including periods. We only care about the major and php is confused.
|
2022-04-04 17:03:36 -04:00 |
|
Isaac Connor
|
ed7c139fb3
|
Add backtrace to ajaxError
|
2022-04-04 15:00:33 -04:00 |
|
Isaac Connor
|
d0ee8dc6fd
|
remove duplicated factor code, define speed so that it doesn't generate an error if not HasSpeed in Control.
|
2022-03-29 17:19:31 -04:00 |
|
Isaac Connor
|
723c10ca19
|
Cleanup options, add DecodingOptions
|
2022-03-28 17:45:01 -04:00 |
Isaac Connor
|
531793276f
|
Fix auth'd user information being saved to session before switching session id's leaving bogus authenticated user in previous session.
|
2022-03-21 15:31:44 -04:00 |
|
Isaac Connor
|
23aa41091f
|
Add Trigger/etc to onMotion recording option
|
2022-03-20 19:13:46 -04:00 |
|
Isaac Connor
|
f49601a173
|
Add filtering to Username to prevent XSS
|
2022-03-10 14:09:41 -05:00 |
|
Isaac Connor
|
0c31e35b4e
|
Add classes to fields of monitor status so we can style them as needed
|
2022-03-04 12:06:49 -05:00 |
|
Isaac Connor
|
e33b41745d
|
Merge branch 'master' into replace_function_concept
|
2022-02-27 14:04:01 -05:00 |
|
Isaac Connor
|
13251b133a
|
Make getMonitorCapturingOptions a member of the class, so can call it getCapturingOptions. Same with Analysing and Recording options
|
2022-02-27 14:03:37 -05:00 |
|
Isaac Connor
|
9b0714d20d
|
Fix use of value instead of val in filter term
|
2022-02-25 14:14:02 -05:00 |
|
Isaac Connor
|
b32164e992
|
Add handling of NOT IN and =\[\] and \!\[\]
|
2022-02-22 08:31:41 -05:00 |
Ben Dailey
|
ce267c7e3c
|
Most programmatic images are lazy.
|
2022-02-22 08:31:02 -05:00 |
|
Isaac Connor
|
cd2c977ed8
|
Merge branch 'master' into replace_function_concept
|
2022-02-16 14:25:38 -05:00 |
|
Isaac Connor
|
8b14885541
|
Add handling of NOT IN and =\[\] and \!\[\]
|
2022-02-15 18:52:46 -05:00 |
|
Isaac Connor
|
485cc26065
|
Merge branch 'master' into replace_function_concept
|
2022-02-12 22:17:47 -05:00 |
|
Isaac Connor
|
9fee64b62f
|
detaint language file.
|
2022-02-08 14:31:01 -05:00 |
|
Isaac Connor
|
2db781ed44
|
Test for valid language file when saving user.
|
2022-02-08 14:30:53 -05:00 |
|
Isaac Connor
|
8cdd96f286
|
Implement a check on change of language. Make sure that the specified language file exists. Reports errors to UI
|
2022-02-08 13:29:51 -05:00 |
|
Isaac Connor
|
f66a463574
|
Merge branch 'master' into replace_function_concept
|
2022-02-08 12:07:30 -05:00 |
|
Isaac Connor
|
390d77a924
|
Replace Function with Capturing
|
2022-02-08 11:21:36 -05:00 |
|
Isaac Connor
|
38c9ac1521
|
Update state action, replacing Function with Recording, Analysing, Capturing. Redirect to console instead of switching view.
|
2022-02-08 11:20:27 -05:00 |
|
Isaac Connor
|
aad79d3407
|
Rename MonitorAnalysingOptions => AnalysingOptions as they will have to be prefixed with module name anyways.
|
2022-02-08 11:19:36 -05:00 |
|
Isaac Connor
|
5078eecdfd
|
Add in get_networks and get_subnets as utilities to parse devices and networks in preparation for scanning/probing
|
2022-02-07 12:31:31 -05:00 |
|
Isaac Connor
|
69053424cd
|
When adding a new monitor, ModelId and ManufacturerId are not defined, so handle that
|
2022-02-06 19:06:35 -05:00 |
|
Isaac Connor
|
b3092f2f59
|
Add special handling for skip_locked, as it is a checkbox. Don't update REQUEST['Id'] on execute so we can redirect to the original filter.
|
2022-02-03 17:31:37 -05:00 |
|
Isaac Connor
|
a6dc7ba0fc
|
Add debugging, but commented out
|
2022-02-03 17:30:38 -05:00 |
|
Isaac Connor
|
7515711eb8
|
Implement Server function which figures out which Server likely has the video. Use it to remove duplicate logic
|
2022-02-03 14:45:17 -05:00 |
|
Isaac Connor
|
bd68b9e3af
|
Not ready for OutputSource yet
|
2022-02-02 17:10:05 -05:00 |
|
Isaac Connor
|
10e39b3b13
|
:wqMerge branch 'master' into replace_function_concept
|
2022-02-02 17:08:01 -05:00 |
|
Isaac Connor
|
1f9e654821
|
Default limit to 0 which means no limit
|
2022-02-02 12:28:58 -05:00 |
|
Isaac Connor
|
23bfbcd6ce
|
Merge branch 'master' into multistream
|
2022-01-26 10:13:20 -05:00 |
Jonathan Bennett
|
ec9403fb6f
|
Adds Amcrest On-camera Motion Detection
|
2022-01-25 22:38:00 -06:00 |
|
Jonathan Bennett
|
8125aa633b
|
Merge branch 'ZoneMinder:master' into master
|
2022-01-22 12:20:13 -06:00 |
|
Isaac Connor
|
ce2d605b3d
|
load Private as well as Name,Value from Config
|
2022-01-22 12:31:15 -05:00 |
|
Jonathan Bennett
|
52e48c02b6
|
Add janus_path and janus_secret, allowing for more secure and flexible Janus installs
|
2022-01-21 22:23:41 -06:00 |
|
Isaac Connor
|
4bf55b1af1
|
Use net zm_setcookie
|
2022-01-20 09:48:09 -05:00 |
|
Isaac Connor
|
3cd6fbdc12
|
Use net zm_setcookie
|
2022-01-20 09:48:02 -05:00 |
|
Isaac Connor
|
9395b7e47c
|
Use net zm_setcookie
|
2022-01-20 09:47:53 -05:00 |
|
Isaac Connor
|
a57206ef54
|
Implement getMonitorStateHTML to synchronize it between montage and live view, cycle etc. Reuseable code. Also the structure is required by MonitorStream.js
|
2022-01-20 09:47:36 -05:00 |