Commit Graph

9795 Commits (2e10169cde0af9b8a7254ee20a895e3524f18191)

Author SHA1 Message Date
Isaac Connor 2e10169cde Deprecate cURL monitor type 2023-09-21 12:08:27 -04:00
Isaac Connor 057159cde6 Make properties public so that they can be access in Storage object 2023-09-21 10:10:57 -04:00
Isaac Connor 2e17d2e8a4 Add Notes filter 2023-09-20 13:35:30 -04:00
Isaac Connor 4410757037 Fix use of RETURNING Id which isn't supported in all mysql. Use dbInsertId instead. 2023-09-15 11:26:15 -04:00
Isaac Connor ee379cb4e4 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-09-15 10:15:58 -04:00
Isaac Connor f8c89a0405
Merge branch 'master' into tags 2023-09-14 16:42:06 -04:00
Isaac Connor b68ed6c135 Use UpdatedOn field of Monitor_Status to determine if info there is stale. Show offline if Monitor_Status hasn't been updated in over a minute. 2023-09-14 10:25:36 -04:00
Charlie Root 41dc7c8f4e Fixes to not log errors when there are no monitors to display in watch. 2023-09-13 11:19:16 -07:00
Charlie Root e11b700fbd Add Id as a protected member, only lookup monitor status if Id has a value 2023-09-13 11:18:50 -07:00
Charlie Root 6754fcb208 Make Filter properties protected 2023-09-13 11:18:28 -07:00
Charlie Root 1c3206b781 Merge branch 'master' into openbsd 2023-09-13 10:15:06 -07:00
Charlie Root fccebee056 Add -a to arp, add ZM_PATH_OUI for path to ieee-oui.txt 2023-09-13 10:14:49 -07:00
Charlie Root c4302c27ac Add code to test for existence of ip and support ifconfig 2023-09-13 10:14:21 -07:00
Isaac Connor a58949ab32 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-09-13 13:10:37 -04:00
Isaac Connor d9bf168066 Merge ../ZoneMinder.connortechnology 2023-09-13 13:10:14 -04:00
Isaac Connor c6a7fe949a Use different syntax for property access 2023-09-13 13:10:01 -04:00
Isaac Connor d7090ce84a Define properties 2023-09-13 13:08:12 -04:00
Isaac Connor 3767d815a5 Use different syntax for assigning object properties 2023-09-13 13:05:57 -04:00
Isaac Connor ef402e7b99 Define tablename member 2023-09-13 13:05:39 -04:00
Isaac Connor 46ac2dba2f Define tablename member 2023-09-13 13:05:25 -04:00
Isaac Connor 6a87f56ac2 Never display errors 2023-09-13 13:04:16 -04:00
Isaac Connor de8f387207 Restrict mid to a cardinal value. Fixes GHSA-9cmr-7437-v9fj 2023-09-13 10:12:04 -04:00
Isaac Connor e353523073 Fix int()=>(int) causing events to not load 2023-09-12 09:07:46 -04:00
Charlie Root da213d8532 Merge branch 'master' into openbsd 2023-09-11 13:42:43 -07:00
Charlie Root 50059e5842 Only show ram info if proc exists. 2023-09-11 13:42:22 -07:00
Isaac Connor b7ed7a4bd8 in detaintPath also strip :// because php:// is a way to inject code 2023-09-11 12:34:31 -04:00
Isaac Connor a194fe81d3 Only allow Events Columns for sort. Fixes GHSA-2qp3-fwpv-mc96. Fixes GHSA-9cmr-7437-v9fj 2023-09-11 11:29:54 -04:00
Isaac Connor a13c9c06f2 Handle when filter limit is '0' 2023-09-09 12:38:47 -04:00
Isaac Connor b1cdf9905c Make notes clickable to bring up objdetect image like in events list 2023-09-09 12:37:27 -04:00
Isaac Connor e53974119b Ensure that group_id is defined 2023-09-09 12:08:44 -04:00
Isaac Connor b44216d3da Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-09-08 14:19:09 -04:00
Isaac Connor a9997b943a Use new event::find_virtual_frame when loading frames 2023-09-08 14:19:01 -04:00
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 2b2c43e630
Merge pull request #3748 from Simpler1/patch-6
Refresh table on show
2023-09-05 13:05:36 -04: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
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 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 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 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