github.com/ZoneMinder/zoneminder commits | Ecosyste.ms: OpenCollective

Revert "Merge pull request #3864 from IgorA100/patch-19"

This reverts commit 305a1485ccf0c2b818e6d2f260fecfe41aadc6e3, reversing
changes made to 736ac7dd...

00bd09fdc27b5d2acc6db21c61451cf1f8d73f37 authored 10 months ago by Isaac Connor <[email protected]>

Merge pull request #3864 from IgorA100/patch-19

Fix page console

305a1485ccf0c2b818e6d2f260fecfe41aadc6e3 authored 10 months ago by Isaac Connor <[email protected]>

Merge pull request #3866 from IgorA100/patch-21

Eliminate possible duplication of horizontal scrollbar

736ac7dd333a8f65b45c97375d1c6b29bfb6395a authored 10 months ago by Isaac Connor <[email protected]>

Merge pull request #3867 from IgorA100/patch-22

Fix live view style (watch page)

e1baa78ac2cc6d6b1344ad649a73c10410bf8c4f authored 10 months ago by Isaac Connor <[email protected]>

remove class "h-100" because interfere with proper scaling

ae74a19168ebf5d8c1ce44eff3cb865251f0f11b authored 10 months ago by IgorA100 <[email protected]>

Fix live view style (watch page)

A slight violation of style, incl. vertical scroll bar with sticky enabled

60811d43c5828177a5b33278d8f7bd5b18cd26d7 authored 10 months ago by IgorA100 <[email protected]>

Merge branch 'master' of github.com:ZoneMinder/zoneminder

0c49884956ff4e34fedeeaea5a4a207b565b00fb authored 10 months ago by Isaac Connor <[email protected]>

Add duration to hints for EVENT_CLOSE_MODE and use alternate regexp for pattern

62ba0bf9037a9af7799edccb126c5ff2ebdafd27 authored 10 months ago by Isaac Connor <[email protected]>

Fix motion events having cause continuous. Fixes #3858

56fcd8472ef4de60f37f12098f55ec6742d42411 authored 10 months ago by Isaac Connor <[email protected]>

Eliminate possible duplication of horizontal scrollbar

All management occurs inside the #options & #sidebar containers

0dc54b6adf6d1f053f31ea3bad64dbde1b29a807 authored 10 months ago by IgorA100 <[email protected]>

For #contentButtons add margin-bottom: 8px;

Now the vertical margin will be symmetrical.

6cd5fac11b2ef1bbd06032c7b79866ae9d725e1f authored 10 months ago by IgorA100 <[email protected]>

Fix previous commit

e10bb3610a89f89ee4ecdcbb18f386d031ceb9fa authored 10 months ago by IgorA100 <[email protected]>

Remove class "pt-2"

The ".contentButtons" style will be changed in the CSS

91955b491d0125e9b1bec64f2b4b4855267ee020 authored 10 months ago by IgorA100 <[email protected]>

Merge pull request #3865 from IgorA100/patch-20

Fis style in Options page

dee7a27a975a3e2ec46479045f82760e8ee91d96 authored 10 months ago by Isaac Connor <[email protected]>

Fix space

38ae631dbea495267e46340d6eedf4998d9f905c authored 10 months ago by IgorA100 <[email protected]>

Added DIV to offset vertical scrollbar to left

37756fb5f9d348ce60876ddddfbde92510b68c60 authored 10 months ago by IgorA100 <[email protected]>

Update options.css

cf92914c605a96819a60596f9a905b62bef55c41 authored 10 months ago by IgorA100 <[email protected]>

Adjusting the vertical scroll bar when using sticky

b10511fb97dad00b5d4456e0b681893d62cd7179 authored 10 months ago by IgorA100 <[email protected]>

Fis style in Options page

* Why extra padding at top?
padding-top: 2rem;
*/

I don't know the answer, because......

66364c7c32bc608f752e6be5a2e999bc71c7f313 authored 10 months ago by IgorA100 <[email protected]>

empty line

6b8fe26be6d11541cdecf950ee888eb88df154a5 authored 10 months ago by IgorA100 <[email protected]>

Merge branch 'master' into patch-19

510d60e931c69cb08a596ec21ce3f3d0d5c8b7d7 authored 10 months ago by IgorA100 <[email protected]>

Moved class "pt-2" in other DIV

Necessary for correct table scrolling

ef3245fe2b683912770d9e4c436872a169ec4a58 authored 10 months ago by IgorA100 <[email protected]>

Fixing table header when using sticky

1d81af50b93e6fbd4b5d641d17f27c0102c02d48 authored 10 months ago by IgorA100 <[email protected]>

Fix: change class "table-responsive-sm-2" to "table-responsive"

