mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-28 02:33:42 -04:00
Code Issues Packages Projects Releases Wiki Activity
22,301 Commits 80 Branches 104 Tags
2a2c192562aea83dced7cd52dd8abd27a3784457
Commit Graph

169 Commits

Author SHA1 Message Date
Isaac Connor
2a2c192562 Add urlToJanus function to Server class 2023-05-11 10:13:04 -04:00
Isaac Connor
a608b18e8b Limit auto-calculated scale to 25%. Just looks bad less than that. When no bottom Element, adjust height as well. Don't need to change img.src on scale if streaming. Can just tell it to. Fix applying scale and will auto-reapply if needed. 2023-04-27 10:43:06 -04:00
Isaac Connor
1f11493266 Don't need to add auth_hash if we have auth_relay 2023-04-13 10:13:27 -04:00
Isaac Connor
b85b7e462e When testing ZM_ALARM_ON_SOUND, use string comparison as the config value is a string. Also add log if other config options are not set 2023-04-10 13:13:36 -04:00
Simpler1
0a84cd0327 fix(alarmSound): Use Audio.play() for alarm sound 2023-04-07 10:55:09 -04:00
Isaac Connor
7a254b42f5 Fix use of auth_relay when PLAIN 2023-03-21 09:52:50 -04:00
Isaac Connor
18403bf33e Move users list from options into an include. Add Email, Phone, Name fields 2023-02-28 13:59:16 -05:00
Isaac Connor
8a6f0cbe1b Add ServerStats to api 2023-02-26 17:04:05 -05:00
Isaac Connor
1cdd1325bf Fix eslint 2023-02-25 16:26:19 -05:00
iconnor@connortechnology.com
afcf55608e Move map generation into an Object so it can be reused. 2023-02-25 13:04:49 -05:00
iconnor@connortechnology.com
4979d299a6 Cleanup code style 2023-02-25 12:40:54 -05:00
iconnor@connortechnology.com
cbabf9d5ce Add getFromApi 2023-02-25 12:40:41 -05:00
Isaac Connor
74a0790c56 Use const instead of var, code comment fix 2023-02-19 17:29:32 -05:00
Isaac Connor
292f3a0cc2 Remove reference to zm.connortechnology.com 2023-01-13 12:48:26 -05:00
Isaac Connor
2e6f465055 eslint doesn't like function names that start with a capital 2023-01-12 09:38:13 -05:00
Isaac Connor
99d9d70a39 Update code, remove console.log debugging 2023-01-03 19:19:13 -05:00
Isaac Connor
50f87be9d9 Detach streams when killing the monitor stream to reduce console logging 2022-12-07 14:14:00 -05:00
Isaac Connor
0f2afdcff7 Fix eslint and use const on port 2022-11-30 13:42:17 -05:00
Isaac Connor
cdfe38cc31 Add UrltoZMS and UrltoAPI methods to Server js class 2022-11-30 13:19:02 -05:00
Isaac Connor
0c0269b2cc Fix eslint 2022-11-01 12:41:27 -04:00
Isaac Connor
2859634aaa Set xhrFields: widthCredentials: true so that we send cookies with our streaming xhr requests so that we pick up new auth hashes 2022-11-01 08:22:53 -04:00
Isaac Connor
f0cd36989b Spacing, use const and let instead of var 2022-10-21 18:11:46 -04:00
Isaac Connor
5a5a665cdf Test for definition of ZM_LOG_INJECT. We don't include the config when not logged in. So it won't be defined 2022-10-12 19:34:05 -04:00
Isaac Connor
cb3fc5907d Use canEdit['System'] and value of new ZM_LOG_INJECT to disable attempting to inject javascript errors into zm logs 2022-10-06 14:52:39 -04:00
VikingGer
11a4735082 Update MonitorLinkExpression.js 
Trailing spaces lead to eslint error. Removed them
 2022-09-17 10:08:07 +02:00
Isaac Connor
419a44f8ed Merge branch 'iiot' 2022-09-13 18:23:44 -04:00
Isaac Connor
d079439005 Merge branch 'reports' of http://github.com/ConnorTechnology/zoneminder into reports 2022-09-12 19:40:27 +02:00
Jonathan Bennett
c35bbc8c30 Adds the Janus_pin to shared_memory, and a -j to zmu to fetch it 2022-09-07 15:49:47 -05:00
Isaac Connor
4eeb49d09a Merge branch 'master' into reports 2022-08-31 18:38:08 +02:00
Isaac Connor
62a8b72dc4 Fix add monitorlink to not prepend a | onto and empty expr 2022-08-30 20:03:55 +02:00
Isaac Connor
e24432ee4d Merge branch 'master' into reports 2022-08-30 19:40:14 +02:00
Isaac Connor
3005ddff49 Still parse even if no tokens 2022-08-30 19:36:43 +02:00
Isaac Connor
48377334fe Gracefully handle when FrameRate is empty 2022-08-26 14:12:51 -04:00
Isaac Connor
f202e82b78 Remove no longer used code to protect percentage widths 2022-08-19 13:33:22 -04:00
Isaac Connor
331e3f483a Handle width=100% and remove code that worked around montage layouts with width=%. 2022-08-19 13:33:22 -04:00
Isaac Connor
e2ebccc9aa fix eslint 2022-08-19 13:33:20 -04:00
Isaac Connor
071147fba7 Remove no longer used code to protect percentage widths 2022-08-15 13:04:50 -04:00
Isaac Connor
de5b8bd893 Handle width=100% and remove code that worked around montage layouts with width=%. 2022-08-15 13:01:49 -04:00
Isaac Connor
294fd9b3c7 Always populate add MonitorLink dropdown. 2022-08-08 10:05:15 -04:00
Isaac Connor
f794077d71 Only add or operator if monitorlinks has content 2022-08-08 10:02:20 -04:00
Isaac Connor
dc52105c8f Allow to link to ourself 2022-08-03 14:44:44 -04:00
Isaac Connor
6c292dd0e3 Improve adding parenthesis, rename function to snake case 2022-08-03 14:30:18 -04:00
Isaac Connor
eb4b097560 fix eslint 2022-08-03 13:52:01 -04:00
Isaac Connor
2e5d7ee167 Improve adding parenthesis, rename function to snake case 2022-08-03 13:38:56 -04:00
Isaac Connor
6f146d1af0 Add MonitorLinkExpression.js 2022-08-03 12:14:51 -04:00
Isaac Connor
4ab58f5f22 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-06-16 09:58:49 -04:00
Isaac Connor
58fedd8c35 Fix streamQuery => streamCmdQuery. Fixes #3507 2022-06-16 09:58:26 -04:00
Isaac Connor
17562671c1 fix eslint 2022-06-15 13:18:11 -04:00
Isaac Connor
a5cbe65d70 watchdog is not available everywhere yet. comment out its use 2022-06-15 13:08:38 -04:00
Isaac Connor
5188346086 Institute a status timer to be used when not streaming from zms. 2022-06-15 12:34:55 -04:00