Isaac Connor
|
ee5d5e3cab
|
wrap fps text in another div to make the title easier to bring up and include the word fps
|
2021-01-31 10:19:10 -05:00 |
|
Isaac Connor
|
69b9e40b59
|
Fix textstatus=>textStatus
|
2021-01-31 10:09:22 -05:00 |
|
Isaac Connor
|
4ba939e267
|
role=tabList needs to be role=tablist
|
2021-01-29 20:37:55 -05:00 |
|
Isaac Connor
|
927d11a6a4
|
Fix tags not allowed under ul
|
2021-01-29 20:37:34 -05:00 |
|
Isaac Connor
|
c444e5cf07
|
spacing
|
2021-01-29 14:05:04 -05:00 |
|
Isaac Connor
|
ec1a7ec427
|
scale the event width when calculating if the stats table will fit
|
2021-01-29 14:03:12 -05:00 |
|
Isaac Connor
|
379538b3db
|
Make the monitor name at the top a link to monitor edit
|
2021-01-29 09:53:30 -05:00 |
|
Isaac Connor
|
ae41998d7c
|
Add a check for passthrough and not ffmpeg
|
2021-01-29 09:53:11 -05:00 |
|
Isaac Connor
|
5524090a80
|
Remove sleep function. Not going to work anyways
|
2021-01-28 16:17:15 -05:00 |
|
Isaac Connor
|
e4c6709eca
|
ensure options always has width and height set
|
2021-01-27 13:07:31 -05:00 |
|
Isaac Connor
|
6bfbb5462a
|
console monitor sort must be a post
|
2021-01-27 11:48:32 -05:00 |
|
Isaac Connor
|
07fa507efe
|
improve error message when trying to control a remote camera
|
2021-01-27 11:48:32 -05:00 |
|
Isaac Connor
|
28a004c324
|
Must load ServerId so that we can tell if it is local or remote
|
2021-01-27 11:48:32 -05:00 |
|
Isaac Connor
|
bacf4a1aca
|
Add 640x360 resolution
|
2021-01-26 17:54:22 -05:00 |
|
Isaac Connor
|
410b9840d1
|
fix eslint
|
2021-01-26 17:44:23 -05:00 |
|
Isaac Connor
|
491cc1dfe3
|
ImageBufferCount can now be as low as 2
|
2021-01-26 15:37:32 -05:00 |
|
Isaac Connor
|
69626651ff
|
ImageBufferCount can now be as low as 2
|
2021-01-26 15:33:38 -05:00 |
|
Isaac Connor
|
4dcce4ac95
|
Merge branch 'rtsp_server'
|
2021-01-26 14:22:10 -05:00 |
|
Isaac Connor
|
671d58f0d0
|
bump version and put back ZM_MIN_RTSP_PORT setting
|
2021-01-26 12:35:17 -05:00 |
|
Isaac Connor
|
dc9c7a7e15
|
handle event not existing a little better.
|
2021-01-25 18:49:03 -05:00 |
|
Isaac Connor
|
4b5052c351
|
use my bindButton function on the othe rbuttons
|
2021-01-25 18:48:47 -05:00 |
|
Isaac Connor
|
1b9f448aca
|
handle event not existing a little better. Show back button for example.
|
2021-01-25 18:48:20 -05:00 |
|
Isaac Connor
|
973533c809
|
Use method to handle case where Event wasn't found
|
2021-01-25 18:39:57 -05:00 |
Pliable Pixels
|
ed2a50f4ae
|
add permission check
|
2021-01-23 16:18:40 -05:00 |
|
Pliable Pixels
|
68dac0e406
|
new api to control daemon
|
2021-01-23 14:22:52 -05:00 |
|
Isaac Connor
|
ea8f264724
|
Merge branch 'release-1.34'
|
2021-01-22 15:54:06 -05:00 |
|
Isaac Connor
|
d3c84a168a
|
Remove the word All from the mark column on console. I think the UX is pretty universal by now.
|
2021-01-22 15:51:31 -05:00 |
|
Isaac Connor
|
cd9f10695d
|
correct colours in links, navbar buttons. sync colours of monitor filter text inputs to match chosen dropdown. make options sidebar black. Remove redundant layout duplicated from base.
|
2021-01-22 15:51:04 -05:00 |
|
Isaac Connor
|
c7ef587d5d
|
Shirnk colMark because I got rid of the word All in the header. Make the monitor filters inline-block which makes them flow with their label when narrow
|
2021-01-22 15:47:44 -05:00 |
|
Isaac Connor
|
436cd3397b
|
apply a top/bottom margin to buttons of 1px to create a tiny space between buttons and console table. Remove commented out styles
|
2021-01-22 15:46:48 -05:00 |
Andrew Bauer
|
e3fdfa659a
|
fix typo and disable settings btn rather than hide
|
2021-01-19 10:32:18 -06:00 |
|
Andrew Bauer
|
c13d2ea99f
|
make watch view event list more efficient
|
2021-01-19 10:10:51 -06:00 |
|
Andrew Bauer
|
b9c0823774
|
don't install tools folder
|
2021-01-18 07:41:08 -06:00 |
|
Andrew Bauer
|
68819a86a0
|
remove mootools from zoneminder
|
2021-01-18 07:31:43 -06:00 |
|
Isaac Connor
|
cb90c06cde
|
Merge branch 'master' into zma_to_thread
|
2021-01-17 17:38:34 -05:00 |
|
Isaac Connor
|
5186ae2433
|
use bindButton
|
2021-01-16 13:17:46 -05:00 |
|
Isaac Connor
|
50af7f25b8
|
Use less memory in event querying. More work to do here
|
2021-01-16 13:17:46 -05:00 |
|
Isaac Connor
|
3dc35c49a2
|
quotes
|
2021-01-16 13:17:46 -05:00 |
|
Isaac Connor
|
d98dde4aee
|
Use auth hash in event loading. Use monitorURL in ajax calls that need to talk to zms. Use bindButton to handle the non-existence of settings button.
|
2021-01-16 13:17:46 -05:00 |
|
Isaac Connor
|
6586aa6338
|
Introduce a helper function bindButton to do the button event binding with nice error logging.
|
2021-01-16 13:17:46 -05:00 |
|
Isaac Connor
|
1e59c5bbde
|
Merge branch 'release-1.34'
|
2021-01-15 18:46:07 -05:00 |
|
Isaac Connor
|
b019a759a3
|
ffmpeg options doesn't support loglevel setting. SO remove it from help. Fixes #3109
|
2021-01-15 18:43:49 -05:00 |
|
Isaac Connor
|
f2fea95f4b
|
Merge branch 'master' into zma_to_thread
|
2021-01-14 13:02:52 -05:00 |
|
Isaac Connor
|
ad330cb949
|
Make images in modals max-width: 100% so they fit within the modal.
|
2021-01-14 12:56:54 -05:00 |
|
Isaac Connor
|
7d08f24895
|
use pageX and pageY instead of page.x and page.y
|
2021-01-14 12:56:54 -05:00 |
|
Isaac Connor
|
16db59ecb1
|
use pageX and pageY instead of page.x and page.y
|
2021-01-14 10:33:03 -05:00 |
|
Isaac Connor
|
9a824716b5
|
Fix clicking on pills committing the form. Remove hidden inputs and use pills to toggle visibility of divs instead. rename newControl to Control. Use button as the action input
|
2021-01-12 18:41:24 -05:00 |
|
Isaac Connor
|
ef2f126eaa
|
Merge branch 'master' into zma_to_thread
|
2021-01-12 14:37:25 -05:00 |
|
Isaac Connor
|
81acf4bf69
|
Fix ul nesting. Add navbar-nav to collapsed nav elements to fix spacing.
|
2021-01-12 14:29:53 -05:00 |
|
Isaac Connor
|
0a9681636f
|
rename getAcct to getAccount
|
2021-01-12 14:20:05 -05:00 |