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

Uses the master Janus secret as the mountpoint secret, detects and restarts mounts if PIN is stale

9cb21dce22051ae46dbc51ef58b710e4be399548 authored over 2 years ago

Add IDLE to the states where we will close the event at section length end time.

e91b11d1db09228a05a338ec2ab2da23dd44efa8 authored over 2 years ago

Fix scroll to top on option help modals by not having an href=#. Fix css so that the ? still is blue.

0b37df3782285124b0f1b5ed899404ee5893a91f authored over 2 years ago

Try out just using connkey as the semaphore key instead of ftok

63e4c81d9cda737a7df426a3b4529b78b3de4643 authored over 2 years ago

convert event->Id() explicitly to a string for strpos.

8a6db4a5e7e64055bf0adec98c632dd16c03eb31 authored over 2 years ago

Add connkey and semaphore key to logging about failure to get semaphore. Add sem_release before every ajaxError call because ajaxError exits and so we never release the semaphore.

faa6b8c9e73d2ac6c88bb050fea7cdf891fca19a authored over 2 years ago

Switch to utf8mb4 to support 4 byte unicode which is available since mysql 5.5

a16e7aad62116a0b4909079b255af52ee062438d authored over 2 years ago

Merge ../ZoneMinder.connortechnology

ef0ad5a17b13470104f2ce8fff92c637d4d6cc15 authored over 2 years ago

streamSrc is no longer used and is making php complain

cb6dd816d847009ca2f46284125de7de0b2f7f9f authored over 2 years ago

Add types to buttons. Make save a submit button, and remove the javascript onclick event.

5fef98ce6fe323479b7d960254e42f2751143f4c authored over 2 years ago

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

9338732bd33c09b56742a12aed7a8a3fb818e5c7 authored over 2 years ago

More properly fix the alarm status api changing. The previous hack broken doing alarm on/off.

363c589975cdaf4afe3c9d6bd703648db02dabb9 authored over 2 years ago

Fix log causing idle events to not be closed when close_mode=ALARM.

97a791656e866e8a9c5cded92a8491e1cb0886c6 authored over 2 years ago

Last and next buttons don't get disabled if the event record thinks it has more frames than are actually in the db.

f68c64ea301ff20871cb8fefcb28d0de9226d7d8 authored over 2 years ago

Add a.btn-primary.disabled to disabled buttons style so that frame view buttons look right

6d1b341141c0c905beb527706755c2c5a1f748a8 authored over 2 years ago

When scaling frame images, apparently a float value for height is no good. So use intval to fix.

1072a8aa69ab62f24ae8acd02037e80a619216e3 authored over 2 years ago

Fix typo causing broken link to monitor in event stats

78ab6583e75854178189b5a974a1b81424b90a7f authored over 2 years ago

put back code to close an event when idle, at section_length when using CLOSE_MODE==idle

895adcb4c4da09b4798330a95e3b3e39c42ddcba authored over 2 years ago

fix monitorIds => MonitorIds

9d6d5a242f5bd37b2b8b13cf28e407345e9ad51c authored over 2 years ago

Update frame view js to use const etc instead of var. Put back EventId and FrameId in stats being links and fix FrameId not being populated. If no stats available disable the stats button and use the title to explain why.

86f27d2ac55f1fbe430ba768ece8ab79c85a898b authored over 2 years ago

Add spans and titles over the title h2 parts so that on mouseover it tells you what they are

291c43ec0fc5ec6642d049291f7a4312dc836d00 authored over 2 years ago

In failure state populate imageData array to reduce output php errors

c3c897cd76ffc01210e3563be1d38102ed98f2ee authored over 2 years ago

Merge pull request #3598 from megasaturnv/3516-CaseInsensitiveLogin

Case insensitive login - Fix spacing ZoneMinder/zoneminder#3516

6e55ae4f7ddf45e1b4ff98eac2024bc21181f507 authored over 2 years ago

Case insensitive login - Fix spacing ZoneMinder/zoneminder#3516

