Commit Graph

22837 Commits (63bf00c0650fe0be507881686248e2ac50d7765f)

Author SHA1 Message Date
Isaac Connor cb5442d5b8 Add 704x576 aspect ratio to timeline css 2023-09-08 14:18:34 -04:00
Isaac Connor 82e972943e Add frame loading including virtual frames 2023-09-08 14:18:11 -04:00
Isaac Connor 473d34e220 Update events frameimage status code to use Event object. Make not finding the frame a debug because of bulk frames. 2023-09-08 14:17:36 -04:00
Isaac Connor 1f4ed44371 Fix infinite loop looking for keyframe interval 2023-09-08 14:16:31 -04:00
Isaac Connor 2b2c43e630
Merge pull request #3748 from Simpler1/patch-6
Refresh table on show
2023-09-05 13:05:36 -04:00
Isaac Connor cd73060236
Merge pull request #3763 from ZoneMinder/dependabot/github_actions/actions/checkout-4
Bump actions/checkout from 3 to 4
2023-09-05 13:04:20 -04:00
Isaac Connor 1ea56ab70e
Merge pull request #110 from connortechnology/dependabot/github_actions/actions/checkout-4
Bump actions/checkout from 3 to 4
2023-09-05 13:03:26 -04:00
dependabot[bot] d8303f2168
Bump actions/checkout from 3 to 4
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-09-04 18:32:06 +00:00
dependabot[bot] 1438c025b9
Bump actions/checkout from 3 to 4
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-09-04 17:11:40 +00:00
Simpler1 18d74ed7ac (feat): Tags
fix(tag): Create tags on mobile

chore(tags): Change TagName to Name

chore(tags): eslint

chore(tags): dbFetchAll to dbQuery for removetag

chore(events): eslint (attempt 2)

feat(tags): Better handling of keyboard

fix(tags): Enter key for creating new tag

fix(tags): Don't allow space as a tag name

feat(tags): Delete tag if last assignment removed

fix(tags): Increase height of dropdown

in progress

fix(Tags): Use T.Id on the events page dropdown

fix(Tags): Remove $availableTags from events.php

chore(sql): Formatting sql statements

feat(Tags): Working OR on filters and events pages

fix(filter): Populate availableTags

chore(Tags): code formatting

fix(tag): Add tag on create tag

Fix(tags): Remove tag from available if last

feat(tags): Add zm_update.sql

fix(chosen): Undo css width

fix(chosen): tags dropdown width

fix(tags): dropdown over timeline

fix(tags): Full width input

fix(events): Refresh table on page show

chore(filter): Clean up availableTags

chore(event): Clean up available & selected Tags

fix(event): Update available tags on remove

fix(event): Remove hack for selected tags

feat(tags): Blur input after adding tag

doc(tags): Initial tags documentation

fix(tags): Dark theme dropdown

fix(tags): Dark theme for tags on input

fix(tags): Dark theme for highlight in dropdown

fix(tags): Populate filter tags droplist

chore(): Bump zm_update to 1.37.42

chore(tags): Move mobile check to skin.js

chore(tags): Comment debug statements

fix(tags): Enter key to create tag on mobile Chome

chore(tags): Space in 'All Tags' for translation

Temporary commit to handle cookie expiration times

chore(tags): Remove unnecessary Tag(s) from en_gb

chore(): Cleanup unnecessary Error and Debug

chore(): Resolve merge conflicts

