Commit Graph
20453 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 923a98f000 At least test for valid shmem for monitors with capturing=OnDemand or Decoding=OnDemand 2022-05-10 11:46:11 -04:00
Isaac Connor 18726f800d Remove deprecated case of scale=fixed. 2022-05-10 10:30:59 -04:00
Isaac Connor 0cdb926e9e Remove unused variable 2022-05-10 09:30:13 -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 05155cff73 Zoom by 10% instead of 25% 2022-05-07 11:38:10 -04:00
Isaac Connor 3804f6c66c Finally fix centering of zoomed image 2022-05-07 11:37:58 -04:00
Isaac Connor 8d38d1c36e Implement 25% zoom incrementts with no max 2022-05-06 12:11:47 -04:00
Isaac Connor f7025bcf97 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-05-06 11:45:22 -04:00
Isaac Connor a8583086ce Rework zooming. We now crop first, then scale to retain image fidelity as much as possible. More work to be done but is working better than the old code and I think is more readable. This also makes Box a class member instead of a static 2022-05-06 11:45:12 -04:00
Isaac Connor fc4381b180 Add Width() and Height() to Box. 2022-05-06 11:43:49 -04:00
Isaac Connor 442dff3f8a Implement a Scale(new_width, new_height) using sw_scale. 2022-05-06 11:43:35 -04:00
Isaac Connor 27ba6a8159 Shorten the time we hold the event lock when closing the event 2022-05-05 09:06:44 -04:00
Isaac Connor e5e2223cae bump version to 1.37.15 to pickup db update for System added to Config 2022-05-04 13:04:14 -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 b57c835ec6 Make ZM_PATH_FFMPEG a System config entry. Meaning it can only be set in /etc/zm/conf.d. Update help text to mention this. 2022-05-04 13:00:54 -04:00
Isaac Connor 6afd0ccfaf cleanup code and update System column in Config table on zmupdate.pl -f 2022-05-04 12:58:49 -04:00
Isaac Connor e297bfcfd4 Add System to Config table 2022-05-04 12:58:14 -04:00
Isaac Connor 4c5f5b0af0 Add ZM_PATH_FFMPEG to 01-system-paths.conf 2022-05-04 12:57:39 -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 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