mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-24 08:41:40 -04:00
Code Issues Packages Projects Releases Wiki Activity
20,301 Commits 80 Branches 104 Tags
a047cedd47ef629cf14fdff6ab26b49eaae03fcf
Commit Graph

95 Commits

Author SHA1 Message Date
Isaac Connor
0501f464c5 Fix scale <0 and send zms a quit command because safari will never close the stream. Fixes no image on safari 2022-04-19 19:30:27 -04:00
Isaac Connor
21716e994b Keep better track of timers. Add img_onerror to report when image breaks. setScale is a mess. Add some more code to guess image scale. Browser can't handle 4k jpeg streams. scaling is a must. 2022-04-19 16:56:21 -04:00
Isaac Connor
a1f0ac2e48 width=auto,height=auto,scale=fixed operates the same as scale=auto. Don't set height. Height is ONLY set when a specific height is chosen. Which may go away for an aspect ratio dropdown instead. 2022-04-10 17:30:34 -04:00
Isaac Connor
8db08f5a10 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-03-04 12:09:44 -05:00
Isaac Connor
920f5470a8 Don't set width&height on img. img is always 100% of container. Don't show zoom unless it is != 1.0. Only update buttons if there is a change, to reduce redraws 2022-03-04 12:07:32 -05:00
Jonathan Bennett
c28c043773 Adds support for Janus 1.x 2022-02-28 18:05:17 -06:00
Jonathan Bennett
1749afc8e2 Add additional Firefox streaming workaround 2022-02-28 14:17:19 -06:00
Isaac Connor
a40b305065 Merge branch 'master' into replace_function_concept 2022-02-20 09:52:03 -05:00
Isaac Connor
002b2c39aa fix button assignments. Don't abort ajax, as it might be important 2022-02-18 17:11:18 -05:00
Isaac Connor
dcf6e5da46 If there is an ajax error, and the error is unauthorized, then reload the page. 2022-02-08 11:20:54 -05:00
Isaac Connor
8e62562afd Move onclick to the surrounding div instead of the img. Fixes clicking on montage 2022-01-26 21:39:29 -05:00
Jonathan Bennett
2e9bda1af1 Add firefox specific workaround for Janus streaming 2022-01-21 23:21:41 -06:00
Jonathan Bennett
52e48c02b6 Add janus_path and janus_secret, allowing for more secure and flexible Janus installs 2022-01-21 22:23:41 -06:00
Isaac Connor
2da9c20c08 Add ajaxQueue 2022-01-20 11:49:59 -05:00
Isaac Connor
22b6337752 Merge code from watch.js. Add an ajaxQueue. Link up buttons from UI 2022-01-20 11:47:28 -05:00
Isaac Connor
388735e942 Fix relating auth_hash causing repeated reloads. If https, then assume a reverse proxy setup to janus. If video feed is not an img, log it and return 2022-01-18 23:02:26 -05:00
Isaac Connor
24c2efeb00 fix eslint 2022-01-17 16:19:27 -05:00
Jonathan Bennett
5026008482 Changes due to janus packaging 2022-01-16 19:55:53 -06:00
Jonathan Bennett
59056b4103 Refactor Montage view js -- Janus in MonitorStream 2022-01-15 01:33:17 -06:00
Jonathan Bennett
50c824f3bb Janus cleanup, adds support to the "watch" view 2022-01-11 21:21:58 -06:00
Jonathan Bennett
3a9c16aeea First working Janus build 2022-01-10 23:22:37 -06:00
Isaac Connor
c8bc0661b1 Have to clear src before resetting or some browsers won't load the new image 2022-01-08 12:14:28 -05:00
Isaac Connor
939f165b22 rename analyze to analyse 2022-01-07 16:05:52 -05:00
Isaac Connor
6f5eee6c0f Add show_analyze_frames function to tell zms to send analysis frames 2022-01-07 13:53:49 -05:00
Isaac Connor
474f65cff3 Implement getElement, setScale in MonitorStream.js 2021-11-10 14:20:19 -05:00
Isaac Connor
1c8a850acf Handle stream having something other than an img as it's display 2021-03-23 13:53:45 -04:00
Isaac Connor
478d11e6f2 Update the auth in streamCmdParams on every request. It wasn't picking up updates 2021-03-13 12:12:20 -05:00
Andrew Bauer
68819a86a0 remove mootools from zoneminder 2021-01-18 07:31:43 -06:00
Isaac Connor
3639593ae5 use js.post instead of getJSON. 2021-01-11 15:22:15 -05:00
Andrew Bauer
9968a65ee6 bind this to streamCmdQuery 2021-01-10 14:21:52 -06:00
Andrew Bauer
c67c1ce6a0 replace Mootool delay with setTimeout 2021-01-08 13:06:56 -06:00
Andrew Bauer
72eaf267c1 eslint 2021-01-08 10:45:59 -06:00
Andrew Bauer
c0431eca86 eslint 2021-01-08 10:42:45 -06:00
Andrew Bauer
55d99e8e7c eslint 2021-01-08 10:10:47 -06:00
Andrew Bauer
b56883a985 add reference to browserInfo function 2021-01-08 09:35:32 -06:00
Andrew Bauer
62fc1fb1aa replace Mootools Browser object with our own 2021-01-08 09:32:51 -06:00
Andrew Bauer
a431f08133 eslint 2021-01-06 15:57:30 -06:00
Andrew Bauer
9d7f738f61 replace mootools in MonitorStream 2021-01-06 14:19:25 -06:00
Andrew Bauer
51132cb5e1 old overlay code is no longer used 2021-01-04 13:51:03 -06:00
Andrew Bauer
9209f40daa eslint 2020-12-24 14:59:27 -06:00
Andrew Bauer
3fd50bb01d reorganize logger.js and use jquery 2020-12-24 14:32:23 -06:00
Andrew Bauer
332ec2032a replace createPopup with location.assign 2020-10-12 12:37:23 -05:00
Matthew Noorenberghe
77cca7efac eslint --fix 2020-09-04 10:02:43 -04:00
Isaac Connor
a88dcfe78c During start, switch from mode=single if required. Add play/stop/pause 2020-09-02 14:37:48 -04:00
Isaac Connor
762bea0761 Bulk load monitor/Group relationships. Instead of using DESCRIBE Monitors Function, use a new function getMonitorFUnctionTypes to get this data for dropdown purposeses. Reduces db hits a lot. 2020-08-31 18:30:05 -04:00
Isaac Connor
fe96ba0a2a cleanup and revert adding Event stack trace 2020-04-10 11:14:46 -04:00
Isaac Connor
d7ea798c09 add modern stracktrace to log messages 2020-03-20 11:06:32 -04:00
Isaac Connor
d30480e31e add passive to addEventListener 2020-03-05 14:10:35 -05:00
Matt N
19c272061a Replace MooTools usage for adding window event listeners (#2429) 2019-01-21 11:14:32 -05:00
Matt N
f0b33145f5 Log CSP violations in ZM logs in supported browsers (#2431) 2019-01-21 11:12:17 -05:00