1b7f3b0ede
Added a button for editing detection zone from monitor settings
2024-03-16 15:23:16 +03:00
ecd0c644c7
Merge branch 'ZoneMinder:master' into patch-24
2024-03-15 23:23:45 +03:00
9dc93389f9
Merge branch 'ZoneMinder:master' into patch-16
2024-03-15 23:22:03 +03:00
1bd94308b1
Make no alarm.jpg a debug instead of error, because continuous events don't have them.
2024-03-15 12:09:31 -04:00
1c782529c4
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-15 11:42:32 -04:00
8442a1aca4
fixup reversion of bootstrap-table console which shouldn't have been merged yet
2024-03-15 11:42:07 -04:00
cc6acfe3ed
Merge pull request #3868 from IgorA100/patch-23
...
Fix Horizontal scroll bar in live view
2024-03-15 11:41:25 -04:00
a199a4cb8d
Fix button bar as a result of reverting bootstrap-table console
2024-03-15 11:40:20 -04:00
e7795513f5
Moved the <form> block for the "Options-Storage" page to a separate file "_options_storage.php"
2024-03-15 18:15:56 +03:00
320041ed4d
Page "Options-Storage" The buttons are now at the top. Added DIV with .wrapper-scroll-table
...
- The <form> is placed in a separate file for ease of use.
- Necessary for organizing vertical scrolling of a block with a table
2024-03-15 18:12:00 +03:00
8f5e1e3e1a
Page "Options-Servers" The buttons are now at the top. Added DIV with .wrapper-scroll-table
...
Necessary for organizing vertical scrolling of a block with a table
2024-03-15 18:07:50 +03:00
4eb853c90f
Page "Options-Users" The buttons are now at the top. Added DIV with .wrapper-scroll-table
...
Necessary for organizing vertical scrolling of a block with a table
2024-03-15 18:05:11 +03:00
de5d069b5e
Page "Groups" The buttons are now at the top. Added #optionsContainer & #options and DIV with .wrapper-scroll-table
...
Necessary for organizing vertical scrolling of a block with a table
2024-03-15 17:59:11 +03:00
3953ad982f
Added styles for vertical scrolling of the table container
2024-03-15 17:53:36 +03:00
ed9c91c9f3
Revert "Revert "Merge pull request #3864 from IgorA100/patch-19""
...
This reverts commit 00bd09fdc2
2024-03-15 10:53:30 -04:00
95d4458965
Add wrapper fo scroll table & remove padding-top from "form" & add padding to #optionsContainer
...
When sticky mode is enabled, the table must be scrolled vertically if it does not fit on the page.
It may not be the best option, but now it is necessary. For example, for the pages "Servers, Storage, Groups", etc.
Changing the padding-top is necessary to maintain a single style if there are some other elements in front of the form (buttons for example) or there is nothing in front of the form.
2024-03-15 16:26:49 +03:00
00bd09fdc2
Revert "Merge pull request #3864 from IgorA100/patch-19"
...
This reverts commit 305a1485cc736ac7dd33
2024-03-15 09:13:22 -04:00
da3749389a
Fix Horizontal scroll bar in live view
...
When scaling videos larger than the screen size, the horizontal bar was not visible.
2024-03-15 13:00:57 +03:00
4906bb17a2
add space
2024-03-15 11:28:43 +03:00
2f7287e5ba
Changed "let" to "const", adding spaces & add "const"
2024-03-15 11:25:13 +03:00
f61ea18f77
Removed unused function
2024-03-15 01:13:27 +03:00
2e959124ee
Change ID button
2024-03-15 01:11:22 +03:00
ff0a630aea
Replacing icon "keyboard_arrow" with "filter_alt" in the hide filter button on the console
2024-03-15 01:07:19 +03:00
b70ff30b29
Merge branch 'ZoneMinder:master' into patch-16
2024-03-15 00:56:24 +03:00
305a1485cc
Merge pull request #3864 from IgorA100/patch-19
...
Fix page console
2024-03-14 16:44:21 -04:00
736ac7dd33
Merge pull request #3866 from IgorA100/patch-21
...
Eliminate possible duplication of horizontal scrollbar
2024-03-14 16:43:35 -04:00
ae74a19168
remove class "h-100" because interfere with proper scaling
2024-03-14 22:48:58 +03:00
60811d43c5
Fix live view style (watch page)
...
A slight violation of style, incl. vertical scroll bar with sticky enabled
2024-03-14 22:30:47 +03:00
0dc54b6adf
Eliminate possible duplication of horizontal scrollbar
...
All management occurs inside the #options & #sidebar containers
2024-03-14 16:01:15 +03:00
6cd5fac11b
For #contentButtons add margin-bottom: 8px;
...
Now the vertical margin will be symmetrical.
2024-03-14 11:58:30 +03:00
e10bb3610a
Fix previous commit
2024-03-14 11:54:50 +03:00
91955b491d
Remove class "pt-2"
...
The ".contentButtons" style will be changed in the CSS
2024-03-14 11:50:51 +03:00
38ae631dbe
Fix space
2024-03-14 00:11:28 +03:00
37756fb5f9
Added DIV to offset vertical scrollbar to left
2024-03-13 20:59:31 +03:00
cf92914c60
Update options.css
2024-03-13 20:51:23 +03:00
b10511fb97
Adjusting the vertical scroll bar when using sticky
2024-03-13 20:50:25 +03:00
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
6b8fe26be6
empty line
2024-03-13 16:26:25 +03:00
510d60e931
Merge branch 'master' into patch-19
2024-03-13 16:24:45 +03:00
ef3245fe2b
Moved class "pt-2" in other DIV
...
Necessary for correct table scrolling
2024-03-13 16:11:21 +03:00
1d81af50b9
Fixing table header when using sticky
2024-03-13 16:07:22 +03:00
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
4d8a357bba
Rough in bootstrap-table for monitor list in console.
2024-03-13 08:47:31 -04:00
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
83d64e8442
Fix style for sticky navbar & sticky table header
2024-03-13 13:49:47 +03:00
fc23cef16a
Code cleaned & added table header background
2024-03-13 13:33:15 +03:00
6ccf0c66a1
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-12 21:45:07 -04:00
2ba7369ea8
hack to fix scroll bars in bootstrap table
2024-03-12 21:45:02 -04:00
be202719c3
Appease eslint
2024-03-12 21:22:50 -04:00
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
95d2e0a27c
Fix form not scrolling entirely. Remove top padding. Remove right padding due to bootstrap row.
2024-03-12 17:53:27 -04:00
f926e98283
Temp fix to put scroll bars back
2024-03-12 09:12:53 -04:00
855da2cbc4
Put back scroll bars on console
2024-03-12 08:55:44 -04:00
657cda18ef
Put back style permitting scrolling to work
2024-03-12 08:44:12 -04:00
625e699e32
Fix: video scaling on console
...
Close #3861
2024-03-12 11:44:29 +03:00
65c2331394
Feat: added functions for controlling the visibility of blocks when clicking on the control button
2024-03-10 23:19:19 +03:00
20e1ae2090
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-10 11:04:10 -04:00
3f9bda4f80
FIx arrap_map => array_map. Fixes #3859
2024-03-10 11:03:03 -04:00
3939bcec22
Fix eslint
2024-03-10 11:02:28 -04:00
b647280766
FIx arrap_map to array_map. Don't assume _REQUEST[mids] exists. Fixes #3859
2024-03-10 10:59:56 -04:00
76db26cec1
Merge pull request #3852 from IgorA100/patch-12
...
Fix style in options pages
2024-03-09 11:54:43 -05:00
28fd799bf6
Removed erroneously added style for tag 'a'
2024-03-09 10:26:16 +03:00
4718bff514
Merge pull request #3856 from IgorA100/patch-14
...
Fix design when viewing list of events
2024-03-08 08:24:18 -05:00
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
f27f9bdf95
Fix layout
2024-03-07 16:58:26 +03:00
ab556f3135
Update events.css
2024-03-07 16:16:02 +03:00
4df177208c
Fix design when viewing list of events
...
Layouts & space in code
2024-03-07 16:03:16 +03:00
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
e90340dd2b
Fix: More correct scaling (with padding) during live viewing
2024-03-07 13:30:39 +03: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
ada974ef51
Fix eslint
2024-03-06 14:21:18 -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
57c993507c
Fix layout
2024-03-06 20:18:15 +03:00
7757eeae1a
Fix layout
2024-03-06 20:14:36 +03:00
151114f778
Fix space
2024-03-06 20:00:08 +03:00
008c864751
Fix style
2024-03-06 19:56:10 +03:00
714a0913e4
Merge branch 'ZoneMinder:master' into patch-12
2024-03-06 19:52:25 +03:00
f94d264407
Fix: Button block location
...
There is no need
2024-03-06 19:01:52 +03:00
c8c731519d
Fix Removing excess styles & specifying a minimum textarea height
2024-03-06 01:23:42 +03:00
c69f6e8908
Fix Removing excess styles & Aligning a form vertically
...
Additional modernization required
2024-03-06 01:14:59 +03:00
696837e22f
Fix Removing excess styles
2024-03-06 01:11:16 +03:00
21cb1c8c29
Fix layout
2024-03-06 01:06:45 +03:00
55df0fd8f7
Only save permissions if passed in POST. We might not be able to see all monitors, so might not exist in POST.
2024-03-05 16:33:41 -05: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
c078cf7bba
Use per-monitor permission on save button
2024-03-05 14:02:20 -05:00
b5e1d5e611
Fix invalid canEditMonitor call, simplify login in canView and canEdit to prefer per-monitor permissions
2024-03-05 14:02:01 -05:00
b4bbff6353
Use per-monitor permissions
2024-03-05 14:00:40 -05:00
5120baa9ee
Implement object permissions vs entity permissions so that we can handle the new group based permissions on Monitors. This fixes status updates when MOnitors=None but there is a per-monitor group based view permission.
2024-03-05 14:00:23 -05:00
302f3ad96d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-03-05 11:48:16 -05:00
beda6cd66d
Remove unused linked monitor array population. All is done in javascript now
2024-03-05 11:47:39 -05:00
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
4ab1aaa1d0
Fix Linked monitor expression not updating
2024-03-05 11:46:42 -05:00
ed14fc7449
Don't allow linking to ourselves
2024-03-05 11:14:58 -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
634bffea80
Adaptation of Chosen to Bootstrap (Height alignment)
2024-03-05 15:43:01 +03: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
8f521a7221
Fix Entrust management of enabling search in select to the Chosen plugin
2024-03-05 14:06:13 +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
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
6ba09c6f0d
Finish switch to using Intervals instead of Timeouts
2024-01-24 09:28:12 -05:00
ceb81e13d6
Quiet warning about MonitorIds not exisitng in newGroup array when no MonitorIds are selected for that group
2024-01-23 16:14:21 -05:00
1ffc10ca83
Add recursive adding of monitors from children groups
2024-01-23 16:13:33 -05:00
3d2fa3172f
Fix im => i. Typo in variable name.
2024-01-22 15:41:00 -05:00
bd90711aa6
Use an interval instead of calling Timeout from callback
2024-01-22 14:25:57 -05:00
ad168ca23a
Allow monitor creation if Monitors()==Create
2024-01-22 14:25:57 -05:00
552069cd64
Makes zones view use getBodyTopHTML so that it display error messages. Rename deleteBtn to action.
2024-01-21 11:31:44 -05:00
4df4f5146a
Log error_message if set
2024-01-21 11:31:06 -05:00
580aefdfee
Handle the deleteBtn having an id instead of name == deleteBtn
2024-01-21 11:30:49 -05:00
da700a621a
Make EventStartCommand and EventEndCOmmand wider
2024-01-21 11:30:25 -05:00
e47fd8f661
Recamp zones actions, adding a redirect after finishing deletion and fixing CanEdit=>canEdit
2024-01-21 11:30:01 -05:00
0d6e7bc082
Add debugging to editableMonitor and handle when permission is set to Create.
2024-01-21 11:28:34 -05:00
4d1ffb258a
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-01-18 14:17:02 -05:00
69383316aa
If the video file doesn't exist, don't try ffmpeg etc and log all those errors.
2024-01-18 13:16:22 -05:00
c26548d182
Alert any returned error messages when deleting events
2024-01-18 13:15:59 -05:00
ef926f4437
Return an array of string error messages instead of an array of arrays of arrays in deleting events.
2024-01-18 13:15:25 -05:00
04239c128c
Fix regular expression search of Source
2024-01-18 12:44:55 -05:00
adc784e767
Move maxfit2 to montage_common.js. Clean it up and apply strict
2024-01-17 17:04:49 -05:00
ceb60dd606
Remove unused compSize
2024-01-17 16:54:49 -05:00
422dda62dc
Remove important from navbar colour so that it is easier to override
2024-01-17 10:23:17 -05:00
839ef9ce67
Add a Component filter to logs
2024-01-16 16:35:52 -05:00
6812f2efe7
Fix eslint
2024-01-16 09:56:28 -05:00
1ab66b10b1
Don't assume findByEventidAndType actually returns a frame. If we are only recoridng, then there will be no alarm frames in the db
2024-01-16 09:50:19 -05:00
ebadc7a07b
GIve default user the create permission
2024-01-14 08:41:12 -05:00
a402217456
Correct state values so that Unknown starts at 0
2024-01-11 17:19:29 -05:00
36bdc3f8a9
Revert "Remove STATE_UNKNOWN"
...
This reverts commit 66e7179242
2024-01-11 17:16:58 -05:00
66e7179242
Remove STATE_UNKNOWN
2024-01-11 17:13:09 -05:00
63def6b82e
Add a function to_string that handles nulls, arrays, etc
2024-01-11 10:30:36 -05:00
6684f73694
Add export to users
2024-01-09 17:14:31 -05:00
7694d1aa86
Add End Date Time as an option for sorting in filters
2024-01-09 17:13:27 -05:00
c954214b03
If success when saving monitors, do a redirect so that a reload doesn't repeat the request and ask to resubmit data
2024-01-09 17:12:45 -05:00
db2691bf60
Only show PTZ button if camera has ptz enabled
2024-01-09 17:10:44 -05:00
0d3953bd9e
Fix collapsed version of navbar
2024-01-09 10:48:52 -05:00
c456960254
Add tags_opTypes and use it to limit operators for tags in a filter
2024-01-08 17:24:19 -05:00
ad54ad787a
Fix missing WHERE on monitor select.
2024-01-08 10:01:29 -05:00
da37e27431
Only do the console refresh if there is a value for REFRESH_MAIN
2024-01-04 15:17:09 -05:00
5887a1e853
State Unknown starts at -1
2024-01-03 16:52:44 -05:00
31036ae9dd
Users with Create permission should be able to view console
2024-01-03 16:41:56 -05:00
2747a97168
Disable range support to fix chrome playback.
2024-01-02 17:07:34 -05:00
2cc47557df
Remove bogus adding RTSP2WEB to CSP and CORS
2024-01-02 16:44:05 -05:00
ee9e03a7c1
Fix FPS values when getting status from web instead of ZMS.
2024-01-02 16:28:49 -05:00
e9362f1a10
Fix duplicated Capturing in monitor status elements. Add Recording. Fix MinEventId, MaxEventId, TotalEvents. Ad CaptureFPS, AnalysisFPS and CaptureBandwidth
2024-01-02 16:28:49 -05:00
f064887451
Add ZM_RTSP2WEB_PATH to CSP_Headers
2024-01-02 16:25:28 -05:00
85006269f7
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-01-02 14:07:16 -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
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
2b10d02271
Don't include Deleted Monitor Names when checking for duplicates
2023-12-30 11:46:04 -05:00
deb880e99b
TRun off SSL verification when restarting remote filters.
2023-12-29 12:27:18 -05:00
7d5b91949c
Remove duplicate .cherry-picked commit wasn't needed.
2023-12-29 11:25:10 -05:00
d2a264b79f
define count. Fixes #3799
2023-12-29 11:06:46 -05:00
72e8ee0e5e
Move session inclusion down to where it is first used.
2023-12-29 11:06:46 -05:00
326a4ca201
Clean out old unused debugging code. The code further down is more useful
2023-12-29 11:06:46 -05:00
6e93e3df4c
Allow untrsuted ssl certs when sending commands to other servers
2023-12-24 12:17:08 -05:00
ac1c6203c2
Remove really old utility scripts for changing php tags
2023-12-20 09:20:11 -05:00
4e2dd31cdc
Use ZM_PATH_API instead of hard coded /zm/api
2023-12-15 09:18:04 -05:00
4193de1f00
Add functionality to undelete a Monitor
2023-12-14 13:55:16 -05:00
ea3d91b46f
Actually fix problem by not putting () on an integer has-post_sql_conditions
2023-12-14 09:32:32 -05:00
d910585ed9
Be a little more specific about what we are int'ing. https://forums.zoneminder.com/viewtopic.php?t=32942 has a weird error report that this might address
2023-12-13 19:39:11 -05:00
f9b82ca037
Always append username to zmu command line so that auth is more efficient
2023-12-12 11:14:29 -05:00
af3f380692
set defaults on properties of user object to fix neew user creation.
2023-12-09 18:01:04 -05:00
88db0e9854
Handle when ZM_RTSP2WEB_PATH hasn't been filled, but RTSP2Web has been turned on for a monitor.
2023-12-07 13:17:08 -05:00
2514b3533a
Fix spacing between monitor filters
2023-12-07 10:31:33 -05:00
ffc111f1e7
Need to a () so that ModelId is called as a function and so it doesn't complain about lack of property
2023-12-06 09:37:45 -05:00
ccfcd33855
modal requests require csrf-magic.
2023-12-05 09:47:35 -05:00
aafd4067e0
Dont' restart a monitor if it has been deleted
2023-12-04 14:50:37 -05:00
d51c99ce44
Fix groups not being shown when monitors not specifically selected.
2023-12-04 14:11:57 -05:00
03858ba1a2
Code style, using ->Id() instead of checking for property existence.
2023-12-04 14:06:49 -05:00
5e9f53b41a
Fixup issues with label for's
2023-12-03 17:57:22 -05:00
379028123e
add wrap to monitor filters
2023-12-03 10:25:30 -05:00
be61184faf
Add defaults to GenerateVideo, don't chdir, fix other code
2023-12-01 13:05:36 -05:00
70b1432c1f
Have to check for property_exists instead of empty. empty includes a valid value of 0
2023-12-01 12:46:49 -05:00
49af487746
port over generateVideo from perl side and stick into Event.
2023-12-01 12:46:26 -05:00
44a3a7a6a8
Fix loading event due to missing GROUP BY. Fixes event video generation.
2023-12-01 12:46:05 -05:00
99c9eb5e0e
Fix missing )
2023-11-30 14:23:17 -05:00
bb94d02019
Make sure groups is always defined else we get error from user.js.php
2023-11-30 10:00:40 -05:00
02f922d4b7
Don't include csrf on ajax requests. We only return json for ajax and the csrf kills the json parsing.
2023-11-28 10:16:58 -05:00
065bed894c
Use empty array instead of null for allowedMonitors
2023-11-24 08:57:35 -05:00
420a5a5ea5
Load events using post so that we can send a large request
2023-11-23 16:59:59 -05:00
39a0ee1230
Add loading speed from COOKIES
2023-11-23 14:27:04 -05:00
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
b0a6ef5624
Add Sorting monitors by user preference.
2023-11-23 14:10:29 -05:00
a7885a4c04
Make montagereview default to history mode
2023-11-23 14:00:19 -05:00
2fb0e40503
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-11-23 13:00:51 -05:00
164ec3667e
Fix eslint
2023-11-23 13:00:44 -05:00
b08c44172a
Add back a little padding to mfbpanel in montage
2023-11-23 13:00:30 -05:00
1fa3e18e5c
Remove extra padding in headers
2023-11-23 13:00:13 -05:00
27977acdd4
fix: php 8.3 deprecated get_class method call without argument
2023-11-22 10:48:04 +03:30
07d4fb2099
Set default delay, add starting statusCmdTimer when using rtsp2web
2023-11-21 11:35:04 -05:00
23a0e561eb
Remove depth of nested if's by returning early.
2023-11-21 10:49:09 -05:00
092f8df115
Handle scale=0 in getImageSrc
2023-11-20 17:23:51 -05:00
5be0ce5704
Fix eslint
2023-11-20 14:34:03 -05:00
e1b17590fa
Handle Config table not being updated for ZM_WEB_VIEWING_TIMEOUT
2023-11-20 14:29:25 -05:00
9a271e8960
Add are you still watching modal
2023-11-20 14:23:57 -05:00
5fd00ef7a5
Use a modal instead of confirm for are you still watching popup
2023-11-20 14:23:45 -05:00
1df3dc4c8c
Return the added modal
2023-11-20 14:23:24 -05:00
2c776523e9
Fix eslint
2023-11-20 14:04:03 -05:00
195a353bda
Add Viewing idle timeout code to watch.js and montage.js
2023-11-20 13:42:19 -05:00
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
3ce96005af
Load Type when loading Config
2023-11-20 13:26:28 -05:00
c7bd2adb11
add ZM_WEB_VIEWING_TIMEOUT
2023-11-20 13:25:53 -05:00
IgorA100
Isaac Connor
Isaac Connor
Simpler1
Simpler1
Server
adhamiamirhossein