And always specify the object ID before its class

452576ad5eef734d804e56f03662ce1ffc50d8fa authored 10 months ago by IgorA100 <[email protected]>

Rough in bootstrap-table for monitor list in console.

649b4596306be39e2293bacc5cc32441df4e54b3 authored 10 months ago by Isaac Connor <[email protected]>

Rough in bootstrap-table for monitor list in console.

4d8a357bbafcd40d36e5cae30bc6f47ac3ea4e67 authored 10 months ago by Isaac Connor <[email protected]>

Merge pull request #3863 from IgorA100/patch-18

Code cleaned & added table header background in events

538db9946aae8d3db3da3b6ea4805aca07b5b2c8 authored 10 months ago by Isaac Connor <[email protected]>

Fix scrool bar

You should not hardcode "overflow-y: scroll;" because if the table contains few rows, then we do...

6a20a3a4820bcc22e6d268ac7291ca5dbb3ef2ea authored 10 months ago by IgorA100 <[email protected]>

Fix style for sticky navbar & sticky table header

83d64e8442b178a176874378fdba713eb917fffc authored 10 months ago by IgorA100 <[email protected]>

Code cleaned & added table header background

fc23cef16af47b182ca35165c1d18d471f4bebb6 authored 10 months ago by IgorA100 <[email protected]>

Merge branch 'master' of github.com:ZoneMinder/zoneminder

6ccf0c66a14517523659a9e8e0df3da3aa123fda authored 10 months ago by Isaac Connor <[email protected]>

hack to fix scroll bars in bootstrap table

2ba7369ea8d7f14249810de3e961a7711483ca8d authored 10 months ago by Isaac Connor <[email protected]>

Don't set snap score when skipping frames. Don't exit alarms when we havn't done motion detection. As a result, alarm_frame_count shouldn't cause immediate alarm anymore and because we aren't clearing prealarm frames, event recording should start

07153f6773dfd9cc15b63a69d697015dae3a42b5 authored 10 months ago by Isaac Connor <[email protected]>

Appease eslint

be202719c3eba355d5c0fb64bb90fbb1502e4501 authored 10 months ago by Isaac Connor <[email protected]>

Only put scrollbar on console contents if needed. Fixes double scroll bar when not sticky navbar

bc044f38d9e368cf12f8e390740675bd86ac5bb5 authored 10 months ago by Isaac Connor <[email protected]>

Fix form not scrolling entirely. Remove top padding. Remove right padding due to bootstrap row.

95d2e0a27cf54daf69ca2fec5530ced4edf154cd authored 10 months ago by Isaac Connor <[email protected]>

Temp fix to put scroll bars back

f926e982831556f2a84b821cf70d5dc8886978ad authored 10 months ago by Isaac Connor <[email protected]>

Put back scroll bars on console

855da2cbc47a748330151609ea784f1eba7aed5d authored 10 months ago by Isaac Connor <[email protected]>

Put back style permitting scrolling to work

657cda18ef4db8f5aaf3db78bc5a968f132646b0 authored 10 months ago by Isaac Connor <[email protected]>

Merge pull request #3862 from IgorA100/patch-17

Fix: video scaling on console

ae20617c53a427134a94e08f3074552fd17a58be authored 10 months ago by Isaac Connor <[email protected]>

Fix: video scaling on console

Close #3861

625e699e32eefe3eec55c7c7ebbd9ec30aa85ff3 authored 10 months ago by IgorA100 <[email protected]>

Merge branch 'master' of github.com:ZoneMinder/zoneminder

20e1ae209017dfc542b8092e13c3a11197c85a1d authored 10 months ago by Isaac Connor <[email protected]>

FIx arrap_map => array_map. Fixes #3859

3f9bda4f801fb82cf2a501a46b4ceb11f9983fb1 authored 10 months ago by Isaac Connor <[email protected]>

Fix eslint

3939bcec2267aebb10b212c710ef10912f9a75f3 authored 10 months ago by Isaac Connor <[email protected]>

FIx arrap_map to array_map. Don't assume _REQUEST[mids] exists. Fixes #3859

b647280766e4eecf731afdd7f2997586cda183e3 authored 10 months ago by Isaac Connor <[email protected]>

Merge pull request #3852 from IgorA100/patch-12

Fix style in options pages

76db26cec1f36abb072d5be5dd3b14918b33f8ee authored 10 months ago by Isaac Connor <[email protected]>

Removed erroneously added style for tag 'a'

28fd799bf680e27d0fe9cc3540b99534c69793a7 authored 10 months ago by IgorA100 <[email protected]>

Merge pull request #3856 from IgorA100/patch-14

Fix design when viewing list of events

