Isaac Connor
|
582f594b0f
|
Merge branch 'IgorA100-patch-6'
|
2024-05-15 11:46:26 -04:00 |
|
Isaac Connor
|
a64115fe21
|
Add popup with confirm and chunked unarchiving.
|
2024-05-10 13:03:08 -04:00 |
IgorA100
|
3648bfd56f
|
Merge branch 'ZoneMinder:master' into patch-6
|
2024-05-08 01:15:45 +03:00 |
Simpler1
|
b166fdb840
|
fix(): Comment debug statement
|
2024-04-10 15:21:59 -04:00 |
|
Simpler1
|
ebf1e8b1cc
|
Fix(filter): Set tags operator to = instead of LIKE
|
2024-04-10 15:14:36 -04:00 |
|
IgorA100
|
c046c2ddc5
|
Merge branch 'ZoneMinder:master' into patch-6
|
2024-04-09 14:40:38 +03:00 |
|
IgorA100
|
1b9dc86869
|
% in frame statistics should be rounded to a decimal place.
When setting up analysis of small objects, it is useful to know the % value more precisely
|
2024-04-07 22:59:01 +03:00 |
|
IgorA100
|
c77078d098
|
Merge branch 'ZoneMinder:master' into patch-6
|
2024-03-28 23:31:53 +03:00 |
|
Isaac Connor
|
162b1a7c1d
|
Log an error when we don't have permission to load the preset edit modal
|
2024-03-23 13:38:26 -04:00 |
|
IgorA100
|
95ee9f816d
|
Merge branch 'ZoneMinder:master' into patch-6
|
2024-03-15 23:20:35 +03:00 |
|
Isaac Connor
|
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 |
|
IgorA100
|
852dd772ab
|
Merge branch 'ZoneMinder:master' into patch-6
|
2024-03-03 00:38:02 +03:00 |
Simpler1
|
3d008263e4
|
fix(tags): Tags were not populated on watch view
|
2024-03-02 11:30:35 -05:00 |
|
IgorA100
|
cd8ffa08dc
|
Add getCpuUsageHTML()
|
2024-02-27 16:49:29 +03:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
f339ba5508
|
When listing option name, remove the ZM_ to be consistent with the options view
|
2024-02-15 12:54:39 -05:00 |
|
Isaac Connor
|
4107058000
|
FIx units on warning about timeout
|
2024-02-05 18:42:05 -05:00 |
|
Isaac Connor
|
648bd77b21
|
Apply validCardinal to all eids. Remove dead delete code
|
2024-01-27 18:33:19 -05:00 |
|
Isaac Connor
|
a5916f01d1
|
Protect against XSS in server db values
|
2024-01-25 19:34:46 -05:00 |
|
Isaac Connor
|
b5757a2d05
|
Use validCardinal on Id's cuz we don't trust the db or Object
|
2024-01-25 18:38:44 -05:00 |
|
Isaac Connor
|
5a498878b8
|
Protect mid with validCardinal. Return early if it is invalid or monitor is not found
|
2024-01-24 19:28:59 -05:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
9669f1e3ef
|
Sanitize entity before outputting it preventing XSS
|
2024-01-24 19:22:47 -05:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
839ef9ce67
|
Add a Component filter to logs
|
2024-01-16 16:35:52 -05:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
ea3d91b46f
|
Actually fix problem by not putting () on an integer has-post_sql_conditions
|
2023-12-14 09:32:32 -05:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
44a3a7a6a8
|
Fix loading event due to missing GROUP BY. Fixes event video generation.
|
2023-12-01 12:46:05 -05:00 |
|
Isaac Connor
|
23a0e561eb
|
Remove depth of nested if's by returning early.
|
2023-11-21 10:49:09 -05:00 |
|
Isaac Connor
|
9a271e8960
|
Add are you still watching modal
|
2023-11-20 14:23:57 -05:00 |
|
Isaac Connor
|
8e0793f5e7
|
Do not format StartDateTime and EndDateTime in ajax events results. Do the formatting in js.
|
2023-11-16 10:34:43 -05:00 |
|
Isaac Connor
|
abb4230f86
|
Use ajax error when specified storage not found.
|
2023-11-13 11:37:47 -05:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
48b5960fac
|
Can't copy by ref, the limit will affect unfiltered as well
|
2023-10-17 14:57:57 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
44c5c3c70c
|
Introduce new download mode that concats event videos into 1 file per monitor
|
2023-10-04 12:04:11 -04:00 |
|
Isaac Connor
|
5a7bd74521
|
Remove commented out code
|
2023-09-28 12:59:51 -04:00 |
|
Isaac Connor
|
51500d494f
|
Add group by when doing advnaced search
|
2023-09-26 15:15:47 -04:00 |
|
Isaac Connor
|
1fdf7f2b31
|
Remove debug
|
2023-09-25 16:32:01 -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
|
f8c89a0405
|
Merge branch 'master' into tags
|
2023-09-14 16:42:06 -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 |
|
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
|
b44216d3da
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2023-09-08 14:19:09 -04:00 |