Isaac Connor
|
46b27d9f78
|
Add Tags support to API
|
2023-11-03 13:33:28 -04:00 |
|
Isaac Connor
|
46fcb27a3b
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2023-11-02 12:21:59 -04:00 |
|
Isaac Connor
|
9537492f1c
|
Handle invalid codec and fix video_tag boolean assignment causing video tag to be false
|
2023-11-02 12:21:30 -04:00 |
|
Isaac Connor
|
e6632ade43
|
Use echo instead of print which is apparently faster.
|
2023-11-01 17:27:56 -04:00 |
|
Isaac Connor
|
f26617af71
|
Fix not allowing html5 video tag when h265.
|
2023-11-01 17:27:56 -04:00 |
|
Isaac Connor
|
859baf6f8f
|
Remove padding from navbars to condense them a bit. Fix 1 pixel extra padding on state button
|
2023-11-01 11:31:18 -04:00 |
|
Isaac Connor
|
13ec02d5f1
|
Fix Auto Unarchive not deselecting
|
2023-10-31 10:02:58 -04:00 |
|
Isaac Connor
|
f76046af3f
|
Always stop a filter. Otherwise we won't stop it when switching from background to not background.
|
2023-10-30 17:16:06 -04:00 |
|
Isaac Connor
|
e2f8553b48
|
Fix lack of scroll on groups view.
|
2023-10-30 15:51:39 -04:00 |
|
Isaac Connor
|
36936001a4
|
Remove trailing spaces. Remove extra comma causing SQL-ERR
|
2023-10-30 10:22:04 -04:00 |
|
Isaac Connor
|
6aa7901066
|
Use same logic as in LogHTML to apply success class, and hence make the word Log green when there are no errors.
|
2023-10-30 10:03:17 -04:00 |
|
Isaac Connor
|
db252ce191
|
Dont' log warning when no user preference set. Inlcude more info in log message.
|
2023-10-30 09:40:03 -04:00 |
|
Isaac Connor
|
29be822e99
|
Add required GROUP BY Id to fix SQL queries
|
2023-10-27 10:43:27 -04:00 |
|
Isaac Connor
|
1545210b12
|
Add php8.1+ members support for multiple and chosen flags for filter terms
|
2023-10-26 18:43:05 -04:00 |
|
Isaac Connor
|
d54171c21c
|
Be a little more verbose and robust when things like permission errors break config loading
|
2023-10-26 18:37:15 -04:00 |
|
Isaac Connor
|
e8a866e504
|
Add named parameters support to ServerStatsController.
|
2023-10-26 18:26:51 -04:00 |
|
Isaac Connor
|
d7bb9674e3
|
Add newline to fix SQL err due to Tags
|
2023-10-26 11:11:50 -04:00 |
|
Isaac Connor
|
ecfc39aa87
|
Set new defaults for ENabled, API Enabled and HomeView in user Object. php's new need to declare every property breaks the old default system. Only load Group Permissions and Monitor Permissions if we have an Id.
|
2023-10-26 09:39:26 -04:00 |
|
Isaac Connor
|
f1f553dd98
|
Don't give a default value to Username it is not useful. Replace it with a placeholder.
|
2023-10-26 09:26:35 -04: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
|
b01908e93c
|
Don't include the third nav element for nav banner when there is no banner set so as to take up less space
|
2023-10-23 17:06:28 -04:00 |
|
Isaac Connor
|
ab979c8f42
|
Fix typo in getHomeView
|
2023-10-23 16:49:34 -04:00 |
|
Isaac Connor
|
717f644087
|
Define ->savedErrorReporting to prevent php errors in logs
|
2023-10-23 16:39:43 -04:00 |
|
Isaac Connor
|
1411c47c99
|
Correct case of value in User_Perference
|
2023-10-20 14:51:18 -04:00 |
|
Isaac Connor
|
84ca405749
|
Rename a variable due to cutnpsating
|
2023-10-20 14:51:07 -04:00 |
|
Isaac Connor
|
0ab7a755ba
|
Event::Tags returns an array of Tags objects, so turn them into a string.
|
2023-10-20 14:02:48 -04:00 |
|
Isaac Connor
|
c287b7f645
|
Add Tags() and Event_Tags() functions to Event
|
2023-10-20 14:02:25 -04:00 |
|
Isaac Connor
|
d303927ad0
|
Rough in ORM for Tags
|
2023-10-20 14:02:10 -04:00 |
|
Isaac Connor
|
7824613e53
|
Allow Objects with no Id, they can't be cached but can be used.
|
2023-10-20 14:01:55 -04:00 |
|
Isaac Connor
|
f650d300d4
|
BUmp jquery to 3.7.1
|
2023-10-20 10:53:24 -04:00 |
|
Isaac Connor
|
f5107b5743
|
Default to showing PTZ if it is enabled
|
2023-10-20 09:05:03 -04:00 |
|
Isaac Connor
|
7c2ec7f404
|
Improve replayMode loading, adding support for User Preference default value
|
2023-10-19 13:02:39 -04:00 |
|
Isaac Connor
|
876d76ef1d
|
Only do thumbnail animations if not on mobile.
|
2023-10-18 12:03:56 -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
|
41c156918e
|
aviableTags must be defined
|
2023-10-17 14:13:44 -04:00 |
|
Isaac Connor
|
3cd6b78b85
|
OutputCodec cannot be null
|
2023-10-17 12:33:27 -04:00 |
|
Isaac Connor
|
eaf43daa5c
|
Fix missing date init
|
2023-10-16 14:13:07 -04:00 |
|
Isaac Connor
|
621e9e68d0
|
Must use floats when calculating width of progress bar segments.
|
2023-10-16 14:07:21 -04:00 |
|
Isaac Connor
|
e9d51731e8
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2023-10-16 12:23:37 -04:00 |
|
Isaac Connor
|
db7a25ab3b
|
Remove event rename button functionality, as that exists in eventdetail/event edit.
|
2023-10-16 12:23:29 -04:00 |
|
Isaac Connor
|
c6d9c7731d
|
Add aborting in transit events loading before sending another.
|
2023-10-16 12:15:55 -04:00 |
|
Isaac Connor
|
1658943097
|
Use playClicked instead of vjsPlay as it has additional functionality
|
2023-10-16 12:15:28 -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
|
ea76a03043
|
Rename startRTSPtoWebRTSPPaly to startRTSPtoWebPlay
|
2023-10-15 17:55:44 -04:00 |
|
Isaac Connor
|
93f5378f4e
|
Fix undefined reference to startPlay
|
2023-10-15 17:55:44 -04:00 |
|
Isaac Connor
|
8fd33b7f77
|
Handle case when Alarm frame or MaxScore frame don't exist.
|
2023-10-15 17:55:44 -04:00 |
|
Isaac Connor
|
71ff61b05f
|
Use parseInt around quoted number values so that we can trust that they are integers. Fixes an issue with StreamReplayBuffer
|
2023-10-15 17:55:44 -04:00 |
|
Isaac Connor
|
4fe61d60ca
|
Add Email as a column in user list
|
2023-10-13 09:01:56 -04:00 |
|
Isaac Connor
|
fdc500304b
|
Add test to see if php-curl is installed instead of crashing.
|
2023-10-12 11:04:55 -04:00 |
|
Isaac Connor
|
0ba0e6d27b
|
Control form elements were renamed from newControl to just Control. Update validateForm to match.
|
2023-10-11 14:58:54 -04:00 |
|
Isaac Connor
|
ad35eba013
|
Use bootstrap table for user list, giving us sortable columns and we can use mobile table/card
|
2023-10-11 13:34:38 -04:00 |
|
Isaac Connor
|
7762e882b1
|
Remove debug
|
2023-10-11 13:34:09 -04:00 |
|
Isaac Connor
|
69e601d286
|
Fix failure to save new user due to Snapshots not getting a default value.
|
2023-10-11 13:34:00 -04:00 |
|
Isaac Connor
|
bdc6bb58d6
|
Add a redirect after user delete so that we don't have form resubmission
|
2023-10-11 13:33:31 -04:00 |
|
Isaac Connor
|
0fe6dc2997
|
Fix the second Offline test. Fixes #3766
|
2023-10-11 11:34:27 -04:00 |
|
Isaac Connor
|
feb3d91e8b
|
Remove Tags from Event Data defaults. I don't think it is meant to be there
|
2023-10-06 14:54:17 -04:00 |
|
Isaac Connor
|
72d021dae9
|
Remove Tags from Event Data defaults. I don't think it is meant to be there
|
2023-10-06 14:49:57 -04:00 |
|
Isaac Connor
|
16db44193f
|
Test for data.response being defined and do some logging if not
|
2023-10-06 14:32:55 -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
|
38be4feeb8
|
Servers is a global, don't need to hit the db again
|
2023-10-05 11:51:33 -04:00 |
|
Isaac Connor
|
58ef8fe509
|
IF operator is LIKE and there is no %, automatically add them to front and back so that we get a match.
|
2023-10-05 11:50:29 -04:00 |
|
Isaac Connor
|
c78063abd1
|
If we can edit we should still be able to do view actions
|
2023-10-04 15:11:14 -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
|
f864a29eac
|
Always return an array in getCredentialsDeprecated
|
2023-10-04 11:12:37 -04:00 |
|
Isaac Connor
|
9b1e98997c
|
fix eslint
|
2023-10-01 10:28:36 -04:00 |
Simpler1
|
2547376c27
|
fix(php8): AllowDynamicProperties
|
2023-09-30 19:56:57 -04:00 |
|
Isaac Connor
|
db390a4861
|
Merge branch 'fix_hardcoded'
|
2023-09-29 12:18:23 -04:00 |
|
Isaac Connor
|
10cf26fa7b
|
Take FPSReportInterval into account when determining if a monitor is dead. Fixes #3766
|
2023-09-29 12:09:23 -04:00 |
|
Isaac Connor
|
2d46fc350a
|
Spacing, test for setting of ZM_PATH_IP
|
2023-09-29 12:07:50 -04:00 |
|
Isaac Connor
|
7060945e97
|
Use new ZM_PATH_IP and ZM_PATH_IFCONFIG instead of hard coded paths. Fixes #3670
|
2023-09-28 13:32:42 -04:00 |
|
Isaac Connor
|
5a7bd74521
|
Remove commented out code
|
2023-09-28 12:59:51 -04:00 |
|
Isaac Connor
|
91c44a4f9a
|
Fix semi colon
|
2023-09-26 15:17:26 -04:00 |
|
Isaac Connor
|
23b58a2709
|
Move delteclick and download click into separate functions. Only load delconfirm modal when delete is clicked.
|
2023-09-26 15:17:01 -04:00 |
|
Isaac Connor
|
51500d494f
|
Add group by when doing advnaced search
|
2023-09-26 15:15:47 -04:00 |
|
Isaac Connor
|
82aeac076d
|
Fix incorrect var name frameid=>fid in find_virtual_frame
|
2023-09-26 12:10:36 -04:00 |
|
Isaac Connor
|
709d08c6c5
|
Only call jsonDecode when Query_json is non-empty
|
2023-09-25 16:56:06 -04:00 |
|
Isaac Connor
|
45bcb13045
|
Add backtrace to errors in json
|
2023-09-25 16:32:20 -04:00 |
|
Isaac Connor
|
1fdf7f2b31
|
Remove debug
|
2023-09-25 16:32:01 -04:00 |
|
Isaac Connor
|
e1ef40de17
|
Only load the delConfirm modal if we click delete
|
2023-09-25 16:27:01 -04:00 |
|
Isaac Connor
|
a619634988
|
Add tab to available js vars on options
|
2023-09-21 12:52:30 -04:00 |
|
Isaac Connor
|
fc3a1bfc4b
|
use const instead of var
|
2023-09-21 12:52:02 -04:00 |
|
Isaac Connor
|
24d6649e98
|
Log useful output when failure to write dnsmasq.conf and fail to restart dnsmasq
|
2023-09-21 12:51:37 -04:00 |
|
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 |