834a1114ec
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-23 11:56:01 -04: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
94a3632e1b
fix(events): Expand/Collapse for navbar-two works when narrow
2024-03-23 11:14:41 -04:00
3df3e57872
fix(): Typo
2024-03-22 10:17:51 -04:00
74a43745d3
Fix: Order of loading css files
...
Initially, you need to load third-party styles and only then load your own styles.
This way we will get rid of the confusion of styles and the need to use "!important"
2024-03-05 15:20:02 +03:00
610109d569
Feat Entrust management of enabling search in select to the Chosen plugin
...
On Options page it is necessary to use Chosen plugin for all “selects”, otherwise the design will not be beautiful.
Search disabling is managed by Chosen plugin.
2024-03-05 12:07:45 +03:00
8a42594009
Upgrade bootstrap-table to 1.22.3
2024-03-01 11:44:06 -05:00
f9a1b6b4f4
Only show cpuUsage if we have an Id
2024-02-22 12:55:35 -05:00
1742c03b1a
Handle non-multi-server case. Fixes #3836
2024-02-22 10:57:01 -05:00
661d8620fd
Add Cpu Usage % to header
2024-02-20 13:15:38 -05:00
4987ea1b21
Define user before using for viewableMonitorIds
2024-02-01 11:39:09 -05:00
8e035f61ac
Use viewableMonitorsIds instead of canView(Monitors) when deciding to show the Console or Montage Links
2024-01-31 16:09:33 -05:00
0fb71e35f2
Add luxor.js and use it to format datetimes
2024-01-24 16:10:20 -05:00
3603aca21c
Put navbar brand separate from navbars, remove explicit padding. Increase text size of ZoneMinder in brand, hide Branding on portrait mobile
2024-01-02 14:06:52 -05:00
e1b17590fa
Handle Config table not being updated for ZM_WEB_VIEWING_TIMEOUT
2023-11-20 14:29:25 -05:00
c7bd2adb11
add ZM_WEB_VIEWING_TIMEOUT
2023-11-20 13:25:53 -05:00
6aa7901066
Use same logic as in LogHTML to apply success class, and hence make the word Log green when there are no errors.
2023-10-30 10:03:17 -04:00
b01908e93c
Don't include the third nav element for nav banner when there is no banner set so as to take up less space
2023-10-23 17:06:28 -04:00
da213d8532
Merge branch 'master' into openbsd
2023-09-11 13:42:43 -07:00
50059e5842
Only show ram info if proc exists.
2023-09-11 13:42:22 -07:00
8672e6d64e
Fix missing dropdown-item class on warning or danger storage areas. Increase warning to 95% instead of 90%
2023-08-10 11:03:22 -04:00
5c9588c012
Adds RTSP2Web support for live view
2023-07-29 23:46:31 -05:00
7a21c01f36
Don't show bandwidth options if there are none to choose from
2023-06-07 16:00:02 -04:00
e527264182
Hide navbars when not logged in and auth turned on
2023-05-25 13:55:39 -04:00
dd064f606a
Fix two straggling array uses of user
2023-04-24 10:16:46 -04:00
969baa3891
Convert user from an array to a User object
2023-04-23 12:57:29 -04:00
94efc5ff73
Add fontfaceobserver.js
2023-02-28 13:58:17 -05:00
a2879fb66c
Add Map view to header
2023-02-25 12:46:34 -05:00
689ae56732
Sync up tags with collapsed header and remove the fixed-top class so that the stick header takes over.
2023-01-29 10:54:47 -05:00
d6e3a325aa
Remove dropdown class from menu items that aren't dropdowns
2023-01-19 17:07:48 -05:00
6fa39d25c1
Separate account status section.
2023-01-19 17:07:48 -05:00
4b7680bc43
Use & instead
2023-01-19 17:07:47 -05:00
5dc658dd55
add sticky class to body when ZM_WEB_NAVBAR_STICKY is set. Remove it from navbar.
2023-01-16 16:38:35 -05:00
0af2a3eb10
Make header navbar sticky, make entire second navbar go away when minmised.
2023-01-16 16:38:35 -05:00
df8bc464e3
Fix missing checkbox column on events table. See https://github.com/wenzhixin/bootstrap-table/issues/6522
2023-01-03 11:15:58 -05:00
3a6984c820
Move leaflet css loading code to monitor view
2022-11-30 13:23:42 -05:00
6ee083a145
Update functions.php
2022-10-31 11:53:11 -06:00
189bf2f687
Update bootstrap-table to 1.21.1
2022-10-25 12:50:01 -04:00
42e8698318
Load logger.js before view js so that remote logging routines are available.
2022-10-21 16:20:51 -04:00
beec8bb03a
Move view-specific includes out of includes/functions. It is far easier to just put those at the bottom of the actual view file.
2022-10-21 10:19:06 -04:00
2a1d417511
Remove dark styles from navbar
2022-10-11 16:44:23 -04:00
4028c08831
Update jquery-ui to 1.13.2
2022-10-04 10:14:27 -04:00
8a6db4a5e7
convert event->Id() explicitly to a string for strpos.
2022-09-22 16:21:25 -04:00
c43b3d1aef
Update control_functions.php
...
The Reboot button was not shown without activating another one. Probably not intended so I did this micro adjustment
2022-09-16 14:21:15 +02:00
fdbe950640
include video.js for video view as well as event
2022-09-12 13:44:18 -04:00
d079439005
Merge branch 'reports' of http://github.com/ConnorTechnology/zoneminder into reports
2022-09-12 19:40:27 +02:00
4eeb49d09a
Merge branch 'master' into reports
2022-08-31 18:38:08 +02:00
f9f53dd0d2
When there are less than 3 storage areas, just list them in the header instead of making it a dropdown
2022-08-29 14:12:45 -04:00
f6a7698e43
Add Reports menu option
2022-08-04 09:07:46 -04:00
bd22cd7fdd
Use global dateTimeFormatter to replace strftime
2022-06-01 16:17:00 -04:00
Isaac Connor
Simpler1
Simpler1
IgorA100
Charlie Root
Jonathan Bennett
ovargasp
Isaac Connor
VikingGer