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

21838 Commits (75430dad9e08beb40c2533f705128c9e2a96ac9b)

Author SHA1 Message Date
Isaac Connor 75430dad9e Remove flip code as we are using the code in skin.js now. Instead of setting height to auto, just clear it so that css rules apply. 2023-01-16 16:38:35 -05:00
Isaac Connor b517af6d29 add styles to handle stick headers on montage 2023-01-16 16:38:35 -05:00
Isaac Connor 3b0843d8d0 Specify form on filter view is 100% so that scroll bars happen 2023-01-16 16:38:35 -05:00
Isaac Connor 992984b0cd Add #content and #monitor divs so we can do stick navbar on monitor view 2023-01-16 16:38:35 -05:00
Isaac Connor 450007b860 Use getBodyTopHTML(); in watch view so that we pick up the sticky class 2023-01-16 16:38:35 -05:00
Isaac Connor 9089501bd8 Remove flexbox from #content because it is now on #page 2023-01-16 16:38:35 -05:00
Isaac Connor 5a990cb9cb Add #page div for consistency also we are going to use it instead of #content for flexbox 2023-01-16 16:38:35 -05:00
Isaac Connor 3e1c816914 Merge divs and remove h-100 on sidebar ul that causes content to wrap sideways 2023-01-16 16:38:35 -05:00
Isaac Connor 26dfee496e Use getBodyTopHTML(); in groups view so that we pick up the sticky class 2023-01-16 16:38:35 -05:00
Isaac Connor 2c6c7467f9 Add overflow styles to columns in options 2023-01-16 16:38:35 -05:00
Isaac Connor 9c15f794bf Add overflow style to filter form so that it scrolls when using sticky headers 2023-01-16 16:38:35 -05:00
Isaac Connor cb6d819c1e Make #page flex as well when sticky. 2023-01-16 16:38:35 -05:00
Isaac Connor b070749061 Split content div containing buttons from monitorlist so that we can position them separately 2023-01-16 16:38:35 -05:00
Isaac Connor aa911f8968 Update logs view to make sticky headers work 2023-01-16 16:38:35 -05:00
Isaac Connor ecf5089051 add flex styles to form and overflow to monitor list. These don't really have any effect normally so I havn't added a .sticky selector to them. 2023-01-16 16:38:35 -05:00
Isaac Connor 4f6a26dea9 Add styles so that when body has a .sticky class, we use flexbox to make content fill the browser, and we can then make sub content scrollable so that navbars are sticky 2023-01-16 16:38:35 -05:00
Isaac Connor 907d00ffc7 Add ZM_WEB_NAVBAR_STICKY to web options 2023-01-16 16:38:35 -05:00
Isaac Connor 5dc658dd55 add sticky class to body when ZM_WEB_NAVBAR_STICKY is set. Remove it from navbar. 2023-01-16 16:38:35 -05:00
Isaac Connor b82b8d2b67 Remove debug, add willReadFrequently: true to canvas ctx. 2023-01-16 16:38:35 -05:00
Isaac Connor 0af2a3eb10 Make header navbar sticky, make entire second navbar go away when minmised. 2023-01-16 16:38:35 -05:00
Isaac Connor 17e9a64f91 Remove frames loading code. We do it via api now. 2023-01-16 16:38:35 -05:00
Isaac Connor ab2769ea48 Bulk load frames instead of by individual event 2023-01-16 16:38:35 -05:00
Isaac Connor 98b6ed534e
Merge pull request #3653 from bradnewfield/patch-1 
Corrected code block syntax
 2023-01-16 12:26:27 -05:00
bradnewfield 3cf8954878
Corrected code block syntax 2023-01-17 06:08:51 +13:00
Isaac Connor d059806573 fix UrlToApi => urlToApi 2023-01-13 13:50:05 -05:00
Isaac Connor b9a1e1cb6c use ajax() instead of getJSON so we can specify no timeout 2023-01-13 13:43:39 -05:00
Isaac Connor cb87d04b3e Move api page content from options.php to _options_api.php 2023-01-13 13:42:23 -05:00
Isaac Connor 292f3a0cc2 Remove reference to zm.connortechnology.com 2023-01-13 12:48:26 -05:00
Isaac Connor 1236b366a1 Need to index into servers array using 0 not '' 2023-01-13 12:48:02 -05:00
Isaac Connor b1486783e3 Add a 5 second cycle option 2023-01-13 12:34:51 -05:00
Isaac Connor 8b75a2510a Change to ssize_t to fix compile on freebsd 2023-01-12 13:07:29 -05:00
Isaac Connor cf0bc32fd4 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-01-12 10:19:11 -05:00
Isaac Connor a8c80fde27 Update monitor preset view: Use a submit button instead of input with javascript. Remove no longer needed js code. Sort presets by Name. 2023-01-12 10:01:40 -05:00
Isaac Connor 2e6f465055 eslint doesn't like function names that start with a capital 2023-01-12 09:38:13 -05:00
Isaac Connor 427201abd5 Fix eslint 2023-01-12 09:37:53 -05:00
Isaac Connor 95f9e0b19a Fix crash from getting packet from rend 2023-01-12 09:25:44 -05:00
Isaac Connor 4dbc198fd0 Only load events when not in live mode 2023-01-12 09:03:48 -05:00
Isaac Connor 7bac75dc35 Add zoneminder org to githuib sponsors 2023-01-11 15:41:39 -05:00
Isaac Connor 32add0952c Differentiate between negative pts and AV_NOPTS_VALUE when looking for wrap around. 2023-01-10 14:19:40 -05:00
Isaac Connor 1ee526444b populate monitor_names array to we can output the dropdown 2023-01-10 12:07:35 -05:00
Isaac Connor 0befc7796a Add code to populate dropdown input for attr type Monitor. 2023-01-10 12:07:35 -05:00
Isaac Connor ca513c0a74 Add deleting status to debug 2023-01-10 12:07:35 -05:00
Isaac Connor 6e014949b4 Don't require zmc to be running to show a thumbnail. zms will say unable to connect, but at least later we can mouse over and get an updated image. 2023-01-10 12:07:35 -05:00
Isaac Connor 90fd604f0e
Merge pull request #3652 from baudneo/add_janus_rtsp_session_timeout 
Add janus rtsp session timeout
 2023-01-09 21:27:04 -05:00
baudneo aed2442220
Add Discord logo and link. 
Signed-off-by: baudneo <86508179+baudneo@users.noreply.github.com>
 2023-01-09 17:57:27 -07:00
baudneo cc611129b6
Add RTSPServer help, Add Janus RTSP session timeout help. 
Signed-off-by: baudneo <86508179+baudneo@users.noreply.github.com>
 2023-01-09 17:57:27 -07:00
baudneo aab62c5a7e
Add Janus RTSP session timeout to PHP (front end) ⚗️ 
Signed-off-by: baudneo <86508179+baudneo@users.noreply.github.com>
 2023-01-09 17:57:26 -07:00
baudneo 8750e0e333
Add Janus RTSP session timeout to C ⚗️ 
Signed-off-by: baudneo <86508179+baudneo@users.noreply.github.com>
 2023-01-09 17:57:26 -07:00
baudneo eca1f5d2fd
Typo ✏️ 
Signed-off-by: baudneo <86508179+baudneo@users.noreply.github.com>
 2023-01-09 17:57:26 -07:00
baudneo 7590cf8691
SQL: Add base and provide upgrade file 
Signed-off-by: baudneo <86508179+baudneo@users.noreply.github.com>
 2023-01-09 17:57:25 -07:00