ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
20,425 Commits
32 Branches
93 Tags
164 MiB
Commit Graph

20425 Commits (e3787d05e1bee369d9a081b5d0987e9cc05144ad)

Author SHA1 Message Date
Isaac Connor e3787d05e1 Use Content-Security-Policy: for all views instead of Report-Only 2022-05-04 12:08:17 -04:00
Isaac Connor db2854a7ac Improve error message when sws_scale fails 2022-05-04 10:00:40 -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 9779ab1830 Fix lockup on logrot by not releasing the event lock 2022-05-02 09:55:51 -04:00
Isaac Connor ee5902eaf4 fix eslint 2022-05-02 08:53:46 -04:00
Isaac Connor c08b84c1fb
Merge pull request #3477 from jp-bennett/patch-2 
Adds gsoap to the RPM buildspec
 2022-05-02 00:05:48 -04:00
Jonathan Bennett 8e70ec4f86
Adds gsoap to the RPM buildspec 2022-05-01 20:33:16 -05:00
Isaac Connor 6166df1cab Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-05-01 13:25:49 -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 08876e2ca0 Add libavdevice57 to depends, which is what is in bionic 2022-05-01 10:28:11 -04:00
Isaac Connor 210a9d035b Fix a case where packets could be left in queue on delete 2022-04-30 14:04:09 -04:00
Isaac Connor 06dec70e57 Fix lockup due to not checking for terminate_ before grabbing the lock again 2022-04-30 14:04:09 -04:00
Isaac Connor cffb57799a const_cast away the constness of oformat so that we can set AV_TS_NOTSTRICT 2022-04-30 09:30:04 -04:00
Isaac Connor b2b5357c0c Bump version to 1.37.14 2022-04-29 18:40:42 -04:00
Isaac Connor 1852694a50 Add webm to output containers 2022-04-29 18:39:54 -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 0bbc6321d5 ifdef out the packet re-ordering code. It may be bogus. 2022-04-29 18:38:23 -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 c42a5759a4 Remove unneeded setLastViewed 2022-04-28 19:17:21 -04:00
Isaac Connor 5aca811d5d Don't delete the socket file because another zms might have opened it and be waiting on the lock. This should remove a ton of zms error messages 2022-04-28 19:16:22 -04:00
Isaac Connor 4ff69c3156 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-04-28 17:14:12 -04:00
Isaac Connor 74fd90cfdd Remove loading=lazy, it breaks ajax 2022-04-28 17:14:06 -04:00
Isaac Connor a247645046 Use std::this_thread::sleep_for(MAX_SLEEP); instead 2022-04-28 17:13:47 -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 aab717bc91 Add early test for zm_terminate after processing comms 2022-04-28 16:45:54 -04:00
Isaac Connor dc055fb240 Remove code handling failure to setStreamStart. This is now ok and handled in runStream 2022-04-28 16:44:39 -04:00