chore(): Address merge conflicts with master
2023-08-31 15:50:08 -04:00
Isaac Connor e5d125c4ef Handle when no linefeed found 2023-08-31 12:46:12 -04:00
Isaac Connor 56999da3eb Check for existence of path before scanning it generating a lot of erros 2023-08-30 14:38:43 -04:00
Isaac Connor 6331d79a73 Add visibility toggle for password inputs on user edit 2023-08-28 16:39:23 -04:00
Isaac Connor df411c3fe3
Merge pull request #3760 from criadoperez/fix/texts
Text corrections
2023-08-27 13:17:08 -04:00
Alejandro Criado-Pérez 6fd119157a
Text corrections 2023-08-27 02:00:59 +02:00
Isaac Connor cf713b59d7 Add 500 and 1000 as pagination options 2023-08-25 19:02:17 -04:00
Isaac Connor 79b755047a Add db update to correct column type of Longitude in Events and Servers table 2023-08-25 12:49:14 -04:00
Isaac Connor 194c5a0628 Add another Annke Hikvision mac address 2023-08-25 10:54:44 -04:00
Isaac Connor 9132f8947d If scale is 0 or negative, then start with scale=100 2023-08-23 16:32:39 -04:00
Isaac Connor 76d5646cbf Fix scaling being constantly set to 0 and hence logging a bogus value for scale 2023-08-23 16:32:13 -04:00
Isaac Connor 1dba6115b1 Fix eslint 2023-08-23 11:44:16 -04:00
Isaac Connor 5953b88085 Count keyframes on queuePacket so that analysis Ready() will start when out of order packets are present 2023-08-23 11:41:54 -04:00
Isaac Connor f5380f1423 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-08-22 12:38:28 -04:00
Isaac Connor 1e423c151d Stop infinite recursion when fail to load logout modal. 2023-08-22 12:20:11 -04:00
Isaac Connor 67e2c80851 Check for existence of modal before including it. 2023-08-22 12:19:48 -04:00
Isaac Connor 26948b9387
Merge pull request #3756 from criadoperez/fix/branch1
Some text corrections
2023-08-19 09:09:18 -04:00
Alejandro Criado-Pérez 6d1d08ce27
texts corrections on distros 2023-08-19 12:51:05 +02:00
Alejandro Criado-Pérez ac86c31d01
cmakecacheimport parameters 2023-08-19 12:41:07 +02:00
Alejandro Criado-Pérez 2e21c747d4
cmake corrections 2023-08-19 12:39:32 +02:00
Isaac Connor 491b48f9f9 Only allow execute if you have EditEvents permission 2023-08-18 16:58:29 -04:00
Isaac Connor 9371c2775d Use canEdit and canDelete to allow users without canEditEvents to create filters that don't act on events, only list them. 2023-08-18 16:57:51 -04:00
Isaac Connor 94ea51489b Add canDelete and canEdit functions to Filter 2023-08-18 16:57:08 -04:00
Isaac Connor ea581e521f Add default value for order 2023-08-18 16:56:50 -04:00
Isaac Connor 61d0cec1fa Debug the result of the auth header split, not the same line over and over 2023-08-18 16:56:37 -04:00
Isaac Connor 084fc8b651 Put users table in an options div, which has overflow-y: auto applied to it. Move buttons to top so they don't scroll 2023-08-18 12:12:30 -04:00
Isaac Connor 8748d6a1cc Handle unset _SESSION['remoteAddr'] 2023-08-16 15:23:34 -04:00
Isaac Connor 91b4e299b9 Demote failed login to Warn instead of Error 2023-08-16 10:37:06 -04:00
Isaac Connor e163509d57 auto_reconnect id deprecated. 2023-08-16 09:53:07 -04:00
Isaac Connor bdc8452891 Add a button to toggle ptz controls. Put ptz controls into a right hand sidebar. 2023-08-15 17:58:55 -04:00
Isaac Connor 5b7defb57b Remove warnings about ControlDevice, because that is now channel. Detect duration not being in microseconds and adjust. 2023-08-15 14:02:12 -04:00
Isaac Connor d31f918abc Change the api for frameimage status request to split id into eid and fid instead of having id as an array. 2023-08-15 09:15:24 -04:00
Isaac Connor 9a229a78a5 Fix missing mac key on cameras array 2023-08-14 13:30:24 -04:00
Isaac Connor 9beacfa392 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-08-14 12:57:02 -04:00
Isaac Connor 9034bdffee Add checking of keyframeinterval to Ready() 2023-08-14 12:56:48 -04:00
Isaac Connor c2e00b8789
Merge pull request #3754 from joeknoll/master
Fix usage of unset variable
2023-08-13 21:16:52 -04:00
Joe 87f09d3b7e Fix usage of unset variable
If daemon or args are unset the preg_replace is never called which can
result in count not having a value when referenced in the if statement.
This generates a warning in error.log.
2023-08-13 17:56:55 -07:00
Isaac Connor 07e60d924d
Merge pull request #3752 from criadoperez/fix/eslint
Fixed eslint checks
2023-08-13 13:26:03 -04:00
Isaac Connor a40b3351ba
Merge pull request #3753 from criadoperez/fix/criadoperez4
Onvif typos
2023-08-13 13:24:44 -04:00
Alejandro Criado-Pérez 8e17d9075b
Onvif corrections 2023-08-13 18:57:36 +02:00
Alejandro Criado-Pérez a93b67c9d8
Fixed eslint checks 2023-08-13 16:47:04 +02:00