66fa612d02
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-25 09:53:33 -04:00
7f74de5d91
Fix map display
2024-03-24 13:19:53 -04:00
697f8de4f6
Fix: Add "All Events" in array "translate" (View event)
2024-03-24 19:51:24 +03:00
dd0b2bcf91
Only load preset modal if we click set. Add auth relay so that it can be loaded.
2024-03-23 11:55:53 -04:00
60cd909bf3
Fix: Tracking the "shift" button press
2024-03-18 18:04:03 +03:00
8442a1aca4
fixup reversion of bootstrap-table console which shouldn't have been merged yet
2024-03-15 11:42:07 -04:00
649b459630
Rough in bootstrap-table for monitor list in console.
2024-03-13 08:48:24 -04:00
be202719c3
Appease eslint
2024-03-12 21:22:50 -04:00
625e699e32
Fix: video scaling on console
...
Close #3861
2024-03-12 11:44:29 +03:00
76db26cec1
Merge pull request #3852 from IgorA100/patch-12
...
Fix style in options pages
2024-03-09 11:54:43 -05:00
f0088e49d7
Remove debug
2024-03-06 16:21:44 -05:00
6124678fb8
Add scaling to zms url
2024-03-06 16:21:19 -05:00
32dc9cff2f
Remove use strict to appease eslint for now. Use a zms url instead of view=image
2024-03-06 16:02:50 -05:00
1278613832
Merge fixes in findEventByTime and fineFrameByTime with better debugging. Turn on use strict. Update when datetimepickers close instead of onchange
2024-03-06 13:31:36 -05:00
714a0913e4
Merge branch 'ZoneMinder:master' into patch-12
2024-03-06 19:52:25 +03:00
a4ed614763
Fix set chosen width for modal window
...
For the modal window, set the width chosen to 100%
2024-03-06 00:23:11 +03:00
302f3ad96d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-05 11:48:16 -05:00
5c360c2a91
Add mid to available globals
2024-03-05 10:35:07 -05:00
9eee9fcb1e
Lint fixes
2024-03-05 08:14:28 -05:00
bc16f526ac
Merge pull request #3850 from IgorA100/patch-10
...
Added button for editing the monitor during live viewing.
2024-03-04 17:09:22 -05:00
7482d28af8
Fix Handling a button click
...
For some reason, an old, faulty code was sent..
2024-03-04 23:15:10 +03:00
7920f17c8a
Handling button click
2024-03-04 23:03:42 +03:00
f173974f2b
Fix: Scaling
2024-03-04 17:22:32 +03:00
66ff90c8c1
Update watch.js
2024-03-04 16:47:46 +03:00
55244441c3
Add processing for clicking on the button to view all events
2024-03-03 18:50:02 +03:00
1793e7813c
Added value "Edit" to "translate" array for translation
2024-03-03 18:20:40 +03:00
84d8aa9e52
Ref: Responsive design
2024-03-03 16:49:54 +03:00
43cd675d96
Added value "Live" to "translate" array for translation
2024-02-29 15:12:33 +03:00
a6b9ba5a1d
Added a link to live viewing from monitor event viewer
2024-02-29 15:07:41 +03:00
a28df623f2
Fix canEdit is a hash, not a function
2024-02-27 19:18:09 -05:00
ad53ebb8a8
Handle when inputs don't exist.
2024-02-27 17:38:48 -05:00
c1b65185b5
Handle when inputs don't exist.
2024-02-27 17:38:45 -05:00
c51c53c47a
FIx use of inline javascript for the method dropdown on remote type monitors
2024-02-27 16:50:52 -05:00
34815e02b9
Fix: Logging levels coloring
...
When getting the index, you cannot use text(), because there may be different meaning depending on the language!
If the value is different from 'Level', lvl_ndx will not be found and coloring will not work.
2024-02-22 11:16:30 +03:00
d9cfcfbaa7
Clicking the "All Events" button from Live View
...
When you press the button, we go to view all events.
2024-02-21 15:17:15 +03:00
2fd7c089e3
Update loading the download modal. Include the monitor and events filters, include auth_relay
2024-02-15 16:27:30 -05:00
4424bab051
Add a resize handler
2024-02-15 09:38:17 -05:00
8ffbc1d6f0
INclude monitor Name in monitors array, because it useful to show monitors by name instead of id
2024-02-11 19:13:48 -05:00
cc7b8fa9d0
Rename DMS2LL to dms2ll to satisfy eslint
2024-02-07 11:14:19 -05:00
b94b454bf9
Rename EventName to Name and Monitor Name to Monitor to take up less space
2024-02-07 11:08:15 -05:00
bd7bfcbdcd
Rename EventName to Name and Monitor Name to Monitor to take up less space
2024-02-07 11:08:11 -05:00
cc5bb8ecec
rename table=>eventStatTable. Apply width and height to map if it is to be displayed
2024-02-07 11:07:12 -05:00
fcac8ec2f2
Rename zmMap to ZMMap because eslint thinks constructors should always be capitalized.
2024-02-07 10:58:39 -05:00
124bbc0295
pass #eventVIdeo as container to scaleToFit so that it fits within available width
2024-02-07 10:37:53 -05:00
aa67e5f6f3
Add range limits to lat&long and don't do anything if empty
2024-02-01 18:01:26 -05:00
314236dea8
Add inputs and code to display and convert to and from decimal degress and dhms for lat&long. Update marker on map when values change.
2024-02-01 17:58:20 -05:00
d47f78b354
Fix for use strict defining monitor_ids
2024-02-01 11:38:38 -05:00
05d605fe55
change Map to zmMap to prevent name collision with luxor. Add a haversine function to get distance between two lat&long. Start to rough in grouping locations into 1 pin.
2024-01-30 19:57:18 -05:00
0e88d764f0
Use object methods to load montiors
2024-01-28 16:53:30 -05:00
559d6edc70
Don't apply timezone when formatting datetimes
2024-01-25 11:57:29 -05:00
Isaac Connor
IgorA100
Isaac Connor
Simpler1