mirror/zoneminder
1
0 Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-10-26 16:28:31 -04:00
Code Issues Packages Projects Releases Wiki Activity
20,453 Commits 107 Branches 109 Tags
3bcd0447a76f14ca79cebbcd2faad78bff48e604
Commit Graph
8445 Commits
Author SHA1 Message Date
Isaac Connor 3bcd0447a7 Fix using word auto instead of 0 2022-05-10 14:08:56 -04:00
Isaac Connor bbf50027e8 Don't show thumbnail column if thumbnails turned off 2022-05-10 13:10:55 -04:00
Isaac Connor 858fda42e9 Make events list table 100% 2022-05-10 13:10:36 -04:00
Isaac Connor 18726f800d Remove deprecated case of scale=fixed. 2022-05-10 10:30:59 -04:00
Isaac Connor 87c7cae8c0 Enforce and document logic of cycle variables. Set cycle var when start/stopping 2022-05-10 09:24:42 -04:00
Isaac Connor d8aef93eb4 Don't auto start cycle when clicking next/prev 2022-05-09 14:53:44 -04:00
Isaac Connor 76f01647f1 define CMD_GET_IMAGE for completeness 2022-05-07 19:39:01 -04:00
Isaac Connor 2f25421cf0 Spacing 2022-05-07 19:39:01 -04:00
Isaac Connor cb30b9c5a9 fix missing ] on checkboxx 2022-05-07 19:39:01 -04:00
Isaac Connor 83963464ba spacing 2022-05-07 19:39:01 -04:00
Isaac Connor eb3806f482 Don't close initial stream. The QUIT gets lost. Add onload debugging 2022-05-07 11:39:17 -04:00
Isaac Connor dff60e5a0b Need a ; before report-uri 2022-05-04 13:02:34 -04:00
Isaac Connor 04ecbfae8a Check Config::System to determine if field is disabled or not. 2022-05-04 13:01:53 -04:00
Isaac Connor e3787d05e1 Use Content-Security-Policy: for all views instead of Report-Only 2022-05-04 12:08:17 -04:00
Isaac Connor d2ef6b990c Remove timeout on ajax call to generate the zip. Fixes #3264 2022-05-03 13:20:15 -04:00
Isaac Connor 085da5c1fb fix eslint 2022-05-02 10:01:14 -04:00
Isaac Connor ee5902eaf4 fix eslint 2022-05-02 08:53:46 -04:00
Isaac Connor 2a5a94b995 Fix monitors.json and monitor/.json use incorrect Id (mathing Monitor.Id instead of Monitor.ManufacturerId) to return Manufacturer and CameraModel: Fixes #3475 2022-05-01 13:25:42 -04:00
Isaac Connor bc54e423d8 Remove duplicated calls to setScale. Remove msieVer. Remove unused vars. 2022-04-29 18:39:25 -04:00
Isaac Connor 7d2a7bd9f0 Don't parseInt width and height when calling setScale. TUrn off debugging 2022-04-29 18:14:56 -04:00
Isaac Connor 1511b436dd Unhide OutputContainer and alig-right all the first column text 2022-04-29 18:14:21 -04:00
Isaac Connor 23eacf3c1a Use width and height = 100% instead of max_-width and max-height when scaling imageFeed.img 2022-04-29 18:13:58 -04:00
Isaac Connor 01a5ab2621 Replace msieVer with something more modern. Don't change monitor_=frame.style.width when auto-scaling and no bottom element. We do not want to change the css, just calculate a scale 2022-04-29 18:13:25 -04:00
Isaac Connor dd95ebb34a ZM_SOUND_ON_ALARM is actually ZM_WEB_SOUND_ON_ALARM 2022-04-29 17:52:51 -04:00
Isaac Connor 99fa0a71cf SOUND_ON_ALARM is now included in ZM_SOUND_ON_ALARM 2022-04-29 17:51:02 -04:00
Isaac Connor 9e39cbf3e9 add px's where appropriate, document setScale a bit more, use streamCOmmand for statusQuery 2022-04-28 19:18:40 -04:00
Isaac Connor 74fd90cfdd Remove loading=lazy, it breaks ajax 2022-04-28 17:14:06 -04:00
Isaac Connor 5e3e10dd6f set image height to value of height dropdown, which is either a pixel value or auto, which is appropriate 2022-04-28 17:06:24 -04:00
Isaac Connor 0aeafd9efb Remove CMD constants as they are in skin.js.php now 2022-04-28 17:06:10 -04:00
Isaac Connor 8937d16aa1 Add VARPLAY 2022-04-28 17:05:46 -04:00
Isaac Connor ac3fa65577 MonitorStream doesn't know about MONTAGE. Hiding fields should be done in php. Use toLocaleString to format fps values with 1 decimal. 2022-04-28 17:05:32 -04:00
Isaac Connor 843231cb92 Fix eslint 2022-04-28 17:02:08 -04:00
Isaac Connor fa19356dbd sync update the style of the surroundin image stream div. Add id and class. Include MonitorStream.js 2022-04-28 17:00:04 -04:00
Isaac Connor d364e8a7a8 handle undefined HTTP_REFERER, and escape zone name 2022-04-28 16:59:43 -04:00
Isaac Connor b0bb337309 export the layout id of FreeForm to javascript land 2022-04-28 16:59:23 -04:00
Isaac Connor 62a49913d8 add statusRefreshTimeout and connKey 2022-04-28 16:57:56 -04:00
Isaac Connor 1e847550b8 Use MonitorStream fo setting img.scale. 2022-04-28 16:57:36 -04:00
Isaac Connor 523b075dd3 sync update the style of the surroundin image stream div. Add id and class. Include MonitorStream.js 2022-04-28 16:55:52 -04:00
Isaac Connor f3135d30a4 remove #imageFeed style has been moved to global .imageFeed 2022-04-28 16:54:47 -04:00
Isaac Connor dc3f4e543e Apply .imageFeed img styles globally 2022-04-28 16:53:39 -04:00
Isaac Connor bdea3473a0 Clear timers around changing img.src. Define statusCmdTime at the top. 2022-04-28 16:52:54 -04:00
Isaac Connor f21df362fa Remove STATE_ and CMD defines as they are in skin.js.php now. quote connKey so that it retains leading 0s. Should quiet some zms errors. 2022-04-28 16:51:13 -04:00
Isaac Connor 2434c39c2d remove auth_hash, it is global 2022-04-28 16:49:25 -04:00
Isaac Connor 0e4a6edf87 split changeScale into applyScale. Fix behaviour when selecting width/height/scale. Fix width:100% not persisting 2022-04-28 16:49:09 -04:00
Isaac Connor f88cbfb6de remove :'s in labels to be consistent 2022-04-28 16:47:33 -04:00
Isaac Connor ce944b9a61 Add case to handle scale value stored in cooke == auto 2022-04-28 16:33:38 -04:00
Isaac Connor f8d14b5fa7 New styles for new layout. Image and Points in in 1 div now, floated left, settings floated right. 2022-04-28 16:14:06 -04:00
Isaac Connor c468be7c40 New styles for new layout. Image and Points in in 1 div now, floated left, settings floated right. 2022-04-28 16:13:51 -04:00
Isaac Connor ba195203a6 var => const. Fix points not being draggable after switch to MonitorStream.js generated html. Fix hightlightoff not firing over points table 2022-04-28 16:10:46 -04:00
Isaac Connor 84ae91fe24 Comment out width and height setting on the imageFrame 2022-04-28 15:45:35 -04:00