162b1a7c1d
Log an error when we don't have permission to load the preset edit modal
2024-03-23 13:38:26 -04: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
3d008263e4
fix(tags): Tags were not populated on watch view
2024-03-02 11:30:35 -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
4107058000
FIx units on warning about timeout
2024-02-05 18:42:05 -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
b5757a2d05
Use validCardinal on Id's cuz we don't trust the db or Object
2024-01-25 18:38:44 -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
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
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
839ef9ce67
Add a Component filter to logs
2024-01-16 16:35:52 -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
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
44a3a7a6a8
Fix loading event due to missing GROUP BY. Fixes event video generation.
2023-12-01 12:46:05 -05:00
23a0e561eb
Remove depth of nested if's by returning early.
2023-11-21 10:49:09 -05:00
9a271e8960
Add are you still watching modal
2023-11-20 14:23:57 -05:00
8e0793f5e7
Do not format StartDateTime and EndDateTime in ajax events results. Do the formatting in js.
2023-11-16 10:34:43 -05:00
abb4230f86
Use ajax error when specified storage not found.
2023-11-13 11:37:47 -05:00
50ece0ae57
Turn off debugging of status ajax results. Can be a lot of info and can be gotten from browser dev tools
2023-10-26 09:25:45 -04:00
f4d69d524a
Undo the extreme splitting up of the SQL so that it is a little less multiple-liney. Hopefully may fix the lack of white space issue reported in forums.
2023-10-25 09:40:14 -04:00
48b5960fac
Can't copy by ref, the limit will affect unfiltered as well
2023-10-17 14:57:57 -04:00
c06f32fd67
Only load event OBject and test post_sql_conditions if the filter has any. Save a little processing. Copy unfiltered rows by reference.
2023-10-16 12:04:14 -04:00
9ff31ab4f5
Only print logged in user name if we are actually logged in, in order to avoid errors in logs
2023-10-05 17:03:42 -04:00
44c5c3c70c
Introduce new download mode that concats event videos into 1 file per monitor
2023-10-04 12:04:11 -04:00
5a7bd74521
Remove commented out code
2023-09-28 12:59:51 -04:00
51500d494f
Add group by when doing advnaced search
2023-09-26 15:15:47 -04:00
1fdf7f2b31
Remove debug
2023-09-25 16:32:01 -04:00
4410757037
Fix use of RETURNING Id which isn't supported in all mysql. Use dbInsertId instead.
2023-09-15 11:26:15 -04:00
f8c89a0405
Merge branch 'master' into tags
2023-09-14 16:42:06 -04:00
de8f387207
Restrict mid to a cardinal value. Fixes GHSA-9cmr-7437-v9fj
2023-09-13 10:12:04 -04:00
e353523073
Fix int()=>(int) causing events to not load
2023-09-12 09:07:46 -04:00
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
a13c9c06f2
Handle when filter limit is '0'
2023-09-09 12:38:47 -04:00
b44216d3da
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-09-08 14:19:09 -04:00
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
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
6fd119157a
Text corrections
2023-08-27 02:00:59 +02:00
67e2c80851
Check for existence of modal before including it.
2023-08-22 12:19:48 -04:00
ea581e521f
Add default value for order
2023-08-18 16:56:50 -04:00
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
042edd25e5
Add classes to tr so they can be styled
2023-08-08 09:54:47 -04:00
5c9588c012
Adds RTSP2Web support for live view
2023-07-29 23:46:31 -05:00
03155da5b6
Use the full integer value instead of the first char of mi. Fixes failure to get status on janus viewing pages
2023-07-25 15:18:35 -04:00
cae8fda326
Remove debug
2023-07-15 10:29:38 -04:00
59ff7f3a31
Improve logged wrt insufficient permissions
2023-06-08 09:17:16 -04:00
Isaac Connor
Simpler1
Isaac Connor
Simpler1
Alejandro Criado-Pérez
Jonathan Bennett