8fb6477820d0ba4d568469b05080ae03c9deb580 authored over 2 years ago

Merge pull request #3597 from sashashura/patch-1

GitHub Workflows security hardening

4138aa950bc27c1e8bc4ef594e1b3c48ba85acd7 authored over 2 years ago

Remove swp file

aacb269dd88ca403d715266501e460b828e3037e authored over 2 years ago

Merge ../ZoneMinder.connortechnology

7ea47de9b52ac99974301f4844d9ece1176d9d7d authored over 2 years ago

build: harden create-packages.yml permissions

Signed-off-by: Alex <[email protected]>

6b0985a690fce1496699b2c321bde92f9763f451 authored over 2 years ago

build: harden release-packages.yml permissions

Signed-off-by: Alex <[email protected]>

851465826246b4fd869253e34338780980be33d4 authored over 2 years ago

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

58e22e3e1dedf017dc9b6580d2fc9d10ba7e294c authored over 2 years ago

Update API entries replacing Function concept

7f38ec19990ed76e629f6780deb7db240b846d9a authored over 2 years ago

New image of monitor add view

4907a706a7924d77d407257f68da81b64c14bbf9 authored over 2 years ago

Add a note about setting the Id monitor field

a6e6b5015d1423047f21570070034bead1d2fc73 authored over 2 years ago

Update defining monitors section of docs to reflect the current state.

4f76b36a75f50a78b61200bc5f84b387fed756a7 authored over 2 years ago

Update the requirements for monitor Name. Whitespace is allowed!

c6cdf070af7ec06d4163fefd999a74993edde336 authored over 2 years ago

Bump version to 1.37.23

b24fab24630e3a7edead4356f170c72ffb8f379a authored over 2 years ago

Set the rtsp version so that the mandatory s field in the SDP is filled

dfbd9f4ed45b8049b73c7597b2dab69fb25cf31b authored over 2 years ago

Merge branch 'master' into add_janus_rtsp_user

abc5ea26d8fbc7c02c2f356fa2d5b81a272106b5 authored over 2 years ago

Use empty() instead of length() which is faster. Add rtsp path to debug

bdf5b5d20233eac34738148108773bdc09b10e37 authored over 2 years ago

Don't encode the user/pass. If they were properly entered in the web ui then we will double encode them.

dd82a0129132abab6b601652a97ddc2d63dffa65 authored over 2 years ago

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

11d6911ad462845dda9fb21293c1807e57bd165d authored over 2 years ago

Fix bad merge reverts. Put back code that take username and password from fields in monitor instead of parsing from rtsp path

67a7c0721a026bd850e0df1704d53e0f752f691e authored over 2 years ago

Merge pull request #3591 from VikingGer/patch-4

Update MonitorLinkExpression.js

a36a28d4b577f03e11a672ec17a289261fb056b4 authored over 2 years ago

Merge pull request #3592 from VikingGer/patch-5

Update event.js

ec169379399fc7a5813223f935b773127dd93f3e authored over 2 years ago

Merge pull request #3593 from VikingGer/patch-6

Update report.php

3843b9e14f983978b231190353a3ef44014e9018 authored over 2 years ago

Merge pull request #3594 from VikingGer/patch-7

Update reports.js

d1edd8fd1fdfcd421565dfe1b904eecdb3334502 authored over 2 years ago

Update reports.js

Function name missing? Assumed to be correct according to the rest.

ac55a9e0f2c58cbaf7afa9a515b23955a5508292 authored over 2 years ago

Update report.php

Again Eslint errors

a099a4e3aeab638ecddb6eaf66f1d0b0fb54dd96 authored over 2 years ago

Update event.js

Again Eslint errors

851ddb7f0633fe184210f77cdbe51e9ac51ff14d authored over 2 years ago

Update MonitorLinkExpression.js

Trailing spaces lead to eslint error. Removed them

11a47350822abfd4627ce51206038c0851f0517b authored over 2 years ago