4718bff514829c3d57716254e4eed962d966a74e authored 10 months ago by Isaac Connor <[email protected]>

Merge pull request #3857 from IgorA100/patch-15

Fix "overflow-y" for "#monitorList" in console

d815b772452a0bbaf1b2c6d1d390805cf0a7b802 authored 10 months ago by Isaac Connor <[email protected]>

Fix "overflow-y" for "#monitorList" in console

For "#monitorList" there is no need to set "overflow-y: scroll;"
Otherwise, scrolling will alwa...

e576e9b7562ad106a3ec04931168aaa1214f9440 authored 10 months ago by IgorA100 <[email protected]>

Fix layout

f27f9bdf95ec953ebadbfc0974ef0edf94a97f02 authored 10 months ago by IgorA100 <[email protected]>

Update events.css

ab556f313532cf1845fd48a9f46295ffeaeff9e6 authored 10 months ago by IgorA100 <[email protected]>

Fix design when viewing list of events

Layouts & space in code

4df177208c672d88ef5de2da8f6cf8c09c3c1f47 authored 10 months ago by IgorA100 <[email protected]>

Merge pull request #3855 from IgorA100/patch-13

Fix: More correct scaling (with padding) during live viewing

1f3f06636b64ef4c41ec835757dbcd0fbd2ae0c0 authored 10 months ago by Isaac Connor <[email protected]>

Fix: remove right padding as unnecessary

Slightly shifts the video at some screen and video aspect ratios

7e4cd163f510187c998efe062bf62943b3c35980 authored 10 months ago by IgorA100 <[email protected]>

Fix: More correct scaling (with padding) during live viewing

e90340dd2bd19d12090af067b6a9836f6eded2ef authored 10 months ago by IgorA100 <[email protected]>

Remove debug

f0088e49d7a5d3464c8fa9e50e65369ad4645cbb authored 10 months ago by Isaac Connor <[email protected]>

Add scaling to zms url

6124678fb8e821a614f81beae90900a5974aeda1 authored 10 months ago by Isaac Connor <[email protected]>

Remove use strict to appease eslint for now. Use a zms url instead of view=image

32dc9cff2f8210f05212815d7c85816d41553223 authored 10 months ago by Isaac Connor <[email protected]>

Fix eslint

ada974ef512ce6e2e3f2bd4bd7225d5144b18dfb authored 10 months ago by Isaac Connor <[email protected]>

Merge fixes in findEventByTime and fineFrameByTime with better debugging. Turn on use strict. Update when datetimepickers close instead of onchange

1278613832420908bda8d81f07cc9e57ef9a725e authored 10 months ago by Isaac Connor <[email protected]>

Fix layout

57c993507cbc24144054db3f7d6ace2db79a2db0 authored 10 months ago by IgorA100 <[email protected]>

Fix layout

7757eeae1a370a8753843eb8e07aa05b4bb24e7b authored 10 months ago by IgorA100 <[email protected]>

Fix space

151114f778d2748200bfb94c6799e26c227eb815 authored 10 months ago by IgorA100 <[email protected]>

Fix style

008c864751b6cd5461acac39868eb135b79f0403 authored 10 months ago by IgorA100 <[email protected]>

Merge branch 'ZoneMinder:master' into patch-12

714a0913e4e01bb837d4418e59254854637d7a85 authored 10 months ago by IgorA100 <[email protected]>

Fix: Button block location

There is no need

f94d26440756bfdbb3abff8ccb5dc186673ce170 authored 10 months ago by IgorA100 <[email protected]>

Fix Removing excess styles & specifying a minimum textarea height

c8c731519d7cc85ab58f5c995671407eb1df887f authored 10 months ago by IgorA100 <[email protected]>

Fix Removing excess styles & Aligning a form vertically

Additional modernization required

c69f6e8908a5f0653b1232d809ccc1d66e72a3ce authored 10 months ago by IgorA100 <[email protected]>

Fix Removing excess styles

696837e22f1388af1b8e39c35c044ddaa6840d15 authored 10 months ago by IgorA100 <[email protected]>

Fix layout

21cb1c8c2952ee0907b6adb98673439979f7014d authored 10 months ago by IgorA100 <[email protected]>

Only save permissions if passed in POST. We might not be able to see all monitors, so might not exist in POST.

55df0fd8f72d566c38e997f772a6d4df0149b773 authored 10 months ago by Isaac Connor <[email protected]>

Fix set chosen width for modal window

For the modal window, set the width chosen to 100%

a4ed614763bcc85f7985bd66076a3848b8a032bb authored 10 months ago by IgorA100 <[email protected]>

Don't treat stream already exists as an error.

