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

4474 Commits (2c0a9528b38aa67ead53a2233767ff0fec8ef424)

Author SHA1 Message Date
Isaac Connor 2c0a9528b3 Fix behaviour of layout,width,height scale etc. Height is a special case, it works differently than the rest. Use MonitorStream.js functions for setting the width/height and scale of the zms url. The img is always 100% width and height, everything is set in the containing divs. 2022-04-10 17:26:23 -04:00
Isaac Connor 37d0b6e606 Add some basic sanity checks for width & height == 0 2022-04-07 19:38:43 -04:00
Isaac Connor a58111fa46 Rough in an onclick handler for the monitor tabs so that we can store the selected tab value 2022-04-07 13:17:02 -04:00
Isaac Connor 0fc6ffe359 Use non-minified chosen.js because we made changes. 2022-04-07 13:15:15 -04:00
Isaac Connor 229f159069 If the select is hidden, it will have 0 width. So instead return 100% 2022-04-07 13:14:58 -04:00
Isaac Connor e9f248def7 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-04-06 14:58:52 -04:00
Isaac Connor 10383d775a Fix on-change-this to data-on-change-this and remove an extra /tr 2022-04-06 14:58:42 -04:00
Isaac Connor 906951e450 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-04-06 10:37:10 -04:00
Isaac Connor 0e337cd8bf Remove support for Cambozola which no longer works or is needed. 2022-04-06 10:37:02 -04:00
Isaac Connor 6d17aa4b77 Don't always default to Freeform. Also update some code in selectLayout 2022-04-04 17:47:45 -04:00
Isaac Connor 717dfff0c4
Merge pull request #3456 from exuvo/master 
ffmpeg change
 2022-04-03 14:59:35 -04:00
Isaac Connor 19d823497e Add id's to nav row divs to facilitate styling. Only output third row if it has contents 2022-03-30 13:16:49 -04:00
Isaac Connor 474b6f1a2f Allow editing of admin user. Hide snapshots permission if the feature is turned off 2022-03-29 17:19:31 -04:00
Isaac Connor 40014588d4 Put the monitor Id first instead of stuck on the end of the Name 2022-03-29 17:16:25 -04:00
Isaac Connor 5618d242f9 Change from DecodingEnabled to Decoding, and move to Source tab 2022-03-28 17:57:16 -04:00
Isaac Connor 0e4c175aba clean up debug 2022-03-28 13:49:46 -04:00
Isaac Connor d6e504aa34 trim all monitor inputs before looking for errors. No inputs should have whitespace at beginning or end 2022-03-28 13:47:45 -04:00
Isaac Connor 2b8fee80de escape html in Storage names 2022-03-21 16:06:52 -04:00
Isaac Connor 08598ace6b remove space 2022-03-20 19:13:46 -04:00
Isaac Connor b67185fe9c Fix alignment on Capture Method 2022-03-20 19:13:46 -04:00
Isaac Connor 13f403c56e fix eslint 2022-03-13 08:47:11 -04:00
Isaac Connor 9aeeb58014 Fix missed Function => Capturing == None 2022-03-13 08:37:33 -04:00
Exuvo 7924fa6326 Add webm as allowed output format 2022-03-11 21:46:09 +01:00
Exuvo 9fd0a94c9f Add support for vp9 and av1 encoding 2022-03-11 13:37:27 +01:00
Isaac Connor 550693af10 Add a pattern to prevent invalid username characters 2022-03-10 14:10:31 -05:00
Isaac Connor 07aa171c04 Output valid html only for Username to prevent XSS 2022-03-10 14:10:04 -05:00
Isaac Connor c395d46cc8 Split options into Capturing, Analysing, Recording tabs 2022-03-10 13:54:38 -05:00
Javier Gonzalez cc3b5421f5 Adding recording status to console 2022-03-09 19:59:21 +01:00
Isaac Connor 10402fdabe Use template backticks for the Notes string to handle multi-line 2022-03-04 13:41:19 -05:00
Isaac Connor 1fb42d0b77 Change api of selectLayout. Now takes a value. use MonitorStream.setScale to set image scale. In general fix behaviour when switching between fixed sizes, scales and layouts 2022-03-04 12:08:29 -05:00
Isaac Connor 494da65b9a Replace use of Function with Recording 2022-02-28 15:46:38 -05:00
Isaac Connor 7283f8629a Function dropdown no longer exists 2022-02-28 15:44:15 -05:00
Isaac Connor 433782bd6e disable yellow dot when analysing turned off. Enabled is gone... need to do a more interesting check 2022-02-28 13:34:51 -05:00
Isaac Connor 1ae8fcae63 add a label for rateControl 2022-02-27 14:31:04 -05:00
Isaac Connor 5b319258c4 fix eslint 2022-02-27 14:26:05 -05:00
Isaac Connor e33b41745d Merge branch 'master' into replace_function_concept 2022-02-27 14:04:01 -05:00
Isaac Connor 1d15de0534 Make getMonitorCapturingOptions a member of the class, so can call it getCapturingOptions. Same with Analysing and Recording options 2022-02-27 14:03:48 -05:00
Isaac Connor 6fc5803e16 Add another clearInterval to prevent looping during window.location 2022-02-25 15:54:56 -05:00
Isaac Connor 813fd36b0a clearInterval when location.replacing so that timer stops. Prevents infinite loop 2022-02-25 14:13:18 -05:00
Ben Dailey b2428b5522 Merge branch 'master' into lazy-load-images 2022-02-22 08:47:26 -05:00
Isaac Connor 831dca814f Include EndDateTimeShort in event stats 2022-02-22 08:31:41 -05:00
Isaac Connor dfb6a96b42 Handle empty endtime more gracefully. If there is a next event just jump to it. 2022-02-22 08:31:41 -05:00
Isaac Connor 5aef8408a4 serialize form instead of just passing filter id because the modal can now handle unsaved filters 2022-02-22 08:31:41 -05:00
Ben Dailey e4f5f59e8d 3 more img tags 2022-02-22 08:31:41 -05:00
Ben Dailey ce267c7e3c Most programmatic images are lazy. 2022-02-22 08:31:02 -05:00
Isaac Connor a40b305065 Merge branch 'master' into replace_function_concept 2022-02-20 09:52:03 -05:00
Isaac Connor 1a54a96c04 Improve title on alarm buttons when we don't have permission. Move onclick from data-on-click to setup in initPage only if permitted 2022-02-18 17:11:18 -05:00
Isaac Connor adf8413333 Include EndDateTimeShort in event stats 2022-02-17 13:31:25 -05:00
Isaac Connor 8dedac1a21 Handle empty endtime more gracefully. If there is a next event just jump to it. 2022-02-17 13:30:50 -05:00
Isaac Connor cd2c977ed8 Merge branch 'master' into replace_function_concept 2022-02-16 14:25:38 -05:00