Merge branch 'master' into add_janus_rtsp_user

7d9771e41c85538571501374b746b62d0ef3f692 authored over 2 years ago

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

adbf25e9b7e1f29c7f751e2f405e05c74d7ce502 authored over 2 years ago

remove blank line

ad1a504d531721620831383c3f23813be1279cb6 authored over 2 years ago

Add libio-interface-perl to dependencies. Fixes #3577

7da1da1e273230f8a3bbf5169bf73fe9d1435257 authored over 2 years ago

Merge pull request #3588 from VikingGer/patch-1

Update control_functions.php

e51ffb1721d9bedd1d680ea5440b72eab4151a4b authored over 2 years ago

Merge pull request #3589 from VikingGer/patch-2

Instar control for 720p CGI devices

5f308ed795fdacd45999003640f1ff26298b099a authored over 2 years ago

Instar control for 720p CGI devices

Onvif just yielded the absolute basic functions, but especially no presets. This control fills t...

e1a2061ba24e9d8bae0f61cb190693825a98e659 authored over 2 years ago

Update control_functions.php

The Reboot button was not shown without activating another one. Probably not intended so I did...

c43b3d1aefb64b0795d87b7e3407976581947ece authored over 2 years ago

Add an id=content div for styling purposese

d1295a141f3545bbd2cbff46510096ef64433029 authored over 2 years ago

Add an id=content div for styling purposese

e79fde59b4dc18b4100025dc275de4ed76972cdd authored over 2 years ago

Remove dark styles from navbar

1213de7791dffd9e693881c088e5af6839f5bc6b authored over 2 years ago

add IIOT styles

e36da468de774712043a8bba359ebc98f3987a42 authored over 2 years ago

Fix contents of values on LOCALE_DEFAULT.

c197644b961ae555d433b13c09169f99cfc8553c authored over 2 years ago

Only try to set TIMEZONE when loading dateTimeFormatter if it is set. Handle the exception when any of TIMEZONE or LOCALE are invalid.

62b6171934bd023a1270cd6160c2f0921d8aad56 authored over 2 years ago

Specify that only main page content tables should have the first colunm be min-width: 300px. This was affecting the logout dialog table content.

bf2b6ca145c78993ba55f20d953b4d47fe6d4042 authored over 2 years ago

Add a check for auth timeout and re-adding with a new auth token.

b7143a3c84eb7eeea80b0419ad882006da9e2da2 authored over 2 years ago

Merge branch 'master' into add_janus_rtsp_user

d1cd7d3f91e73f80a9b0cc15050a7fca9afe497a authored over 2 years ago

When we increment past the event, fix the curr_frame_id so we reference the last image.

319904ab8012e3563b043cd33c1cd1dcda7aa0c9 authored over 2 years ago

Fix no video due to height:auto on videojs

a944a1fac70a091591a9bdb4488a7f29354234db authored over 2 years ago

Remove debugging

bc566ccfdfd650f67fd7d475b60a2e7d29948590 authored over 2 years ago

Add fade to the logout modal which for some reason fixes it not showing after a hide

46de7afb0f235cd113e5611d249ddc4ddfd7ebe1 authored over 2 years ago

Spacing, ignore auth_relay, clean up clickLogout a bit

715122e93a971a178192df804f0b93db3b884bc1 authored over 2 years ago

Merge branch 'iiot' of github.com:ZoneMinder/zoneminder into iiot

62cf4547dc33f5813c7ee568ba456f2dc98ef685 authored over 2 years ago

Merge branch 'iiot'

419a44f8edf2effaefd0638d7b621d576dffe253 authored over 2 years ago

shared data is frequently not valid or zmc not running. These shouldn't be errors as they generated too much noise. We can generate errors higher up.

6936a3547c023b6bb2b6ffdb00d95d9e3238d28c authored over 2 years ago

Failure to auth by hash is common, the end result is a redirect to login page. Change the log level to INF