2981966b1c1e2da9979e3743a10f627f4c1a1397 authored 10 months ago by Isaac Connor <[email protected]>

Use per-monitor permission on save button

c078cf7bba08ae407808ffb2695f68c83d91ea9a authored 10 months ago by Isaac Connor <[email protected]>

Fix invalid canEditMonitor call, simplify login in canView and canEdit to prefer per-monitor permissions

b5e1d5e611a76e8c06f0e1a8fbe1c15ffad0288d authored 10 months ago by Isaac Connor <[email protected]>

Use per-monitor permissions

b4bbff6353c4a7e7a06c7ad78941805930742e00 authored 10 months ago by Isaac Connor <[email protected]>

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.

5120baa9ee74a6c1fa4871b21d902067ff43883b authored 10 months ago by Isaac Connor <[email protected]>

Merge branch 'master' of github.com:ZoneMinder/zoneminder

302f3ad96d49633fda75274416d475b1414aff36 authored 10 months ago by Isaac Connor <[email protected]>

Remove unused linked monitor array population. All is done in javascript now

beda6cd66d2ad57720f53b4f1365ba2fd159861d authored 10 months ago by Isaac Connor <[email protected]>

Use monitor->canEdit when making source link clickable because it is per-monitor instead of User['Monitors']

5de9e7800c36f105736f9e4903fac0467e1cc830 authored 10 months ago by Isaac Connor <[email protected]>

Fix Linked monitor expression not updating

4ab1aaa1d0af00fa27a60414b89577bbffe1ce85 authored 10 months ago by Isaac Connor <[email protected]>

Merge pull request #3853 from Simpler1/master

Lint fixes

b95cf3c9fe56df3e2a6bdf7580c5468a1b01febe authored 10 months ago by Isaac Connor <[email protected]>

Don't allow linking to ourselves

ed14fc7449be871227aa90f61596029ffb876480 authored 10 months ago by Isaac Connor <[email protected]>

Add mid to available globals

5c360c2a91e616eb4db7b7e81e44eb5ba30aaa0f authored 10 months ago by Isaac Connor <[email protected]>

Lint fixes

9eee9fcb1ed98db1b02a2b30b8f4cbef7b159c44 authored 10 months ago by Simpler1 <[email protected]>

Adaptation of Chosen to Bootstrap (Height alignment)

634bffea804ee6c5743032e80cecdd2661c58742 authored 10 months ago by IgorA100 <[email protected]>

Fix: Order of loading css files

Initially, you need to load third-party styles and only then load your own styles.
This way we ...

74a43745d3392629b108ad5010bfab2256b0d069 authored 10 months ago by IgorA100 <[email protected]>

Fix Entrust management of enabling search in select to the Chosen plugin

8f521a7221c055aac1f06fd1d6aa94667c28d016 authored 10 months ago by IgorA100 <[email protected]>

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 wil...

610109d5691992f77034c8dabe8be54f39d2d7d7 authored 10 months ago by IgorA100 <[email protected]>

Limit score to 255

3bab238ee4fc4a32c23998715dfb3944cee8566f authored 10 months ago by Isaac Connor <[email protected]>

Merge branch 'master' of github.com:ZoneMinder/zoneminder

260c49ba5d55420b6c69cd213c453068f820f21e authored 10 months ago by Isaac Connor <[email protected]>

Remove refs to event from Info because there might not be an event. Fix crash.

fb37cd3c3046dd725db61e25b546e35c727d8492 authored 10 months ago by Isaac Connor <[email protected]>

Merge pull request #3850 from IgorA100/patch-10

Added button for editing the monitor during live viewing.

bc16f526ac2a58e3923ce27f4cda8ba74e5cf86a authored 10 months ago by Isaac Connor <[email protected]>

Merge pull request #3851 from IgorA100/patch-11

Fix Handling a button click

efaffa31565b423c87d12be63b8acf0fa8065079 authored 10 months ago by Isaac Connor <[email protected]>

Update skin.css

8902f902ea23911684023443d85e67014eafb486 authored 10 months ago by IgorA100 <[email protected]>

Update skin.css

1f6279a00f3f6f25f22d69cf9e9cff7a99479793 authored 10 months ago by IgorA100 <[email protected]>

Fix cursor for <a>

b07ae01e89a2d70b4cc5fb1ba08211d499d94efc authored 10 months ago by IgorA100 <[email protected]>

Fix Handling a button click

For some reason, an old, faulty code was sent..

7482d28af839028af28fad31f66df9cd00ca419d authored 10 months ago by IgorA100 <[email protected]>

Handling button click

7920f17c8a7e08fbf6eb920e8af7755a4c8f1597 authored 10 months ago by IgorA100 <[email protected]>