Isaac Connor
|
0d2febc958
|
Make monitor column open the event instead of monitor edit
|
2021-02-24 12:38:12 -05:00 |
Andrew Bauer
|
c8be0d58d5
|
eslint - fix whitespace
|
2021-02-22 19:02:24 -06:00 |
|
Isaac Connor
|
82c4a1a417
|
put third refresh button back for now
|
2021-02-22 11:57:27 -05:00 |
|
Isaac Connor
|
3a8e2ff869
|
Hide duplicated refresh button
|
2021-02-22 11:25:00 -05:00 |
|
Isaac Connor
|
9aad09a735
|
Refresh bootstrap table if the ajax fails.
|
2021-02-22 11:24:30 -05:00 |
|
Isaac Connor
|
9fec32fdc5
|
We now support audio when doing video encoding
|
2021-02-22 09:55:40 -05:00 |
|
Andrew Bauer
|
3fb1054093
|
bstable export requires tableExport plugin
|
2021-02-18 20:22:19 -06:00 |
|
Isaac Connor
|
ba6797a143
|
make definitionPanel have height to fix jumping around as scroll bar appears/disappears
|
2021-02-18 10:25:05 -05:00 |
|
Isaac Connor
|
f0d8a654f8
|
Remove debug, use fewer lines
|
2021-02-17 13:11:55 -05:00 |
|
Isaac Connor
|
aa94795b96
|
When auth is not turned on, show an error instead of login fields.
|
2021-02-16 16:09:23 -05:00 |
|
Isaac Connor
|
317274248b
|
Allow mid= and dupId= in monitor view to allow mid reuse. Alphabetically sort Monitors in LinkedMonitors by name
|
2021-02-16 14:16:59 -05:00 |
|
Isaac Connor
|
71183a6002
|
fix case of vidWidth. Fixes #3162
|
2021-02-14 16:28:08 -05:00 |
|
Isaac Connor
|
231c9303fd
|
Handle null vidWidth
|
2021-02-11 11:50:05 -05:00 |
|
Isaac Connor
|
470739e1d5
|
Add debugging if streamStatus.status doesn't exist
|
2021-02-09 14:24:09 -05:00 |
|
Isaac Connor
|
79ac92c76d
|
spacing
|
2021-02-09 14:23:47 -05:00 |
|
Isaac Connor
|
d4e83620b2
|
Split actions and options columns into 50%
|
2021-02-03 12:57:17 -05:00 |
|
Isaac Connor
|
a7365323dd
|
Split actions and options in filters to fit more horizontally
|
2021-02-03 12:57:17 -05:00 |
|
Isaac Connor
|
c35869fd30
|
Use jquery offset() to get image position
|
2021-02-02 23:19:53 -05:00 |
|
Isaac Connor
|
c8af90fd24
|
Add RTSP Server checkbox
|
2021-02-02 23:19:52 -05:00 |
|
Isaac Connor
|
2996fe3da7
|
fix hiding cloneBtn
|
2021-02-02 23:19:52 -05:00 |
|
Isaac Connor
|
b35e27d0b6
|
Use decodeURIComponent instead of decodeURI
|
2021-02-02 09:12:34 -05:00 |
|
Isaac Connor
|
49d3e5ddbf
|
decodeURI row.Message
|
2021-02-02 09:09:53 -05:00 |
|
Isaac Connor
|
49209d9e72
|
populate mid if specified to enable reusing mids. Fix auto-populating resolution dropdown
|
2021-02-01 16:45:13 -05:00 |
|
Isaac Connor
|
a3fe577fc6
|
Fix margin in ptz buttons
|
2021-01-31 11:45:11 -05:00 |
|
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
|
6bfbb5462a
|
console monitor sort must be a post
|
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
|
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
|
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
|
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
|
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
|
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
|
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 |
|
Isaac Connor
|
8de122ef26
|
remove await that we can't use
|
2021-01-12 14:13:42 -05:00 |
|
Isaac Connor
|
c6cf1da47d
|
Merge branch 'master' into zma_to_thread
|
2021-01-11 17:08:44 -05:00 |
|
Isaac Connor
|
a51dfe552b
|
Remove auth_hash var that overlaps global auth_hash var. Use attr('src') instead of src
|
2021-01-11 16:41:43 -05:00 |
|
Isaac Connor
|
bb50de268b
|
Fix setting img.src to new url. Won't have any effect here as we are reloading the whole page.
|
2021-01-11 15:21:39 -05:00 |
|
Isaac Connor
|
8204d2d7eb
|
Introduce sleep() function. Use it on ajax error to wait 1 second before reloading page
|
2021-01-11 13:57:39 -05:00 |
|
Andrew Bauer
|
1f2c10dcc0
|
replace mootools getelement and addevent
|
2021-01-11 13:47:36 -05:00 |
|
Andrew Bauer
|
2f8f0a0b4a
|
use plain js to get the livestream rather than mootools
|
2021-01-11 13:47:36 -05:00 |
|
Andrew Bauer
|
ac5c821bbd
|
use plain js for mouseover thumb animation
|
2021-01-11 13:47:36 -05:00 |
|
Andrew Bauer
|
4dea379673
|
increase timeout value for streamQuery to avoid contention with streamScale during jpeg playback
|
2021-01-11 13:47:36 -05:00 |
|
Andrew Bauer
|
a761b9c0ff
|
deprecate legacy "stills" option from event view
|
2021-01-11 13:47:34 -05:00 |
|
Andrew Bauer
|
5b40589d61
|
add a button to go to the stats view
|
2021-01-11 13:46:51 -05:00 |
|
Andrew Bauer
|
6796126ae2
|
autohide frame stats when out of pixels
|
2021-01-11 13:46:51 -05:00 |
|
Andrew Bauer
|
61dc0adb60
|
remove extra uneeded on change event handler
|
2021-01-11 13:46:51 -05:00 |
|
Andrew Bauer
|
bbf233b332
|
fix frame view scale control
|
2021-01-11 13:46:51 -05:00 |
|
Andrew Bauer
|
64f755be4a
|
clean up postlogin js
|
2021-01-11 13:46:51 -05:00 |
|
Andrew Bauer
|
751102fa6d
|
eslint
|
2021-01-11 13:46:51 -05:00 |
|
Andrew Bauer
|
8d75f30d22
|
remove unneeded comment
|
2021-01-11 13:46:51 -05:00 |
|
Andrew Bauer
|
2e932571f3
|
autohide the event stats when out of pixels
|
2021-01-11 13:46:51 -05:00 |
|
Andrew Bauer
|
beb74cb54a
|
replace mootools Request.JSON
|
2021-01-11 13:46:51 -05:00 |
|
Andrew Bauer
|
381bf0c219
|
fix cyclePrev with only 1 monitor
|
2021-01-11 13:46:51 -05:00 |
|
Andrew Bauer
|
57da991e7a
|
go back rather than close window
|
2021-01-11 13:46:50 -05:00 |
|
Andrew Bauer
|
638e801c07
|
replace mootools .delay method
|
2021-01-11 13:46:50 -05:00 |
|
Andrew Bauer
|
774d522cee
|
eslint
|
2021-01-11 13:46:50 -05:00 |
|
Andrew Bauer
|
a1678f5ea4
|
replace mootool Cookie object with plain JS
|
2021-01-11 13:46:50 -05:00 |
|
Andrew Bauer
|
d2cc65c8a3
|
eslint
|
2021-01-11 13:46:50 -05:00 |
|
Andrew Bauer
|
a6964f66e2
|
use JS instead of Mootools to detect IE browser
|
2021-01-11 13:46:50 -05:00 |
|
Andrew Bauer
|
fe8561d868
|
replace mootools periodical method
|
2021-01-11 13:46:50 -05:00 |
|
Isaac Connor
|
6d9fa27b37
|
Fix changeScale not updating zms url when the page initially loads as not scale to fit
|
2021-01-11 13:46:50 -05:00 |
|
Isaac Connor
|
0db759ede1
|
split long line
|
2021-01-11 13:46:50 -05:00 |
|
Andrew Bauer
|
1b385ee195
|
show alarm state and fps on zones view
|
2021-01-11 13:46:50 -05:00 |
|
Andrew Bauer
|
29f3e9007a
|
replace mootools in MonitorStream
|
2021-01-11 13:46:50 -05:00 |
|
Andrew Bauer
|
70f73f5475
|
modernize monitors view
|
2021-01-11 13:46:50 -05:00 |
|
Andrew Bauer
|
cf10ce010c
|
tableExport plugin is no longer used
|
2021-01-11 13:46:50 -05:00 |
|
Andrew Bauer
|
aeec7b025d
|
remove js files that define popupSizes
|
2021-01-11 13:46:50 -05:00 |
|
Andrew Bauer
|
5c6e093b13
|
old overlay code is no longer used
|
2021-01-11 13:46:50 -05:00 |
|
Andrew Bauer
|
69268f79a4
|
remove obsolete controlpreset js files
|
2021-01-11 13:46:50 -05:00 |
|
Andrew Bauer
|
590d65671c
|
WIP jquery conversion
|
2021-01-11 13:46:50 -05:00 |