Commit Graph

5766 Commits (33b001aa2c006a5cebe62aff264053609611b596)

Author SHA1 Message Date
IgorA100 66364c7c32
Fis style in Options page
* Why extra padding at top? 
  padding-top: 2rem;
  */

I don't know the answer, because... I didn't add it :)
Before my edit, it was generally “4rem”; it seemed like a lot to me, so I halved it.
I didn’t clean it up completely because I was careful not to break something completely.

I understood why. If the <form> does not have buttons at the top, then there will be no padding between the form and the "id="optionsContainer" (for example the "Storage" section).
For now, so be it.
2024-03-13 19:13:52 +03:00
IgorA100 6b8fe26be6
empty line 2024-03-13 16:26:25 +03:00
IgorA100 510d60e931
Merge branch 'master' into patch-19 2024-03-13 16:24:45 +03:00
IgorA100 ef3245fe2b
Moved class "pt-2" in other DIV
Necessary for correct table scrolling
2024-03-13 16:11:21 +03:00
IgorA100 1d81af50b9
Fixing table header when using sticky 2024-03-13 16:07:22 +03:00
IgorA100 452576ad5e
Fix: change class "table-responsive-sm-2" to "table-responsive"
And always specify the object ID before its class
2024-03-13 15:57:44 +03:00
Isaac Connor 4d8a357bba Rough in bootstrap-table for monitor list in console. 2024-03-13 08:47:31 -04:00
IgorA100 6a20a3a482
Fix scrool bar
You should not hardcode "overflow-y: scroll;" because if the table contains few rows, then we do not need a scroll bar.
Also, the scroll bar must be used only in case of stickiness, otherwise there will be duplication of scroll bars in the absence of stickiness.
2024-03-13 15:38:47 +03:00
IgorA100 83d64e8442
Fix style for sticky navbar & sticky table header 2024-03-13 13:49:47 +03:00
IgorA100 fc23cef16a
Code cleaned & added table header background 2024-03-13 13:33:15 +03:00
Isaac Connor 6ccf0c66a1 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-03-12 21:45:07 -04:00
Isaac Connor 2ba7369ea8 hack to fix scroll bars in bootstrap table 2024-03-12 21:45:02 -04:00
Isaac Connor be202719c3 Appease eslint 2024-03-12 21:22:50 -04:00
Isaac Connor bc044f38d9 Only put scrollbar on console contents if needed. Fixes double scroll bar when not sticky navbar 2024-03-12 17:57:50 -04:00
Isaac Connor 95d2e0a27c Fix form not scrolling entirely. Remove top padding. Remove right padding due to bootstrap row. 2024-03-12 17:53:27 -04:00
Isaac Connor f926e98283 Temp fix to put scroll bars back 2024-03-12 09:12:53 -04:00
Isaac Connor 855da2cbc4 Put back scroll bars on console 2024-03-12 08:55:44 -04:00
Isaac Connor 657cda18ef Put back style permitting scrolling to work 2024-03-12 08:44:12 -04:00
IgorA100 625e699e32
Fix: video scaling on console
Close #3861
2024-03-12 11:44:29 +03:00
IgorA100 65c2331394
Feat: added functions for controlling the visibility of blocks when clicking on the control button 2024-03-10 23:19:19 +03:00
Isaac Connor 20e1ae2090 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-03-10 11:04:10 -04:00
Isaac Connor 3f9bda4f80 FIx arrap_map => array_map. Fixes #3859 2024-03-10 11:03:03 -04:00
Isaac Connor 3939bcec22 Fix eslint 2024-03-10 11:02:28 -04:00
Isaac Connor 76db26cec1
Merge pull request #3852 from IgorA100/patch-12
Fix style in options pages
2024-03-09 11:54:43 -05:00
IgorA100 28fd799bf6
Removed erroneously added style for tag 'a' 2024-03-09 10:26:16 +03:00
Isaac Connor 4718bff514
Merge pull request #3856 from IgorA100/patch-14
Fix design when viewing list of events
2024-03-08 08:24:18 -05:00
IgorA100 e576e9b756
Fix "overflow-y" for "#monitorList" in console
For "#monitorList" there is no need to set "overflow-y: scroll;"
Otherwise, scrolling will always be displayed.
2024-03-07 21:39:33 +03:00
IgorA100 f27f9bdf95
Fix layout 2024-03-07 16:58:26 +03:00
IgorA100 ab556f3135
Update events.css 2024-03-07 16:16:02 +03:00
IgorA100 4df177208c
Fix design when viewing list of events
Layouts & space in code
2024-03-07 16:03:16 +03:00
IgorA100 7e4cd163f5
Fix: remove right padding as unnecessary
Slightly shifts the video at some screen and video aspect ratios
2024-03-07 13:49:50 +03:00
IgorA100 e90340dd2b
Fix: More correct scaling (with padding) during live viewing 2024-03-07 13:30:39 +03:00
Isaac Connor f0088e49d7 Remove debug 2024-03-06 16:21:44 -05:00
Isaac Connor 6124678fb8 Add scaling to zms url 2024-03-06 16:21:19 -05:00
Isaac Connor 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
Isaac Connor 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
IgorA100 57c993507c
Fix layout 2024-03-06 20:18:15 +03:00
IgorA100 7757eeae1a
Fix layout 2024-03-06 20:14:36 +03:00
IgorA100 151114f778
Fix space 2024-03-06 20:00:08 +03:00
IgorA100 008c864751
Fix style 2024-03-06 19:56:10 +03:00
IgorA100 714a0913e4
Merge branch 'ZoneMinder:master' into patch-12 2024-03-06 19:52:25 +03:00
IgorA100 f94d264407
Fix: Button block location
There is no need
2024-03-06 19:01:52 +03:00
IgorA100 c8c731519d
Fix Removing excess styles & specifying a minimum textarea height 2024-03-06 01:23:42 +03:00
IgorA100 c69f6e8908
Fix Removing excess styles & Aligning a form vertically
Additional modernization required
2024-03-06 01:14:59 +03:00
IgorA100 696837e22f
Fix Removing excess styles 2024-03-06 01:11:16 +03:00
IgorA100 21cb1c8c29
Fix layout 2024-03-06 01:06:45 +03:00
IgorA100 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
Isaac Connor c078cf7bba Use per-monitor permission on save button 2024-03-05 14:02:20 -05:00
Isaac Connor 302f3ad96d Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-03-05 11:48:16 -05:00
Isaac Connor beda6cd66d Remove unused linked monitor array population. All is done in javascript now 2024-03-05 11:47:39 -05:00
Isaac Connor 5de9e7800c Use monitor->canEdit when making source link clickable because it is per-monitor instead of User['Monitors'] 2024-03-05 11:47:15 -05:00
Isaac Connor 5c360c2a91 Add mid to available globals 2024-03-05 10:35:07 -05:00
Simpler1 9eee9fcb1e Lint fixes 2024-03-05 08:14:28 -05:00
IgorA100 634bffea80
Adaptation of Chosen to Bootstrap (Height alignment) 2024-03-05 15:43:01 +03:00
IgorA100 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
IgorA100 8f521a7221
Fix Entrust management of enabling search in select to the Chosen plugin 2024-03-05 14:06:13 +03:00
IgorA100 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
Isaac Connor 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
IgorA100 8902f902ea
Update skin.css 2024-03-05 00:58:05 +03:00
IgorA100 1f6279a00f
Update skin.css 2024-03-05 00:56:59 +03:00
IgorA100 b07ae01e89
Fix cursor for <a> 2024-03-05 00:53:47 +03:00
IgorA100 7482d28af8
Fix Handling a button click
For some reason, an old, faulty code was sent..
2024-03-04 23:15:10 +03:00
IgorA100 7920f17c8a
Handling button click 2024-03-04 23:03:42 +03:00
IgorA100 38acd931e4
Added monitor edit button 2024-03-04 21:22:10 +03:00
IgorA100 a370ce19ea
Fix style 2024-03-04 17:28:30 +03:00
IgorA100 f173974f2b
Fix: Scaling 2024-03-04 17:22:32 +03:00
IgorA100 ea17631de9
Fix Control panel
At least temporarily.
In general, a lot of work.
2024-03-04 17:07:55 +03:00
IgorA100 074751e068
Fix style
Managed by bootstrap
2024-03-04 17:00:20 +03:00
IgorA100 66ff90c8c1
Update watch.js 2024-03-04 16:47:46 +03:00
IgorA100 a05540bd3d
Fix: Responsive design with use bootstrap 2024-03-04 16:30:09 +03:00
Isaac Connor 89de8b7765
Merge pull request #3845 from IgorA100/patch-8
Added a link to live viewing from monitor event viewer
2024-03-03 14:29:57 -05:00
IgorA100 55244441c3
Add processing for clicking on the button to view all events 2024-03-03 18:50:02 +03:00
IgorA100 1793e7813c
Added value "Edit" to "translate" array for translation 2024-03-03 18:20:40 +03:00
IgorA100 45bf972fea
Ref: style
Bootstrap is now used more
2024-03-03 18:14:29 +03:00
IgorA100 99779681fb
Fix: style
Not required, because now using Bootstrap
2024-03-03 17:27:14 +03:00
IgorA100 21abe20234
Fix: style
Not required, because now using Bootstrap
2024-03-03 17:26:09 +03:00
IgorA100 373fa15440
Fix: rem style
Not required, because now using Bootstrap
2024-03-03 17:21:30 +03:00
IgorA100 9aa8919fb8
Fix: Button layout 2024-03-03 17:04:59 +03:00
IgorA100 6ea195b8b1
Fix: Button layout 2024-03-03 17:01:50 +03:00
IgorA100 0d5d495bbf
FixL Recalculation of height and width if "padding" is specified for "wrapperEventVideo" 2024-03-03 16:56:50 +03:00
IgorA100 84d8aa9e52
Ref: Responsive design 2024-03-03 16:49:54 +03:00
Simpler1 ccaaf6aaf5 Consistency 2024-03-02 14:12:59 -05:00
Simpler1 d7eca5bb23 fix(event): Keep progressBar from overlapping videojs control. 2024-03-02 14:10:25 -05:00
Simpler1 e1e255393d typo 2024-03-02 09:55:08 -05:00
Simpler1 6ff4c3f7ec Added additional parameters 2024-03-02 09:52:55 -05:00
Simpler1 ea0c79d976
Placeholder text for monitor date time format.
After spending an hour trying to figure out which date time format to enter here, I thought it would be best to just spell it out for users trying to customize this.
2024-03-01 16:59:17 -05:00
Isaac Connor 8a42594009 Upgrade bootstrap-table to 1.22.3 2024-03-01 11:44:06 -05:00
Isaac Connor c33ec9833a Only show non deleted monitors in linked monitors 2024-02-29 08:59:14 -05:00
IgorA100 43cd675d96
Added value "Live" to "translate" array for translation 2024-02-29 15:12:33 +03:00
IgorA100 a6b9ba5a1d
Added a link to live viewing from monitor event viewer 2024-02-29 15:07:41 +03:00
Isaac Connor a28df623f2 Fix canEdit is a hash, not a function 2024-02-27 19:18:09 -05:00
Isaac Connor 0128873ca7 Spacing, some better debug 2024-02-27 18:41:31 -05:00
Isaac Connor c48ccd3ce2 Add autocomplete to onvif_username and fix case when local inputs aren't there after switching from non-local to local because Method is now wrong. 2024-02-27 17:39:34 -05:00
Isaac Connor ad53ebb8a8 Handle when inputs don't exist. 2024-02-27 17:38:48 -05:00
Isaac Connor c1b65185b5 Handle when inputs don't exist. 2024-02-27 17:38:45 -05:00
Isaac Connor c51c53c47a FIx use of inline javascript for the method dropdown on remote type monitors 2024-02-27 16:50:52 -05:00
Isaac Connor f18f448a8c Fix setting frames 2024-02-26 16:22:51 -05:00
Server 58d8cf0adf Makes the "Events" part of the ONVIF URL configurable
as required per some ONVIF version 21.06 cameras
by default sets the Events Path equals to "/Events"
to maintain functionality
2024-02-24 11:05:08 -06:00
Isaac Connor 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
Isaac Connor 78ab72a0d9 Remove EventStartMode stuff 2024-02-22 16:58:14 -05:00
Isaac Connor f9a1b6b4f4 Only show cpuUsage if we have an Id 2024-02-22 12:55:35 -05:00
Isaac Connor b5096677c7 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-02-22 10:57:18 -05:00
Isaac Connor 1742c03b1a Handle non-multi-server case. Fixes #3836 2024-02-22 10:57:01 -05:00
Isaac Connor eeb8856157 Ad EventStartMode and EventCLoseMode to monitor 2024-02-22 10:46:36 -05:00
Isaac Connor b079281900 Remove second data-click-to-select 2024-02-22 09:33:54 -05:00
Isaac Connor 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
IgorA100 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
IgorA100 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
IgorA100 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
Isaac Connor 661d8620fd Add Cpu Usage % to header 2024-02-20 13:15:38 -05:00
Isaac Connor def378fe12 Fix relative path to dms.js 2024-02-17 11:59:09 -05:00
Server 78676ac249 On Options -> System , show languages with names not codes/filenames
Possible implementation for issue #3694
2024-02-16 18:02:15 -06:00
Isaac Connor 2fd7c089e3 Update loading the download modal. Include the monitor and events filters, include auth_relay 2024-02-15 16:27:30 -05:00
Isaac Connor 4424bab051 Add a resize handler 2024-02-15 09:38:17 -05:00
Isaac Connor 839f09dba1 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-02-13 13:54:10 -05:00
Server 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
Isaac Connor 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
Isaac Connor ec20772f98 Use const on bottomLoc 2024-02-08 12:34:33 -05:00
Isaac Connor f795fb3c19 fix unexpected this, although according to jquery docs it is totally valid 2024-02-08 12:33:32 -05:00
Isaac Connor 00f27ca8af Add autocomplete=off to Montage Layout name 2024-02-08 10:27:39 -05:00
Isaac Connor cc7b8fa9d0 Rename DMS2LL to dms2ll to satisfy eslint 2024-02-07 11:14:19 -05:00
Isaac Connor b94b454bf9 Rename EventName to Name and Monitor Name to Monitor to take up less space 2024-02-07 11:08:15 -05:00
Isaac Connor bd7bfcbdcd Rename EventName to Name and Monitor Name to Monitor to take up less space 2024-02-07 11:08:11 -05:00
Isaac Connor cc5bb8ecec rename table=>eventStatTable. Apply width and height to map if it is to be displayed 2024-02-07 11:07:12 -05:00
Isaac Connor 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
Isaac Connor 36b4d9a264 Add display: flex to content so that scroll bars work 2024-02-07 11:06:26 -05:00
Isaac Connor fcac8ec2f2 Rename zmMap to ZMMap because eslint thinks constructors should always be capitalized. 2024-02-07 10:58:39 -05:00
Isaac Connor 5f6df6fad7 Make eventVideo div take up available space so that scaleToFit can do it's job 2024-02-07 10:38:17 -05:00
Isaac Connor 124bbc0295 pass #eventVIdeo as container to scaleToFit so that it fits within available width 2024-02-07 10:37:53 -05:00
Isaac Connor 3c91a2bcaf Add px-3 to the flex container for stats and view to handle scroll bar 2024-02-07 10:37:31 -05:00
Isaac Connor 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
Isaac Connor 5a866aee0e Add id's to selects to appease label for= attributes 2024-02-05 18:42:25 -05:00
Isaac Connor aa67e5f6f3 Add range limits to lat&long and don't do anything if empty 2024-02-01 18:01:26 -05:00
Isaac Connor 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
Isaac Connor 4987ea1b21 Define user before using for viewableMonitorIds 2024-02-01 11:39:09 -05:00
Isaac Connor d47f78b354 Fix for use strict defining monitor_ids 2024-02-01 11:38:38 -05:00
Isaac Connor da2744749d fix vertical alignment and stretching of images on snapshot 2024-02-01 11:38:24 -05:00
Isaac Connor 8e035f61ac Use viewableMonitorsIds instead of canView(Monitors) when deciding to show the Console or Montage Links 2024-01-31 16:09:33 -05:00
Isaac Connor 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
Isaac Connor 18606e78ad Remove width on p element on monitors view as it is too short for Recording and doesn't seem to be needed 2024-01-30 14:29:41 -05:00
Isaac Connor 0e88d764f0 Use object methods to load montiors 2024-01-28 16:53:30 -05:00
Isaac Connor 2c7c928fa6 Use object methods when loading monitors and zones and filter them by Deleted status 2024-01-28 16:53:06 -05:00
Isaac Connor 39b2014c2d Prevent XSS from COOKIE poisoning 2024-01-25 19:31:28 -05:00
Isaac Connor b1aeb319f7 Prevent XSS from COOKIE poisoning 2024-01-25 19:27:18 -05:00
Isaac Connor 35396aad55 Prevent XSS from COOKIE poisoning 2024-01-25 19:25:15 -05:00
Isaac Connor d8f36e4ef9 Prevent XSS from COOKIE poisoning 2024-01-25 19:23:28 -05:00
Isaac Connor bf32bd6926 Prevent XSS throu mids 2024-01-25 19:12:37 -05:00
Isaac Connor f1a26b90b6 Prevent against CSS in dupId 2024-01-25 19:05:59 -05:00
Isaac Connor bc1fb8eef2 Protect against XSS from User field 2024-01-25 19:04:15 -05:00
Isaac Connor 9505910847 Prevent XSS via uid and prev 2024-01-25 19:01:44 -05:00
Isaac Connor 59b77df7f1 Prevent XSS through scale parameter 2024-01-25 18:57:01 -05:00
Isaac Connor 6f595385d7 Protect filter loading from injection 2024-01-25 18:56:42 -05:00
Isaac Connor d45b05ec8a XSS protect from server id and storage id 2024-01-25 18:50:35 -05:00
Isaac Connor bac2705051 XSS protect from monitor id and name 2024-01-25 18:49:22 -05:00
Isaac Connor 559d6edc70 Don't apply timezone when formatting datetimes 2024-01-25 11:57:29 -05:00
Isaac Connor cfd8e3418e Don't apply timezone when formatting datetimes 2024-01-25 11:57:19 -05:00
Isaac Connor ee13034384 Use validInt on DefaultScale coming from Monitor object. Database shouldn't be trusted either. 2024-01-25 11:24:13 -05:00
Isaac Connor 0fb71e35f2 Add luxor.js and use it to format datetimes 2024-01-24 16:10:20 -05:00
Isaac Connor fb8b4af3f8 Revert "Remove unneeded bootstrap classes"
This reverts commit 00f52704a5.
2024-01-24 13:17:52 -05:00
Isaac Connor 00f52704a5 Remove unneeded bootstrap classes 2024-01-24 13:00:31 -05:00
Isaac Connor 552069cd64 Makes zones view use getBodyTopHTML so that it display error messages. Rename deleteBtn to action. 2024-01-21 11:31:44 -05:00
Isaac Connor 580aefdfee Handle the deleteBtn having an id instead of name == deleteBtn 2024-01-21 11:30:49 -05:00
Isaac Connor da700a621a Make EventStartCommand and EventEndCOmmand wider 2024-01-21 11:30:25 -05:00
Isaac Connor 4d1ffb258a Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-01-18 14:17:02 -05:00
Isaac Connor c26548d182 Alert any returned error messages when deleting events 2024-01-18 13:15:59 -05:00
Isaac Connor 04239c128c Fix regular expression search of Source 2024-01-18 12:44:55 -05:00
Isaac Connor adc784e767 Move maxfit2 to montage_common.js. Clean it up and apply strict 2024-01-17 17:04:49 -05:00
Isaac Connor ceb60dd606 Remove unused compSize 2024-01-17 16:54:49 -05:00
Isaac Connor 422dda62dc Remove important from navbar colour so that it is easier to override 2024-01-17 10:23:17 -05:00
Isaac Connor 839ef9ce67 Add a Component filter to logs 2024-01-16 16:35:52 -05:00
Isaac Connor 6812f2efe7 Fix eslint 2024-01-16 09:56:28 -05:00
Isaac Connor 6684f73694 Add export to users 2024-01-09 17:14:31 -05:00
Isaac Connor 7694d1aa86 Add End Date Time as an option for sorting in filters 2024-01-09 17:13:27 -05:00
Isaac Connor db2691bf60 Only show PTZ button if camera has ptz enabled 2024-01-09 17:10:44 -05:00
Isaac Connor 0d3953bd9e Fix collapsed version of navbar 2024-01-09 10:48:52 -05:00
Isaac Connor c456960254 Add tags_opTypes and use it to limit operators for tags in a filter 2024-01-08 17:24:19 -05:00
Isaac Connor ad54ad787a Fix missing WHERE on monitor select. 2024-01-08 10:01:29 -05:00
Isaac Connor da37e27431 Only do the console refresh if there is a value for REFRESH_MAIN 2024-01-04 15:17:09 -05:00
Isaac Connor 85006269f7 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-01-02 14:07:16 -05:00
Isaac Connor 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
Isaac Connor 2d49e93405 Introduce a Create permission for Monitors, so that a given user may Edit existing monitors, but not create new ones. 2024-01-02 12:18:09 -05:00
Isaac Connor 2b10d02271 Don't include Deleted Monitor Names when checking for duplicates 2023-12-30 11:46:04 -05:00
Isaac Connor 4193de1f00 Add functionality to undelete a Monitor 2023-12-14 13:55:16 -05:00
Isaac Connor 2514b3533a Fix spacing between monitor filters 2023-12-07 10:31:33 -05:00
Isaac Connor d51c99ce44 Fix groups not being shown when monitors not specifically selected. 2023-12-04 14:11:57 -05:00
Isaac Connor 5e9f53b41a Fixup issues with label for's 2023-12-03 17:57:22 -05:00
Isaac Connor 379028123e add wrap to monitor filters 2023-12-03 10:25:30 -05:00
Isaac Connor 99c9eb5e0e Fix missing ) 2023-11-30 14:23:17 -05:00
Isaac Connor bb94d02019 Make sure groups is always defined else we get error from user.js.php 2023-11-30 10:00:40 -05:00
Isaac Connor 420a5a5ea5 Load events using post so that we can send a large request 2023-11-23 16:59:59 -05:00
Isaac Connor 39a0ee1230 Add loading speed from COOKIES 2023-11-23 14:27:04 -05:00
Isaac Connor bde6870a21 Add support for Notes as a filter, setup for altering the terms later. Add CASE so that incomplete events have and EndTimeSecs 2023-11-23 14:25:52 -05:00
Isaac Connor b0a6ef5624 Add Sorting monitors by user preference. 2023-11-23 14:10:29 -05:00
Isaac Connor a7885a4c04 Make montagereview default to history mode 2023-11-23 14:00:19 -05:00
Isaac Connor 164ec3667e Fix eslint 2023-11-23 13:00:44 -05:00
Isaac Connor b08c44172a Add back a little padding to mfbpanel in montage 2023-11-23 13:00:30 -05:00
Isaac Connor 1fa3e18e5c Remove extra padding in headers 2023-11-23 13:00:13 -05:00
Isaac Connor 5be0ce5704 Fix eslint 2023-11-20 14:34:03 -05:00
Isaac Connor e1b17590fa Handle Config table not being updated for ZM_WEB_VIEWING_TIMEOUT 2023-11-20 14:29:25 -05:00
Isaac Connor 5fd00ef7a5 Use a modal instead of confirm for are you still watching popup 2023-11-20 14:23:45 -05:00
Isaac Connor 1df3dc4c8c Return the added modal 2023-11-20 14:23:24 -05:00
Isaac Connor 2c776523e9 Fix eslint 2023-11-20 14:04:03 -05:00
Isaac Connor 195a353bda Add Viewing idle timeout code to watch.js and montage.js 2023-11-20 13:42:19 -05:00
Isaac Connor d3cb7774b0 Add ZM_WEB_VIEWING_TIMEOUT, and remove quotes around config integer values so that they are integers instead of strings. 2023-11-20 13:38:22 -05:00
Isaac Connor c7bd2adb11 add ZM_WEB_VIEWING_TIMEOUT 2023-11-20 13:25:53 -05:00
Isaac Connor d06264624a Refresh events list when filters at top change or close in the case of datetimepicker 2023-11-17 12:06:03 -05:00
Isaac Connor 936cefb41a Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-11-17 09:33:22 -05:00
Isaac Connor 56095bec9d Must use MIN_STREAMING_PORT in monitor Url because 80/443 might not go to the same host as MIN_STREAMING_PORT (think reverse proxy) 2023-11-17 09:33:17 -05:00
Isaac Connor ee0ef4b6e4 Handle when there are no cueFrames populated 2023-11-16 10:34:43 -05:00
Isaac Connor c23ee28fe6 Take expires setting off setCookie so it defaults to 2038 like everywhere else. 2023-11-15 11:34:05 -05:00
efranzwa cf906e86c8 Added missing table tags 2023-11-15 04:55:18 -08:00
efranzwa 83af15329a Fixed Monitor->WebSite Source Refresh html 2023-11-14 04:13:04 -08:00
Isaac Connor aaaa321464 fix eslint 2023-11-09 11:55:17 -05:00
Isaac Connor 542803848d Prevent non-number inputs when filter attr is DiskPercent 2023-11-09 10:33:25 -05:00
Isaac Connor 7bc126abe1 Use User->Id() instead of Request['uid'] because when adding a new user Request['uid'] isn't populated so a warning is generated. 2023-11-08 14:23:49 -05:00
Isaac Connor 9537492f1c Handle invalid codec and fix video_tag boolean assignment causing video tag to be false 2023-11-02 12:21:30 -04:00
Isaac Connor 859baf6f8f Remove padding from navbars to condense them a bit. Fix 1 pixel extra padding on state button 2023-11-01 11:31:18 -04:00
Isaac Connor e2f8553b48 Fix lack of scroll on groups view. 2023-10-30 15:51:39 -04:00
Isaac Connor 36936001a4 Remove trailing spaces. Remove extra comma causing SQL-ERR 2023-10-30 10:22:04 -04:00
Isaac Connor 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
Isaac Connor db252ce191 Dont' log warning when no user preference set. Inlcude more info in log message. 2023-10-30 09:40:03 -04:00
Isaac Connor 29be822e99 Add required GROUP BY Id to fix SQL queries 2023-10-27 10:43:27 -04:00
Isaac Connor d7bb9674e3 Add newline to fix SQL err due to Tags 2023-10-26 11:11:50 -04:00
Isaac Connor f1f553dd98 Don't give a default value to Username it is not useful. Replace it with a placeholder. 2023-10-26 09:26:35 -04:00
Isaac Connor 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
Isaac Connor 0ab7a755ba Event::Tags returns an array of Tags objects, so turn them into a string. 2023-10-20 14:02:48 -04:00
Isaac Connor f650d300d4 BUmp jquery to 3.7.1 2023-10-20 10:53:24 -04:00
Isaac Connor f5107b5743 Default to showing PTZ if it is enabled 2023-10-20 09:05:03 -04:00
Isaac Connor 7c2ec7f404 Improve replayMode loading, adding support for User Preference default value 2023-10-19 13:02:39 -04:00
Isaac Connor 876d76ef1d Only do thumbnail animations if not on mobile. 2023-10-18 12:03:56 -04:00
Isaac Connor eaf43daa5c Fix missing date init 2023-10-16 14:13:07 -04:00
Isaac Connor 621e9e68d0 Must use floats when calculating width of progress bar segments. 2023-10-16 14:07:21 -04:00
Isaac Connor e9d51731e8 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-10-16 12:23:37 -04:00
Isaac Connor db7a25ab3b Remove event rename button functionality, as that exists in eventdetail/event edit. 2023-10-16 12:23:29 -04:00
Isaac Connor c6d9c7731d Add aborting in transit events loading before sending another. 2023-10-16 12:15:55 -04:00
Isaac Connor 1658943097 Use playClicked instead of vjsPlay as it has additional functionality 2023-10-16 12:15:28 -04:00
Isaac Connor 71ff61b05f Use parseInt around quoted number values so that we can trust that they are integers. Fixes an issue with StreamReplayBuffer 2023-10-15 17:55:44 -04:00
Isaac Connor 4fe61d60ca Add Email as a column in user list 2023-10-13 09:01:56 -04:00
Isaac Connor 0ba0e6d27b Control form elements were renamed from newControl to just Control. Update validateForm to match. 2023-10-11 14:58:54 -04:00
Isaac Connor ad35eba013 Use bootstrap table for user list, giving us sortable columns and we can use mobile table/card 2023-10-11 13:34:38 -04:00
Isaac Connor 0fe6dc2997 Fix the second Offline test. Fixes #3766 2023-10-11 11:34:27 -04:00
Isaac Connor 16db44193f Test for data.response being defined and do some logging if not 2023-10-06 14:32:55 -04:00
Isaac Connor c78063abd1 If we can edit we should still be able to do view actions 2023-10-04 15:11:14 -04:00
Isaac Connor 9b1e98997c fix eslint 2023-10-01 10:28:36 -04:00
Isaac Connor 10cf26fa7b Take FPSReportInterval into account when determining if a monitor is dead. Fixes #3766 2023-09-29 12:09:23 -04:00
Isaac Connor 91c44a4f9a Fix semi colon 2023-09-26 15:17:26 -04:00
Isaac Connor 23b58a2709 Move delteclick and download click into separate functions. Only load delconfirm modal when delete is clicked. 2023-09-26 15:17:01 -04:00
Isaac Connor e1ef40de17 Only load the delConfirm modal if we click delete 2023-09-25 16:27:01 -04:00
Isaac Connor a619634988 Add tab to available js vars on options 2023-09-21 12:52:30 -04:00
Isaac Connor fc3a1bfc4b use const instead of var 2023-09-21 12:52:02 -04:00