Isaac Connor
|
10402fdabe
|
Use template backticks for the Notes string to handle multi-line
|
2022-03-04 13:41:19 -05:00 |
|
Isaac Connor
|
8db08f5a10
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-03-04 12:09:44 -05:00 |
|
Isaac Connor
|
1fb42d0b77
|
Change api of selectLayout. Now takes a value. use MonitorStream.setScale to set image scale. In general fix behaviour when switching between fixed sizes, scales and layouts
|
2022-03-04 12:08:29 -05:00 |
|
Isaac Connor
|
920f5470a8
|
Don't set width&height on img. img is always 100% of container. Don't show zoom unless it is != 1.0. Only update buttons if there is a change, to reduce redraws
|
2022-03-04 12:07:32 -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
|
5b9ca3f164
|
Merge pull request #3447 from jp-bennett/master
Adds support for Janus 1.x
|
2022-02-28 20:49:56 -05:00 |
Jonathan Bennett
|
c28c043773
|
Adds support for Janus 1.x
|
2022-02-28 18:05:17 -06:00 |
|
Isaac Connor
|
3a8b46b7df
|
Merge pull request #3446 from jp-bennett/master
Add additional Firefox streaming workaround
|
2022-02-28 15:50:49 -05:00 |
|
Isaac Connor
|
494da65b9a
|
Replace use of Function with Recording
|
2022-02-28 15:46:38 -05:00 |
|
Isaac Connor
|
7283f8629a
|
Function dropdown no longer exists
|
2022-02-28 15:44:15 -05:00 |
|
Jonathan Bennett
|
1749afc8e2
|
Add additional Firefox streaming workaround
|
2022-02-28 14:17:19 -06:00 |
|
Isaac Connor
|
433782bd6e
|
disable yellow dot when analysing turned off. Enabled is gone... need to do a more interesting check
|
2022-02-28 13:34:51 -05:00 |
|
Isaac Connor
|
1ae8fcae63
|
add a label for rateControl
|
2022-02-27 14:31:04 -05:00 |
|
Isaac Connor
|
5b319258c4
|
fix eslint
|
2022-02-27 14:26:05 -05:00 |
|
Isaac Connor
|
e33b41745d
|
Merge branch 'master' into replace_function_concept
|
2022-02-27 14:04:01 -05:00 |
|
Isaac Connor
|
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 |
|
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
|
47fae7a296
|
spacing, improve debug
|
2022-02-26 19:18:28 -05:00 |
|
Isaac Connor
|
6fc5803e16
|
Add another clearInterval to prevent looping during window.location
|
2022-02-25 15:54:56 -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
|
813fd36b0a
|
clearInterval when location.replacing so that timer stops. Prevents infinite loop
|
2022-02-25 14:13:18 -05:00 |
Ben Dailey
|
b2428b5522
|
Merge branch 'master' into lazy-load-images
|
2022-02-22 08:47:26 -05:00 |
|
Isaac Connor
|
831dca814f
|
Include EndDateTimeShort in event stats
|
2022-02-22 08:31:41 -05:00 |
|
Isaac Connor
|
dfb6a96b42
|
Handle empty endtime more gracefully. If there is a next event just jump to it.
|
2022-02-22 08:31:41 -05:00 |
|
Isaac Connor
|
959b08f46a
|
Include EndDateTimeShort in event ajax response
|
2022-02-22 08:31:41 -05:00 |
|
Isaac Connor
|
d7c8e32ec9
|
Remove non-translations
|
2022-02-22 08:31:41 -05:00 |
|
Isaac Connor
|
88a68af775
|
DefaultCodec is for event view, not live
|
2022-02-22 08:31:41 -05:00 |
|
Isaac Connor
|
cf7b3b9f9f
|
DefaultCodec is for event view, not live
|
2022-02-22 08:31:41 -05:00 |
|
Isaac Connor
|
3a2e5a580b
|
Debug the contents of REQUEST on every hit.
|
2022-02-22 08:31:41 -05:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
b32164e992
|
Add handling of NOT IN and =\[\] and \!\[\]
|
2022-02-22 08:31:41 -05:00 |
|
Ben Dailey
|
e4f5f59e8d
|
3 more img tags
|
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
|
a40b305065
|
Merge branch 'master' into replace_function_concept
|
2022-02-20 09:52:03 -05:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
002b2c39aa
|
fix button assignments. Don't abort ajax, as it might be important
|
2022-02-18 17:11:18 -05:00 |
|
Isaac Connor
|
adf8413333
|
Include EndDateTimeShort in event stats
|
2022-02-17 13:31:25 -05:00 |
|
Isaac Connor
|
8dedac1a21
|
Handle empty endtime more gracefully. If there is a next event just jump to it.
|
2022-02-17 13:30:50 -05:00 |
|
Isaac Connor
|
909c0e903f
|
Include EndDateTimeShort in event ajax response
|
2022-02-17 13:30:01 -05:00 |
|
Isaac Connor
|
cd2c977ed8
|
Merge branch 'master' into replace_function_concept
|
2022-02-16 14:25:38 -05:00 |
|
Isaac Connor
|
f3d3cad419
|
Remove non-translations
|
2022-02-16 09:59:48 -05:00 |
|
Isaac Connor
|
055414c778
|
DefaultCodec is for event view, not live
|
2022-02-16 09:59:48 -05:00 |
|
Isaac Connor
|
93ab345a3a
|
DefaultCodec is for event view, not live
|
2022-02-16 09:59:48 -05:00 |
|
Isaac Connor
|
efc1ec770c
|
Debug the contents of REQUEST on every hit.
|
2022-02-15 18:52:46 -05:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
8b14885541
|
Add handling of NOT IN and =\[\] and \!\[\]
|
2022-02-15 18:52:46 -05:00 |
|
Isaac Connor
|
2bc0ec269a
|
Merge branch 'master' into replace_function_concept
|
2022-02-15 17:02:03 -05:00 |
|
Isaac Connor
|
a149fa37fc
|
Make filter debug modal work on non-saved filter
|
2022-02-15 10:37:14 -05:00 |
|
Isaac Connor
|
59039de985
|
Use =[] instead of IN as operator. Fixes #3432
|
2022-02-15 10:23:30 -05:00 |
|
Isaac Connor
|
554840d811
|
Revert "Add SQL opTypes IN, NOT IN to filter view, #3432"
|
2022-02-15 10:07:48 -05:00 |