989b3b7ba4
Merge pull request #3838 from IgorA100/patch-3
...
Fix: Logging levels coloring for languages other than English
2024-02-23 09:01:19 -05:00
ed64db315b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-02-23 08:56:32 -05:00
a738f1bc2e
Remove unused EventStartMode. Fixes #3839
2024-02-23 08:56:26 -05:00
78ab72a0d9
Remove EventStartMode stuff
2024-02-22 16:58:14 -05:00
f9a1b6b4f4
Only show cpuUsage if we have an Id
2024-02-22 12:55:35 -05:00
ebad97038e
Implement CpuLoad in Server object
2024-02-22 12:52:49 -05:00
799dcd5f51
Default thisServer to a default server object.
2024-02-22 12:52:39 -05:00
b5096677c7
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-02-22 10:57:18 -05:00
1742c03b1a
Handle non-multi-server case. Fixes #3836
2024-02-22 10:57:01 -05:00
eeb8856157
Ad EventStartMode and EventCLoseMode to monitor
2024-02-22 10:46:36 -05:00
b079281900
Remove second data-click-to-select
2024-02-22 09:33:54 -05:00
0cbce2a8a4
Apply bootstrap table to servers list. Split the servers content into it's own file. Add overflow:auto to the container which for some reason fixes button visibility.
2024-02-22 09:33:32 -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
edcf09882f
Subsitute a 0 when ZM_SERVER_ID is not defined
2024-02-21 16:35:04 -05:00
9783c5a560
Adding an "All Events" Button from Live View
...
Ability to jump to viewing all events from live viewing.
2024-02-21 15:44:51 +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
661d8620fd
Add Cpu Usage % to header
2024-02-20 13:15:38 -05:00
f54f10df72
Add server stats fields
2024-02-20 13:14:23 -05:00
def378fe12
Fix relative path to dms.js
2024-02-17 11:59:09 -05:00
16392fc1fb
removed unnecessary definition in lang file.
2024-02-16 18:09:34 -06:00
78676ac249
On Options -> System , show languages with names not codes/filenames
...
Possible implementation for issue #3694
2024-02-16 18:02:15 -06:00
2fd7c089e3
Update loading the download modal. Include the monitor and events filters, include auth_relay
2024-02-15 16:27:30 -05:00
7e98cf36d6
Remove requirement for id or eids. We can specify by filter now. Fix populating exportIds making sure it is an array.
2024-02-15 16:21:39 -05:00
f339ba5508
When listing option name, remove the ZM_ to be consistent with the options view
2024-02-15 12:54:39 -05:00
4424bab051
Add a resize handler
2024-02-15 09:38:17 -05:00
839f09dba1
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-02-13 13:54:10 -05:00
013f6daaf6
Put back Accept-Ranges as it breaks seeking
2024-02-13 13:54:04 -05:00
0ff48f631e
Implements an option to disable soap_wsa code that doesn't work
...
with some chinese cameras, more common to Latam zone
2024-02-12 19:22:01 -06: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
dc556c0f70
Handle user being undefined when not logged in
2024-02-11 19:12:37 -05:00
51020e92a4
Merge pull request #3822 from IgorA100/patch-1
...
Sorting an array of events when merging into a file
2024-02-09 10:35:05 -05:00
8bb368fe13
Fix children MonitorIds not being included due to the use of + instead of array_merge
2024-02-09 10:33:22 -05:00
a204a973f1
Code optimization
2024-02-09 18:09:51 +03:00
d0dc4bcbe1
Sorting an array of events when merging into a file
...
When merging events into a file, they must first be sorted by time and start date of the event.
2024-02-09 17:34:06 +03:00
31af9d905c
Still generate an auth if no password present.
2024-02-08 13:31:21 -05:00
ec20772f98
Use const on bottomLoc
2024-02-08 12:34:33 -05:00
f795fb3c19
fix unexpected this, although according to jquery docs it is totally valid
2024-02-08 12:33:32 -05:00
00f27ca8af
Add autocomplete=off to Montage Layout name
2024-02-08 10:27:39 -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
79164993f9
Remove fixed width and height from map, they will be set in js if map is to be displayed
2024-02-07 11:06:47 -05:00
36b4d9a264
Add display: flex to content so that scroll bars work
2024-02-07 11:06:26 -05:00
fcac8ec2f2
Rename zmMap to ZMMap because eslint thinks constructors should always be capitalized.
2024-02-07 10:58:39 -05:00
5f6df6fad7
Make eventVideo div take up available space so that scaleToFit can do it's job
2024-02-07 10:38:17 -05:00
124bbc0295
pass #eventVIdeo as container to scaleToFit so that it fits within available width
2024-02-07 10:37:53 -05:00
3c91a2bcaf
Add px-3 to the flex container for stats and view to handle scroll bar
2024-02-07 10:37:31 -05:00
e6eff5903f
Add container to params for scaleToFit. The container we want to fit width into might not be #content.
2024-02-07 10:37:08 -05:00
57e9cc2b16
In the case where locale = System... properly set locale for the Date*FOrmatter classes
2024-02-05 19:06:16 -05:00
Isaac Connor
Isaac Connor
IgorA100
Server