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
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
8902f902ea
Update skin.css
2024-03-05 00:58:05 +03:00
1f6279a00f
Update skin.css
2024-03-05 00:56:59 +03:00
b07ae01e89
Fix cursor for <a>
2024-03-05 00:53:47 +03: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
38acd931e4
Added monitor edit button
2024-03-04 21:22:10 +03:00
a370ce19ea
Fix style
2024-03-04 17:28:30 +03:00
f173974f2b
Fix: Scaling
2024-03-04 17:22:32 +03:00
ea17631de9
Fix Control panel
...
At least temporarily.
In general, a lot of work.
2024-03-04 17:07:55 +03:00
074751e068
Fix style
...
Managed by bootstrap
2024-03-04 17:00:20 +03:00
a18167377e
Fix: scaleToFit function
...
It is required to pass an object in parameters
2024-03-04 16:52:04 +03:00
66ff90c8c1
Update watch.js
2024-03-04 16:47:46 +03:00
a05540bd3d
Fix: Responsive design with use bootstrap
2024-03-04 16:30:09 +03:00
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
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
45bf972fea
Ref: style
...
Bootstrap is now used more
2024-03-03 18:14:29 +03:00
99779681fb
Fix: style
...
Not required, because now using Bootstrap
2024-03-03 17:27:14 +03:00
21abe20234
Fix: style
...
Not required, because now using Bootstrap
2024-03-03 17:26:09 +03:00
373fa15440
Fix: rem style
...
Not required, because now using Bootstrap
2024-03-03 17:21:30 +03:00
9aa8919fb8
Fix: Button layout
2024-03-03 17:04:59 +03:00
6ea195b8b1
Fix: Button layout
2024-03-03 17:01:50 +03:00
0d5d495bbf
FixL Recalculation of height and width if "padding" is specified for "wrapperEventVideo"
2024-03-03 16:56:50 +03:00
84d8aa9e52
Ref: Responsive design
2024-03-03 16:49:54 +03:00
ccaaf6aaf5
Consistency
2024-03-02 14:12:59 -05:00
d7eca5bb23
fix(event): Keep progressBar from overlapping videojs control.
2024-03-02 14:10:25 -05:00
3d008263e4
fix(tags): Tags were not populated on watch view
2024-03-02 11:30:35 -05:00
d0d47a81d3
Merge pull request #3846 from Simpler1/patch-1
...
Placeholder text for monitor date time format.
2024-03-02 11:12:11 -05:00
19e6e9baf2
Merge pull request #3707 from Simpler1/default_sound
...
feat(sound): Include default alarm sound (again)
2024-03-02 11:11:03 -05:00
7fdc204082
feat(): Custom snapp.ogg sound for ZoneMinder
2024-03-02 10:15:44 -05:00
e1e255393d
typo
2024-03-02 09:55:08 -05:00
6ff4c3f7ec
Added additional parameters
2024-03-02 09:52:55 -05:00
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
ecab601c21
Use array_values to discard the keys in the array of monitorIds
2024-03-01 16:13:52 -05:00
8a42594009
Upgrade bootstrap-table to 1.22.3
2024-03-01 11:44:06 -05:00
02785fb81d
Merge pull request #3844 from IgorA100/patch-7
...
Adding and correcting Russian translation
2024-02-29 15:22:17 -05:00
9cd048d97b
Only try to set monitor_permissions for non-deleted Monitors
2024-02-29 09:19:19 -05:00
c33ec9833a
Only show non deleted monitors in linked monitors
2024-02-29 08:59:14 -05: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
0128873ca7
Spacing, some better debug
2024-02-27 18:41:31 -05:00
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
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
742a821170
Add 'Decoder' => 'Декодер'
2024-02-28 00:30:43 +03:00
ebe8a26188
Add 'OnMotion' => 'При движении',
2024-02-28 00:26:30 +03:00
881cb5327e
Adding and correcting Russian translation
2024-02-28 00:19:47 +03:00
f18f448a8c
Fix setting frames
2024-02-26 16:22:51 -05:00
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
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
5a866aee0e
Add id's to selects to appease label for= attributes
2024-02-05 18:42:25 -05:00
4107058000
FIx units on warning about timeout
2024-02-05 18:42:05 -05:00
43c3937b87
Fix image proxy broken due to imagecreatefromstream=>imagecreatefromstring
2024-02-02 11:50:03 -05:00
48015e6efd
Remove extra / and urlencode password for Amcrest
2024-02-02 11:49:44 -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
4987ea1b21
Define user before using for viewableMonitorIds
2024-02-01 11:39:09 -05:00
d47f78b354
Fix for use strict defining monitor_ids
2024-02-01 11:38:38 -05:00
da2744749d
fix vertical alignment and stretching of images on snapshot
2024-02-01 11:38:24 -05:00
9bb9f733a4
Reference the tab that the bad Path or Port is on
2024-01-31 18:24:22 -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
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
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
0e88d764f0
Use object methods to load montiors
2024-01-28 16:53:30 -05:00
2c7c928fa6
Use object methods when loading monitors and zones and filter them by Deleted status
2024-01-28 16:53:06 -05:00
b7bc7cef7e
Only load non deleted Monitors
2024-01-28 16:52:36 -05:00
c84e7d4563
Include Monitor.php
2024-01-28 16:52:16 -05:00
512b1ec76d
Only list viewable monitors and zones
2024-01-28 16:51:49 -05:00
ac2cfa5ccb
Add children groups to MonitorIds
2024-01-28 16:32:31 -05:00
648bd77b21
Apply validCardinal to all eids. Remove dead delete code
2024-01-27 18:33:19 -05:00
a5916f01d1
Protect against XSS in server db values
2024-01-25 19:34:46 -05:00
39b2014c2d
Prevent XSS from COOKIE poisoning
2024-01-25 19:31:28 -05:00
b1aeb319f7
Prevent XSS from COOKIE poisoning
2024-01-25 19:27:18 -05:00
35396aad55
Prevent XSS from COOKIE poisoning
2024-01-25 19:25:15 -05:00
d8f36e4ef9
Prevent XSS from COOKIE poisoning
2024-01-25 19:23:28 -05:00
bf32bd6926
Prevent XSS throu mids
2024-01-25 19:12:37 -05:00
f1a26b90b6
Prevent against CSS in dupId
2024-01-25 19:05:59 -05:00
bc1fb8eef2
Protect against XSS from User field
2024-01-25 19:04:15 -05:00
9505910847
Prevent XSS via uid and prev
2024-01-25 19:01:44 -05:00
59b77df7f1
Prevent XSS through scale parameter
2024-01-25 18:57:01 -05:00
6f595385d7
Protect filter loading from injection
2024-01-25 18:56:42 -05:00
d45b05ec8a
XSS protect from server id and storage id
2024-01-25 18:50:35 -05:00
bac2705051
XSS protect from monitor id and name
2024-01-25 18:49:22 -05:00
c138984fc9
XSS prevent on sort_asc and eid. Still need to protect filter
2024-01-25 18:48:39 -05:00
b5757a2d05
Use validCardinal on Id's cuz we don't trust the db or Object
2024-01-25 18:38:44 -05:00
559d6edc70
Don't apply timezone when formatting datetimes
2024-01-25 11:57:29 -05:00
cfd8e3418e
Don't apply timezone when formatting datetimes
2024-01-25 11:57:19 -05:00
ee13034384
Use validInt on DefaultScale coming from Monitor object. Database shouldn't be trusted either.
2024-01-25 11:24:13 -05:00
5a498878b8
Protect mid with validCardinal. Return early if it is invalid or monitor is not found
2024-01-24 19:28:59 -05:00
914f7e0ae2
APply validCardinal to sid so that arrays don't get passed to new Server() which then prevents XSS
2024-01-24 19:25:15 -05:00
9669f1e3ef
Sanitize entity before outputting it preventing XSS
2024-01-24 19:22:47 -05:00
f62f1529f5
Try to prevent XSS by verifying valid image data
2024-01-24 19:18:22 -05:00
0fb71e35f2
Add luxor.js and use it to format datetimes
2024-01-24 16:10:20 -05:00
fb8b4af3f8
Revert "Remove unneeded bootstrap classes"
...
This reverts commit 00f52704a5
2024-01-24 13:17:52 -05:00
00f52704a5
Remove unneeded bootstrap classes
2024-01-24 13:00:31 -05:00
1255ae4bc7
Change Tags to be concated and add GROUP BY to fix SQL. Populate event object with db row instead of reloading by Id. Remove datetime formatting as it is screwing up and formatting should happen in js
2024-01-24 13:00:31 -05:00
8ca1436224
If img has a fix width set, clear it when we change scale
2024-01-24 12:54:13 -05:00
IgorA100
Isaac Connor
Simpler1
Simpler1
Isaac Connor
Server