b4fc5abe9561afbe22f18b8f75f8c8180932b6c8 authored over 2 years ago

Show time segments in progress bar. Fix alarm cues.

4624a53a90944f55ea93775a126c01d1406e2668 authored over 2 years ago

Merge branch 'master' into add_janus_rtsp_user

deb35738dbf8fcd7f0f0902392f9dbbe747a7a82 authored over 2 years ago

rework event stream. Fixes seeking. Fixes event not completing due to not have Frame records for every frame. Adds send_twice to deal with browsers not showing the last sent image. Use locking around anything to do with curr_frame_id as commandQueue is it's own thread now.

4668ffcaa9870c773341eae3691f62dbe9d7f181 authored over 2 years ago

Implement a mutex/locks around changing event data, curr_frame_id, etc. also contains a fix for seeking due to > instead of <. In general fixes seeking

8549cdf317635f0b14b89a89db18fecbdc1f7e82 authored over 2 years ago

don't let position go negative in onclick progressbar

ea1970418eb622b2a0da96815bd04d3351ee2866 authored over 2 years ago

shorten and move up the indicator

f3e04ca212832d0c88e4de6dd9ebd86e69a75e00 authored over 2 years ago

clean up, give generation options even if viewing. Fix viewing. Add transform option.

60d01376c593fe28d372f966bad306fec43de2a2 authored over 2 years ago

remove extra spacing, move dropdown option own to where they are used

1fe3d52c962f7e3423c736d3ab90f3a2c9cac44e authored over 2 years ago

Make monitor rows in event stats a link if user can view monitors. Include path to event.

e088e88e13bb707779d23cf4e8b715a386fea173 authored over 2 years ago

include video.js for video view as well as event

fdbe950640d6e0169b53cfbf02873983efcc01fd authored over 2 years ago

setup video.js on the video tag if it exists

d3e3807263d60925f53b9a4812c075faeaa10ce9 authored over 2 years ago

Allow viewing a specific video file instead of DefaultVideo

c22007e8ee17decf2f385180c27f49cbdeed4e14 authored over 2 years ago

Fix saving monitor due to MQTT being empty

813434e0f44b5eaf667832f4beb0028b5214f18a authored over 2 years ago

Center video obj

867660942583b6a2436d86c470316be4d44f2615 authored over 2 years ago

Renamed ZM_AUTH_CASE_INSENSITIVE_USERNAMES to ZM_CASE_INSENSITIVE_USERNAMES as name was too long ZoneMinder/zoneminder#3516

c90e2f78982ae17e35e2897fa93d29fd80c79571 authored over 2 years ago

Add transform support and use Event::createVideo

37dac7d3a6ee05f5bcb0e6c7aeb4bacd9ecc9e6e authored over 2 years ago

For mp4, use video tag, with videojs instead of embed

dbcf32080841b91a4f36ce6db7a8a7dd816c30dd authored over 2 years ago

Move createVideo from functions to Event

4d2f9568270b7dabb119c947fe0fe7b1fcd0b239 authored over 2 years ago

Slightly smarted UriEncode, which doens't include numbers and a few other valid characters. Needs more work and tests.

f431ab9e45d2e469ae0d88a179bc0ff2d5372698 authored over 2 years ago

format filesize into human_readable in generate video view

f9fddcb6ee1dbd81cb0d12a37f2b727d68594431 authored over 2 years ago

Moved case-insensitive username checks to SQL

8fc60fef1256863eca93ecdeac107251caf6ab31 authored over 2 years ago

Convert password fields to hidden fields on submit so that browser doesn't offer to remember passwords

6452f8127a2b4431fd8d78bfae2dd23236bbd5b6 authored over 2 years ago

Fix typo

143a00cccc1ae9605f9f122d1edfbb7b8b1b94ae authored over 2 years ago

Use y instead of Y for path generation when using Deep scheme. Fixes #3583

ce4dd065ff0d5930bdd5d15911ed9ee710907349 authored over 2 years ago