 Isaac Connor
|
9125b8e6f9
|
Add support for sorting by Notes. Warn when the sort_field is unsupported
|
2024-11-27 13:56:35 -05:00 |
|
|
Isaac Connor
|
16a5f9e0a2
|
Merge dbUpdate and dbInsert from another branch
|
2024-11-18 10:47:07 -05:00 |
|
|
Isaac Connor
|
f51f1b4200
|
If no group id don't do sql lookup
|
2024-11-06 12:20:48 -05:00 |
|
|
Isaac Connor
|
a8c658aa50
|
Ensure that Servers is global.
|
2024-11-06 10:38:24 -05:00 |
|
|
Isaac Connor
|
5c01109f03
|
List monitor id in warning message about not being assigned a server.
|
2024-11-04 09:17:20 -05:00 |
|
|
Isaac Connor
|
94c2816841
|
Split out the default and initial_default concepts
|
2024-10-26 13:59:59 -04:00 |
|
|
Isaac Connor
|
1c0e03b813
|
Set the default for AnalysisFPSLimit to null so that we can empty it. Add an initial_default to use when creating a new monitor
|
2024-10-26 13:59:45 -04:00 |
|
|
Isaac Connor
|
ad582e9033
|
Add Linked as a cause type to search for
|
2024-10-26 13:34:40 -04:00 |
|
|
Isaac Connor
|
3e1c5573ec
|
Don't warn about no locale set, that is normal
|
2024-10-25 11:02:49 -04:00 |
|
|
Isaac Connor
|
f02121fcc2
|
Check for validity of locale. Handle fatal crash when setting datetiemformatter when an invalid locale is used. Fixes #4179
|
2024-10-25 10:41:56 -04:00 |
|
|
Isaac Connor
|
dea3b741c9
|
Require path to be a defined storage area. Use detaintPath to prevent Path Traversal. Fixes GHSA-g355-3rf6-f38v
|
2024-10-21 17:40:01 -04:00 |
|
|
Isaac Connor
|
daffe0294b
|
Add ONVIF as a Notes filter
|
2024-10-02 16:16:53 -04:00 |
|
|
Isaac Connor
|
9555455c5d
|
Add defines for ANALYSING_NONE and ANALYSING_ALWAYS
|
2024-10-01 17:14:01 -04:00 |
|
|
Isaac Connor
|
34e1512916
|
Add TRIGGER defines
|
2024-10-01 12:18:18 -04:00 |
|
|
Isaac Connor
|
eb117732a8
|
Rough in shm info and functions for triggering
|
2024-10-01 12:18:05 -04:00 |
|
|
Isaac Connor
|
3b379e99c0
|
Introduce detaintPathAllowAbsolute. Use it to protect against Path Traversal in files view. Fixes GHSA-8fw2-wh82-vv4h
|
2024-09-30 06:42:10 -04:00 |
|
|
Isaac Connor
|
7aabf146ba
|
Try to do something useful with error messages from SQL, but since storage isn't a real view, it won't be shown.
|
2024-09-30 06:34:15 -04:00 |
|
|
Isaac Connor
|
07fcb72e3b
|
Use the same filter on Storage Name as we use in Monitor Name.
|
2024-09-30 06:33:09 -04:00 |
|
|
Isaac Connor
|
d216c4cf47
|
Remove STATE_TAPE
|
2024-09-24 17:26:55 -04:00 |
|
|
Isaac Connor
|
328ce9fc0c
|
Make no Status record found a debug instead of warning
|
2024-09-17 11:17:50 -04:00 |
|
|
Isaac Connor
|
c45a2af08b
|
Revert lack of src tag on event image
|
2024-09-05 09:18:41 -04:00 |
|
|
Isaac Connor
|
08d2f44613
|
Allow further query parameters after view in HomeView
|
2024-09-04 16:52:59 -04:00 |
|
|
Isaac Connor
|
b64461d518
|
Merge branch 'master' into only_stream_visible
|
2024-09-03 14:51:36 -04:00 |
|
|
Isaac Connor
|
b66e04024f
|
Test for Path being empty to avoid warnings about passing null being deprecated
|
2024-09-03 09:39:03 -04:00 |
|
|
Isaac Connor
|
802a0854b5
|
Add getAnalysingStrings and getRecordingStrings and fix getStatusStrings, removing Tape
|
2024-08-18 12:18:44 -04:00 |
|
|
Isaac Connor
|
32fcfa4559
|
Add default for EmailServer in Filter
|
2024-07-18 16:05:34 -04:00 |
|
|
IgorA100
|
93e03952f7
|
Added identifiers "filterArchived", "filterTags", "filterNotes" (Filter.php)
This is necessary for working with cookies, and will also be used on the updated Montage page
|
2024-07-16 16:26:54 +03:00 |
|
|
Isaac Connor
|
caeb65233e
|
Fix not being able to unset use WallClockTimestamps
|
2024-07-08 08:36:55 -04:00 |
|
|
Isaac Connor
|
a3c73b414f
|
Add WallCLockTimestamps to Monitor model
|
2024-07-06 08:51:37 -04:00 |
|
|
IgorA100
|
14604520bc
|
Merge branch 'ZoneMinder:master' into patch-135
|
2024-06-05 17:07:51 +03:00 |
|
|
IgorA100
|
53d057d7aa
|
After the monitor name, display its ID (Monitor.php)
|
2024-06-05 15:21:09 +03:00 |
|
|
Isaac Connor
|
8a496f5d17
|
Remove extra comma that now breaks php
|
2024-06-04 09:39:22 -04:00 |
|
|
IgorA100
|
ba5cb4adcd
|
Added $this->streamSrc = $streamSrc (Monitor.php)
Required to switch without reloading the page between monitors on the Watch page
|
2024-06-04 15:22:59 +03:00 |
|
|
Isaac Connor
|
6e9c69300b
|
Handle no rows return from Server_Stats
|
2024-06-02 16:04:15 -04:00 |
|
|
Isaac Connor
|
3c389e7f7f
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2024-06-02 12:51:52 -04:00 |
|
|
IgorA100
|
eb1a38c74c
|
Changed attr "title" for "#monitor" (Monitor.php)
Made in two lines and added capital letters.
|
2024-06-02 00:07:37 +03:00 |
|
|
Isaac Connor
|
414b28d42a
|
Update style of variable embeddeding in string. php complains now
|
2024-05-31 14:53:45 -04:00 |
|
|
Isaac Connor
|
f81d6fb823
|
Sanitise filter[Id]
|
2024-05-30 12:12:02 -04:00 |
|
|
Isaac Connor
|
7543e513fa
|
Replace useless title on image stream with a useful one describing zoom controls.
|
2024-05-28 10:10:30 -04:00 |
|
|
Isaac Connor
|
ae5b73bf90
|
Resolve conflicts
|
2024-05-23 14:30:44 -04:00 |
|
|
Isaac Connor
|
b3c90c3216
|
Merge branch 'master' into only_stream_visible
|
2024-05-23 14:18:47 -04:00 |
|
|
Isaac Connor
|
02ccb5f12b
|
Remove unused zms url parameters
|
2024-05-23 13:31:30 -04:00 |
|
|
IgorA100
|
bd93a8e329
|
When setting cookies via PHP, add handling of the "path" value in the options (session.php)
Otherwise, cookies set via PHP will not be able to be changed in JS.
Because JS saves cookies with path="/"
Closed: #4024
|
2024-05-22 10:32:10 +03:00 |
|
|
IgorA100
|
41a92e11ad
|
Fix: block "Ratio Control" is created only for Montage page (Monitor.php)
Otherwise there will be an error in the browser console that the "changeRatio" function was not found
|
2024-05-21 19:34:06 +03:00 |
|
|
Isaac Connor
|
7a8f9a603d
|
Remove debug
|
2024-05-21 09:39:53 -04:00 |
|
|
Isaac Connor
|
9cc8ec7048
|
Santisize zmMontageLayout when passing to constructor
|
2024-05-21 09:22:55 -04:00 |
|
|
Isaac Connor
|
9dd58855d1
|
Santisize zmMontageLayout when passing to constructor
|
2024-05-21 09:21:54 -04:00 |
|
|
IgorA100
|
cb4481353b
|
Added "action" for the "delete" button (montage.php)
|
2024-05-21 12:07:35 +03:00 |
|
|
Isaac Connor
|
582f594b0f
|
Merge branch 'IgorA100-patch-6'
|
2024-05-15 11:46:26 -04:00 |
|
|
Isaac Connor
|
7bfd94b9d2
|
Merge branch 'patch-6' of github.com:IgorA100/zoneminder into IgorA100-patch-6
|
2024-05-15 11:45:49 -04:00 |
|