1ae8fcae63
add a label for rateControl
2022-02-27 14:31:04 -05:00
5b319258c4
fix eslint
2022-02-27 14:26:05 -05:00
e33b41745d
Merge branch 'master' into replace_function_concept
2022-02-27 14:04:01 -05:00
1d15de0534
Make getMonitorCapturingOptions a member of the class, so can call it getCapturingOptions. Same with Analysing and Recording options
2022-02-27 14:03:48 -05:00
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
47fae7a296
spacing, improve debug
2022-02-26 19:18:28 -05:00
6fc5803e16
Add another clearInterval to prevent looping during window.location
2022-02-25 15:54:56 -05:00
9b0714d20d
Fix use of value instead of val in filter term
2022-02-25 14:14:02 -05:00
813fd36b0a
clearInterval when location.replacing so that timer stops. Prevents infinite loop
2022-02-25 14:13:18 -05:00
b2428b5522
Merge branch 'master' into lazy-load-images
2022-02-22 08:47:26 -05:00
831dca814f
Include EndDateTimeShort in event stats
2022-02-22 08:31:41 -05:00
dfb6a96b42
Handle empty endtime more gracefully. If there is a next event just jump to it.
2022-02-22 08:31:41 -05:00
959b08f46a
Include EndDateTimeShort in event ajax response
2022-02-22 08:31:41 -05:00
d7c8e32ec9
Remove non-translations
2022-02-22 08:31:41 -05:00
88a68af775
DefaultCodec is for event view, not live
2022-02-22 08:31:41 -05:00
cf7b3b9f9f
DefaultCodec is for event view, not live
2022-02-22 08:31:41 -05:00
3a2e5a580b
Debug the contents of REQUEST on every hit.
2022-02-22 08:31:41 -05:00
5aef8408a4
serialize form instead of just passing filter id because the modal can now handle unsaved filters
2022-02-22 08:31:41 -05:00
b32164e992
Add handling of NOT IN and =\[\] and \!\[\]
2022-02-22 08:31:41 -05:00
e4f5f59e8d
3 more img tags
2022-02-22 08:31:41 -05:00
ce267c7e3c
Most programmatic images are lazy.
2022-02-22 08:31:02 -05:00
a40b305065
Merge branch 'master' into replace_function_concept
2022-02-20 09:52:03 -05:00
1a54a96c04
Improve title on alarm buttons when we don't have permission. Move onclick from data-on-click to setup in initPage only if permitted
2022-02-18 17:11:18 -05:00
002b2c39aa
fix button assignments. Don't abort ajax, as it might be important
2022-02-18 17:11:18 -05:00
adf8413333
Include EndDateTimeShort in event stats
2022-02-17 13:31:25 -05:00
8dedac1a21
Handle empty endtime more gracefully. If there is a next event just jump to it.
2022-02-17 13:30:50 -05:00
909c0e903f
Include EndDateTimeShort in event ajax response
2022-02-17 13:30:01 -05:00
cd2c977ed8
Merge branch 'master' into replace_function_concept
2022-02-16 14:25:38 -05:00
f3d3cad419
Remove non-translations
2022-02-16 09:59:48 -05:00
055414c778
DefaultCodec is for event view, not live
2022-02-16 09:59:48 -05:00
93ab345a3a
DefaultCodec is for event view, not live
2022-02-16 09:59:48 -05:00
efc1ec770c
Debug the contents of REQUEST on every hit.
2022-02-15 18:52:46 -05:00
b67e7b8111
serialize form instead of just passing filter id because the modal can now handle unsaved filters
2022-02-15 18:52:46 -05:00
8b14885541
Add handling of NOT IN and =\[\] and \!\[\]
2022-02-15 18:52:46 -05:00
2bc0ec269a
Merge branch 'master' into replace_function_concept
2022-02-15 17:02:03 -05:00
a149fa37fc
Make filter debug modal work on non-saved filter
2022-02-15 10:37:14 -05:00
59039de985
Use =[] instead of IN as operator. Fixes #3432
2022-02-15 10:23:30 -05:00
554840d811
Revert "Add SQL opTypes IN, NOT IN to filter view, #3432"
2022-02-15 10:07:48 -05:00
13f2076dc9
Add SQL opTypes IN, NOT IN to filter view, #3432
...
This possibly fixes the issue where changing the filter for an event
view via the filter button would produce invalid SQL and SQL errors.
web_php[43835].ERR [1.2.3.4] [SQL-ERR 'SQLSTATE[HY000]: General error: 4078 Illegal parameter data types int and row for operation '='', statement was 'SELECT E.*, M.Name AS Monitor FROM `Events` AS E INNER JOIN Monitors AS M ON E.MonitorId = M.Id WHERE ( ( E.StartDateTime >= '2022-02-14 00:47:41'
and E.StartDateTime <= '2022-02-14 11:47:41' )
and E.MonitorId = ('1','3')
) ORDER BY E.StartDateTime DESC' params:] at /usr/share/zoneminder/www/includes/database.php line 161
When in the events view, clicking the filterBtn sends us to the filter view with this query term (url-decoded):
&filter[Query][terms][2][attr]=MonitorId&filter[Query][terms][2][op]=IN&filter[Query][terms][2][val]=1,3&filter[Query][sort_asc]=0
but the filter view displays this as "equals", not "in set", because it doesn't know IN from opTypes, only =[].
2022-02-15 14:15:08 +01:00
c8a2b6d679
Merge branch 'master' into replace_function_concept
2022-02-14 12:03:25 -05:00
b6d2d96d11
Remove offending extra comma
2022-02-14 09:47:59 -05:00
485cc26065
Merge branch 'master' into replace_function_concept
2022-02-12 22:17:47 -05:00
f47aa98b43
html is not a global.. confusing yes.
2022-02-12 22:17:03 -05:00
0e2f2cf572
Merge branch 'timeline_multi_monitor'
2022-02-11 18:08:41 -05:00
94bc40a6cf
Split the data by monitor and display a monitor image/info for each monitor.
2022-02-11 18:06:42 -05:00
3250e0edfe
simplify some code, pass around zm_event json objects instead of event_id. Each monitor has it's own image so when loading event data put it into a div/img referenced by monitor Id
2022-02-11 18:06:08 -05:00
4cc82e24f3
convert some tags to classes instead of ids. Add margin: 0 auto so that monitor images are centered
2022-02-11 18:04:54 -05:00
cb80283398
Merge branch 'master' into timeline_multi_monitor
...
update code to use jquery instead of mootools
when only viewing 1 monitor, split view in half
load first event image righ toff the bat
2022-02-11 18:03:35 -05:00
b700e7b5ce
Merge pull request #3424 from r01k/master
...
Fixed in export.php "Class 'Filter' not found" and SQL query with wrong syntax
2022-02-10 21:39:50 -05:00
bcd0b6430b
Convert Fatal()s to Errors() which is really more appropriate anyways. Maybe Fixes #3426
2022-02-08 18:12:06 -05:00
b866888062
Change title of settings button to give an indication WHY it isn't enabled
2022-02-08 17:52:59 -05:00
9fee64b62f
detaint language file.
2022-02-08 14:31:01 -05:00
2db781ed44
Test for valid language file when saving user.
2022-02-08 14:30:53 -05:00
b1d235f991
Use getBodyTopHTML so that we get error messages in UI
2022-02-08 13:33:22 -05:00
d7a8947e05
Only include janus.js if needed
2022-02-08 13:33:02 -05:00
cc9306afe3
Change the error message banner to always take up space and be seen.
2022-02-08 13:32:37 -05:00
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
f66a463574
Merge branch 'master' into replace_function_concept
2022-02-08 12:07:30 -05:00
e7cd63a6ff
replace Function with Recording, Analysing, Capturing
2022-02-08 11:22:41 -05:00
b005927ea3
debug when no data.frames
2022-02-08 11:21:56 -05:00
390d77a924
Replace Function with Capturing
2022-02-08 11:21:36 -05:00
01fad8a0dc
Replace Function monitor filter with Capturing, Analysing, Recording filters.
2022-02-08 11:21:16 -05:00
dcf6e5da46
If there is an ajax error, and the error is unauthorized, then reload the page.
2022-02-08 11:20:54 -05:00
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
aad79d3407
Rename MonitorAnalysingOptions => AnalysingOptions as they will have to be prefixed with module name anyways.
2022-02-08 11:19:36 -05:00
03f6637060
Only load janus.js if we are using it
2022-02-08 11:03:25 -05:00
2f5a403fc4
Handle when no swap is configured
2022-02-08 10:04:19 -05:00
33473eac6a
Add arp-scan as a tool for getting list of devices on network. Add an interface specifier to monitor probe just like on onvif-probe. Rough in support for Hikvision cameras
2022-02-07 12:33:53 -05:00
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
69053424cd
When adding a new monitor, ModelId and ManufacturerId are not defined, so handle that
2022-02-06 19:06:35 -05:00
02d896abe2
Fixed in export.php "Class 'Filter' not found" and construction of SQL query with wrong syntax
2022-02-04 22:19:15 -05:00
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
a6dc7ba0fc
Add debugging, but commented out
2022-02-03 17:30:38 -05:00
3c655807e8
Use new Event->Server function to return the correct (and matching url to zms) url to use for ajax status calls. Fixes errors in a multi-server environment.
2022-02-03 14:47:32 -05:00
7a95aa7210
Don't render cues if we don't have any. This occurs on initial load we call changeScale which would re-render the cues but the cur ajax hasn't completed yet, so this just avoids an error being logged
2022-02-03 14:46:39 -05:00
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
bd68b9e3af
Not ready for OutputSource yet
2022-02-02 17:10:05 -05:00
10e39b3b13
:wqMerge branch 'master' into replace_function_concept
2022-02-02 17:08:01 -05:00
1f9e654821
Default limit to 0 which means no limit
2022-02-02 12:28:58 -05:00
3feb4fcc51
Merge branch 'master' into master
2022-02-02 12:28:17 -05:00
31eff49a46
Implement filter limits. Which go before pagination/advanced search limits
2022-02-02 10:49:05 -05:00
3d5767b326
Merge branch 'master' into multistream
2022-02-01 16:52:42 -05:00
bc4884afe5
fix replacement on escape. For some reason needs double bacl slash
2022-02-01 10:07:04 -05:00
462ec45a07
Escape newlines in config values.
2022-02-01 09:46:37 -05:00
0eb4d95d0e
remove geolocation copies from config to javscript land. Now all of config is brought in my skin.js.php
2022-01-31 18:33:03 -05:00
8e62562afd
Move onclick to the surrounding div instead of the img. Fixes clicking on montage
2022-01-26 21:39:29 -05:00
fe8747e5e7
Make ONVIF inputs 100%
2022-01-26 11:45:07 -05:00
23bfbcd6ce
Merge branch 'master' into multistream
2022-01-26 10:13:20 -05:00
57a697093e
Remove redundant JS define
2022-01-25 22:38:06 -06:00
ec9403fb6f
Adds Amcrest On-camera Motion Detection
2022-01-25 22:38:00 -06:00
d110987935
Fix indentation for ESLint
2022-01-22 13:37:44 -06:00
abbd27d1cb
Remove hard-coded config Vars
2022-01-22 13:31:47 -06:00
8125aa633b
Merge branch 'ZoneMinder:master' into master
2022-01-22 12:20:13 -06:00
90f75dae93
Make config entries const
2022-01-22 12:33:48 -05:00
3a0b88c013
Don't make private config entries available to js land.
2022-01-22 12:31:36 -05:00
ce2d605b3d
load Private as well as Name,Value from Config
2022-01-22 12:31:15 -05:00
45db266ede
Put full config available to javascript
2022-01-22 12:07:18 -05:00
4910ec752f
Merge branch 'master' into multistream
2022-01-22 11:52:19 -05:00
2e9bda1af1
Add firefox specific workaround for Janus streaming
2022-01-21 23:21:41 -06:00
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
Ben Dailey
Isaac Connor
Jernej Jakob
r01k
Jonathan Bennett