Commit Graph

2094 Commits

Author SHA1 Message Date
Isaac Connor
a8365d40b4 Fix array uses of user object. Include data-id in monitor div. 2023-05-10 11:03:10 -04:00
Isaac Connor
00113208bf fix typo 2023-04-28 08:44:47 -04:00
Isaac Connor
bac1974974 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-04-26 14:54:09 -04:00
Isaac Connor
bf113217f2 Improve Axis detection 2023-04-26 14:15:08 -04:00
Isaac Connor
7825957114 Only set val from cookie if it is non-empty 2023-04-26 11:07:17 -04:00
Isaac Connor
d2fb365fa9 Add the ability to send a single summary email instead of individual emails per event 2023-04-24 17:53:16 -04:00
Isaac Connor
c87316d3a1 Handle not being logged in 2023-04-24 10:13:45 -04:00
Isaac Connor
4b417b8937 Fix other cases of user as an array 2023-04-23 15:35:26 -04:00
Isaac Connor
969baa3891 Convert user from an array to a User object 2023-04-23 12:57:29 -04:00
Isaac Connor
35cc9fa4cb Apparently Default for Deleted needs to be zero, not false 2023-04-22 14:04:18 -04:00
Isaac Connor
665628720f Improved setting of Manufacturer and Model, add Status to monitor view status, new defaults for Label, EncoderParamters, don't save analysis jpegs by default and only analyze on 2fps and set a reasonable MaxImageBuffer 2023-04-22 13:58:33 -04:00
Isaac Connor
5f8c80698e Improve Ubiquiti snapshot jpeg support 2023-04-22 13:32:42 -04:00
Isaac Connor
68370a1f88 Add Group to filters, add Notes to widgets, other fixes to widget structure. Add cookie support for widgets. 2023-04-22 10:56:34 -04:00
Isaac Connor
d9f5d3c357 Implement StartDateTimeSecs 2023-04-22 10:48:41 -04:00
Isaac Connor
312d0ba841 Use objdetect as thumbnail if it exists. 2023-04-22 10:47:33 -04:00
Isaac Connor
4d8d4b6ee5 Update add_monitors to make it scan the network. 2023-04-21 17:52:14 -04:00
Isaac Connor
02046b9c88 Use object methods to load monitor and delete it 2023-04-19 18:56:52 -04:00
Isaac Connor
73548dda73 Add Deleted member 2023-04-19 18:56:29 -04:00
Isaac Connor
240333381a Handle val and cnj not being specified. Add Notes to attr that must be non empty 2023-04-11 07:53:55 -04:00
Isaac Connor
ce0a83f904 Reduce minimum to .05% as that is what seems to be necessary these days 2023-04-05 17:47:03 -04:00
Isaac Connor
394cd6e0f8 AlarmRGB should be an actual hex value not a string 2023-04-05 17:46:29 -04:00
Isaac Connor
21f6bdae35 Change minimum percent to 50% instead of 3% 2023-04-05 14:46:13 -04:00
Isaac Connor
d170112ef7 Change minimum percent to 50% instead of 3% 2023-04-05 14:45:30 -04:00
Isaac Connor
b1df318491 Use ORM Zone Object for Zone insertion on new monitor 2023-04-05 14:43:50 -04:00
Isaac Connor
231b0ab631 Sync up default values with what gets added in actions/monitor 2023-04-05 14:42:44 -04:00
Isaac Connor
9284ae2908 Add Name,Email,Phone to User object 2023-04-03 12:45:09 -04:00
Isaac Connor
3a20ab64c7 Turn dropdowns into chosen multiple-selects 2023-04-02 16:27:14 -04:00
Isaac Connor
d5baadca84 Comment out debug 2023-04-02 16:10:24 -04:00
Isaac Connor
593c7ac902 Handle HomeView not being set, and default it so that it is set 2023-03-24 12:53:49 -04:00
Isaac Connor
16b74fc474 Add title of monitor id and name like we had in 1.36 2023-03-23 20:03:40 -04:00
Isaac Connor
6c8a2ad05a add support for shortened user= pass= which is used in auth_relay=PLAIN 2023-03-22 08:06:02 -04:00
Isaac Connor
da87187f1d Use explode instead of split 2023-03-22 08:06:02 -04:00
Isaac Connor
01ba5f59f9 Use dirname(__FILE__) instead of DOCUMENT_ROOT. Apparently many people have something wrong in DOCUMENT_ROOT. I don't understand it, but it seems like dirname(__FILE__) is a better solution anyways. 2023-03-21 18:22:53 -04:00
Isaac Connor
34e3e99c99 Rough in code for User_Preferences 2023-03-21 10:03:57 -04:00
Isaac Connor
e60586feee Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-03-21 09:54:40 -04:00
Isaac Connor
128b3d884a Spacing 2023-03-21 09:54:37 -04:00
Isaac Connor
8bef309a86 Values in terms are comma separated, so split the val for Monitor selection 2023-03-16 08:43:01 -04:00
Isaac Connor
97879eab49 Fix missing s causing problems when Group permission set to None 2023-03-08 10:59:33 -05:00
Isaac Connor
06f750c42b add in is_isnot_opTypes and booleanValues and use them in simple_widget 2023-03-05 13:26:08 -05:00
Isaac Connor
065464a7f8 Use new getHomeView function instead of view=console 2023-03-05 10:21:59 -05:00
Isaac Connor
3e86454fc6 implement getHomeView function 2023-03-05 10:21:18 -05:00
Isaac Connor
2e58ea1a42 return false if not logged in in canView. defaultUser is global, need to tell it so. 2023-02-27 17:01:58 -05:00
Isaac Connor
72652cfb64 Add Decoder options to monitor view 2023-02-26 16:04:32 -05:00
Isaac Connor
9ceb22db8f Fix auth for monitor_permissions... 2023-02-25 16:00:34 -05:00
Isaac Connor
84383a0498 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-02-25 13:17:53 -05:00
Isaac Connor
a7af29c0c4 Add IN operator 2023-02-25 13:00:38 -05:00
Isaac Connor
39de76e989 add a db_version and a feature check function to determine if we support skip locks in the query. Use it to disable the feature in filter view. 2023-02-25 11:44:50 -05:00
Isaac Connor
82a28b78d8 Use function style of member access to prevent errors on unsaved monitor 2023-02-23 13:22:50 -05:00
Isaac Connor
6867b0c841 Correct the syntax of the CSP 2023-02-23 09:47:49 -05:00
Isaac Connor
32afb13b39 Sanitise attr input in FilterTerm to prefent SQL Injection. Fixes GHSA-222j-wh8m-xjrx 2023-02-23 09:25:03 -05:00