Andrew Bauer
f64f3262ed
WIP replace mootools in evnet.js
2020-12-23 12:19:35 -06:00
Andrew Bauer
f857d12103
WIP replace mootools in event.js
2020-12-23 10:51:23 -06:00
Andrew Bauer
493bfa6a16
eslint
2020-12-23 09:15:31 -06:00
Andrew Bauer
3c79204592
replace mootools in add_monitors
2020-12-23 08:54:11 -06:00
Isaac Connor
286a5a72a3
Merge branch 'master' into zma_to_thread
2020-12-23 09:47:31 -05:00
Andrew Bauer
c91a0b2c09
fixup jquery click functions
2020-12-23 08:37:28 -06:00
Andrew Bauer
c497b94378
use tlzoom class to avoid conflict with thumbnail zoom
2020-12-23 07:57:44 -06:00
Andrew Bauer
a9b92905ca
eslint
2020-12-22 19:07:12 -06:00
Isaac Connor
a1917d83d0
Merge branch 'master' into zma_to_thread
2020-12-22 19:52:09 -05:00
Andrew Bauer
cc5a732103
continue work on timeline.js
2020-12-22 16:06:21 -06:00
Isaac Connor
6be9b294ef
Hidden and hidden are two very different classes
2020-12-22 17:00:07 -05:00
Andrew Bauer
8a26252914
update object detected link in events
2020-12-22 12:42:27 -06:00
Andrew Bauer
ee45916526
move objdetect image to a modal
2020-12-22 10:08:31 -06:00
Andrew Bauer
cbe04674c5
remove non-existent id preview
2020-12-21 15:59:05 -06:00
Andrew Bauer
d080109f4b
eslint
2020-12-21 15:20:38 -06:00
Andrew Bauer
663748d9a7
partial replace mootools
2020-12-21 13:07:14 -06:00
Andrew Bauer
1f3fd93296
use setTimeout instead of mootools pass
2020-12-20 15:21:38 -06:00
Andrew Bauer
92361210ce
eslint
2020-12-20 15:07:16 -06:00
Andrew Bauer
1d6c4664dc
replace mootools in export
2020-12-20 10:54:18 -06:00
Andrew Bauer
0b569e7e37
replace mootools in control.js
2020-12-20 08:29:39 -06:00
Andrew Bauer
66ae2c0461
replace mootools request JSON
2020-12-20 07:59:17 -06:00
Isaac Connor
0104e2ba7f
Add a sorted_monitor_ids array to use when generating sorted lists of monitors. Return proper json when things aren't set instead of empty string. Use sorted_monitor_ids to populate the monitor dropdown in filters
2020-12-18 10:23:41 -05:00
Isaac Connor
a855656b88
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
2020-12-17 09:27:23 -05:00
Isaac Connor
5602b92699
Fix issue with timeline where it only shows first frame
2020-12-17 09:26:59 -05:00
Isaac Connor
7f9b977ec2
rename onDownClick to onRenameClick cutnpaste error
2020-12-15 16:57:27 -05:00
Isaac Connor
7dc4633d27
rename onDownClick to onRenameClick cutnpaste error
2020-12-15 16:56:05 -05:00
Isaac Connor
de38c29e83
Fix lack of # for zoomvalue
2020-12-15 15:56:41 -05:00
Isaac Connor
e123322d06
Merge branch 'master' into rtsp_server
2020-12-15 11:00:13 -05:00
Isaac Connor
99e7ae3505
Merge branch 'master' into rtsp_server
2020-12-15 10:14:19 -05:00
Isaac Connor
aed83cab31
Load delconfirm content on demand
2020-12-15 10:11:30 -05:00
Andrew Bauer
a5b945f97a
touch up event view stat list
2020-12-14 06:55:45 -06:00
Andrew Bauer
4ae47659df
use js to build event stats
2020-12-13 21:19:38 -06:00
Andrew Bauer
882447317a
eslint
2020-12-13 14:42:39 -06:00
Andrew Bauer
c24564e0cd
insert frame stats into frame view
2020-12-13 13:20:26 -06:00
Andrew Bauer
237335c022
watch.js - finish mootools replacement
2020-12-12 12:45:36 -06:00
Isaac Connor
c26fc1f36a
Replace thisUrl with the export ajax request as a GET parameter, making it easier to find inlogs.
2020-12-11 09:42:35 -05:00
Isaac Connor
c37433acfc
show/hide DecodingEnabled depending on function
2020-12-10 16:24:33 -05:00
Isaac Connor
5c1135b2a7
Merge branch 'master' into no_decode
2020-12-10 15:15:32 -05:00
Isaac Connor
b12f1cce5b
add Function help text to monitor view
2020-12-10 14:32:17 -05:00
Isaac Connor
66a1660423
Add missing comma
2020-12-10 14:08:01 -05:00
Isaac Connor
4667e21636
Add DecodingEnabled to Function modal
2020-12-10 14:06:40 -05:00
Isaac Connor
37d4b3472f
Add useful help for function modal describing each mode and the purpose of the Enabled checkbox
2020-12-10 13:43:28 -05:00
Andrew Bauer
3a4cdb7e50
eslint
2020-12-09 20:06:38 -06:00
Andrew Bauer
e0ac68786f
remove unneeded thumb animation functions from frames.js
2020-12-09 18:48:58 -06:00
Andrew Bauer
39023b3e7b
don't set zoom class in frames.js
2020-12-09 18:19:10 -06:00
Andrew Bauer
026b8cfb0c
eslint
2020-12-09 17:58:46 -06:00
Isaac Connor
28a3868069
report both capture_fps and analysis_fps
2020-12-09 15:03:33 -05:00
Andrew Bauer
951debab7f
watch.js - replace mootools ajax w/ jquery
2020-12-09 12:25:40 -06:00
Andrew Bauer
4e09a32836
fix one canEdit
2020-12-08 14:36:19 -06:00
Andrew Bauer
69e540c104
deploy canView and canEdit js objects
2020-12-08 14:25:48 -06:00
Isaac Connor
63c483ba92
canEditMonitors is set in skin.js.php
2020-12-08 11:27:18 -05:00
Isaac Connor
b261fbb397
Merge branch 'master' into zma_to_thread
2020-12-07 16:26:26 -05:00
Andrew Bauer
691f9a70f9
eslint
2020-12-07 14:44:45 -06:00
Andrew Bauer
1772d37c08
convert updatePresetLabels() to jquery
2020-12-07 12:32:07 -06:00
Andrew Bauer
389ad22dcd
watch.js - target not $target
2020-12-07 10:36:14 -06:00
Andrew Bauer
6e17b04a7e
WIP continue jquery conversion of watch.js
2020-12-07 10:22:54 -06:00
Andrew Bauer
0bf39dc954
fix setting the thumbnail class in events
2020-12-04 14:44:05 -06:00
Andrew Bauer
21aeccb5d0
centralize thumb animation js, add delay
2020-12-04 14:35:39 -06:00
Isaac Connor
11f527514e
use a common function for datetime changes.
2020-12-04 15:28:26 -05:00
Andrew Bauer
e93de2a3a4
partial jquery convesion of watch.js
2020-12-03 13:12:01 -06:00
Andrew Bauer
74fe47c4c5
don't autorefresh watch view table
2020-12-03 08:31:52 -06:00
Andrew Bauer
dd0cac35fe
include filterquery in watch view event list ajax
2020-12-03 07:53:09 -06:00
Andrew Bauer
a38c392266
eslint
2020-12-03 07:22:32 -06:00
Andrew Bauer
d5df996bca
deploy animated thumbnails on watch view
2020-12-02 19:44:12 -06:00
Andrew Bauer
f13533cab7
convert export functions to jquery
2020-12-02 10:53:55 -06:00
Isaac Connor
48775e2230
Fix Clear Log by using minTime and maxTime as timestamps. Fix export including unselected filters. Can't just serialize the form asit may contain fields in teh querystring so you get an array of values instead of a single value
2020-12-01 14:24:41 -05:00
Andrew Bauer
051e361958
eslint
2020-12-01 12:19:01 -06:00
Andrew Bauer
f12c8f453e
after deleting an event, call streamNext rather than reload
2020-12-01 09:30:06 -06:00
Andrew Bauer
23fcd1f2c5
modernize the event playback view
2020-12-01 09:07:42 -06:00
Andrew Bauer
a67fb0bb16
eslint
2020-11-26 19:28:25 -06:00
Andrew Bauer
8d8054bc0f
deploy bstable to watch view
2020-11-26 17:00:05 -06:00
Andrew Bauer
08dabf1a4f
don't add "zoom" class when thumb animation is off
2020-11-25 13:29:14 -06:00
Andrew Bauer
28614ce703
change where we check for web_animate_thumbs
2020-11-25 13:16:11 -06:00
Andrew Bauer
ff4b0e6309
add option to disable thumb animation
2020-11-25 13:03:16 -06:00
Andrew Bauer
f3756def08
deploy server side pagination for frames view
2020-11-14 14:45:22 -06:00
Andrew Bauer
9aa6fea6a3
frames view server pagination WIP
2020-11-14 14:19:28 -06:00
Andrew Bauer
52e747791d
rough in frames server pagination backend
2020-11-13 12:34:01 -06:00
Isaac Connor
df783f4835
Merge branch 'master' into zma_to_thread
2020-11-12 12:53:55 -05:00
Isaac Connor
68cdd2123d
Merge branch 'release-1.34'
2020-11-05 13:55:15 -05:00
Isaac Connor
746882ba85
Get rid of zmEventScaleAuto cookie. Just use the per monitor zmEventScale cookie. Fixes #3070
2020-11-05 13:45:02 -05:00
Isaac Connor
af9e279f9e
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:55:27 -05:00
Isaac Connor
d75e93249c
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:54:12 -05:00
Isaac Connor
9d22de98a3
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:53:45 -05:00
Isaac Connor
0d404ac66f
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:50:45 -05:00
Andrew Bauer
3d795be864
remove the thumbnail col if WEB_LIST_THUMBS is off
2020-11-01 15:46:43 -06:00
Andrew Bauer
824f38c746
hide settings buttons rather than disable for non Local monitors
2020-11-01 08:05:53 -06:00
Isaac Connor
686f793d09
fix truth value for ZM_OPT_USE_GEOLOCATION
2020-10-28 12:49:39 -04:00
Isaac Connor
df788f2810
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-28 12:40:00 -04:00
Isaac Connor
c67b3c5a1f
fix button disabled status. We now have checkboxes that aren't actions so we need to be more explicit
2020-10-26 18:49:41 -04:00
Andrew Bauer
fad4339713
no need for full page reload with server pagination
2020-10-26 12:12:50 -05:00
Isaac Connor
59cf5c33c2
reset search on events load
2020-10-26 13:06:22 -04:00
Andrew Bauer
e5563dc901
remove unwanted #
2020-10-25 16:06:37 -05:00
Andrew Bauer
6d00924c9b
deploy server pagination for events view
2020-10-25 12:11:34 -05:00
Andrew Bauer
cb073950b9
events view server pagination WIP
2020-10-25 10:28:22 -05:00
Isaac Connor
a2dc4b5f08
handle params.daa not existing
2020-10-24 09:45:38 -04:00
Isaac Connor
efaf95beda
dirty hack to rename data.filter to data.advsearch
2020-10-24 08:51:26 -04:00
Isaac Connor
da080d44c1
rename filter from bootstrap-table to advsearch so as not to conflict with our existing filter
2020-10-23 16:44:50 -04:00
Isaac Connor
ad137adb4c
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-23 11:30:19 -04:00
Andrew Bauer
d425d1006e
push newevents.php to master
2020-10-23 10:21:32 -05:00
Isaac Connor
d62a5caccd
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-23 09:35:13 -04:00
Isaac Connor
90e81c5774
Merge branch 'release-1.34'
2020-10-23 09:34:35 -04:00
Andrew Bauer
230f35f0c0
comment out debug in events.js
2020-10-22 08:50:06 -05:00
Isaac Connor
9372b2ef8c
remove debug
2020-10-22 08:53:05 -04:00
Isaac Connor
2eda49333f
Merge branch 'master' into zma_to_thread
2020-10-20 16:20:29 -04:00
Andrew Bauer
b5aa215e31
WIP events view server pagination
2020-10-20 12:59:30 -05:00
Andrew Bauer
6357c02ec9
WIP events view server pagination
2020-10-20 12:13:12 -05:00
Isaac Connor
5b27d77ea4
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-20 11:52:25 -04:00
Isaac Connor
1a77958548
Make loading the function modal happen on click instead of every page load.
2020-10-20 11:52:18 -04:00
Andrew Bauer
bfa45b0c43
continue work on event view server pagination
2020-10-20 08:10:43 -05:00
Andrew Bauer
4e391708f1
event view server pagination WIP
2020-10-19 14:18:21 -05:00
Isaac Connor
0e63874533
fix calling changeScale when scale is 0 instead of auto
2020-10-19 14:28:21 -04:00
Isaac Connor
127ef9a130
Fix scaling when using ScaleToFit
2020-10-19 14:28:02 -04:00
Andrew Bauer
7ae7e05f14
roughin ajax call in event.js for server side pagination
2020-10-19 09:29:39 -05:00
Isaac Connor
e2b76257eb
Merge branch 'release-1.34'
2020-10-19 09:10:28 -04:00
Andrew Bauer
6f45de04f8
partial roughin ajax event view server side pagination
2020-10-19 07:50:11 -05:00
Andrew Bauer
97d05c2f88
move newlog ajax request to log
2020-10-18 07:20:59 -05:00
Isaac Connor
220a89b459
fix eslint
2020-10-17 16:17:30 -04:00
Andrew Bauer
1ed160866b
add legacy watch view alarm buttons to toolbar
2020-10-16 15:47:42 -05:00
Isaac Connor
d6dfde5630
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-16 12:21:22 -04:00
Isaac Connor
8c7c4c4b1b
add a call to drawZonePoints to handle case where image doesn't load. Remove debug and dead code
2020-10-16 12:21:12 -04:00
Andrew Bauer
f98a885ed5
update the watch view header
2020-10-16 08:08:23 -05:00
Isaac Connor
4f56f9d82b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-15 17:20:10 -04:00
Isaac Connor
12b75e93b8
Merge branch 'release-1.34'
2020-10-15 17:19:56 -04:00
Isaac Connor
78cbacae2e
When changing rates, if not using video.js, send CMD_VARPLAY to tell zms what to do
2020-10-15 17:18:38 -04:00
Andrew Bauer
2fbbe11079
make the filter button style consistent
2020-10-15 08:01:32 -05:00
Andrew Bauer
f32a7aaff5
deploy insertModalHtml
2020-10-14 15:58:39 -05:00
Andrew Bauer
ec040b1bfd
don't set popup flag in event view
2020-10-14 13:59:15 -05:00
Andrew Bauer
e5e1455f7a
replace embedded popuplinks in watch view
2020-10-12 13:26:20 -05:00
Andrew Bauer
332ec2032a
replace createPopup with location.assign
2020-10-12 12:37:23 -05:00
Isaac Connor
1ffa1cc33b
Add button update checks for AutoUnarchive
2020-10-12 10:56:01 -04:00
Isaac Connor
03c8e86908
update some quotes
2020-10-10 11:09:51 -04:00
Isaac Connor
9cc7f0d360
Merge branch 'release-1.34'
2020-10-08 09:28:25 -04:00
Isaac Connor
c28ff1f2b4
Include loading EndTime when loading Events data so that we can determine if an event is in-progress
...
Keep track of last_id which is the last frame id that we have info for. Use it instead of Frame Count to prevent
accessing non-existent frame records
close ffmpeg_input on event change
include duration in status messages because it may change when playing an in-progress event.
when we hit the end of our frame data if it is an in-progress event, reload the event data instead of moving to the next event.
Include X-Timestamp in http headers to match live stream behaviour
Only send time to next event when mode=ALL
Fix scale behaviour on event view
2020-10-08 09:06:56 -04:00
Isaac Connor
95b09ad182
Add samesite=strict to all Cookie setting
2020-10-07 11:26:18 -04:00
Isaac Connor
ae7ed5a342
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-06 16:51:24 -04:00
Isaac Connor
9abde9ee06
Merge branch 'release-1.34'
2020-10-06 16:51:12 -04:00
Isaac Connor
044ce61ddb
Always do event change detection whether we are paused or not. Because we might be single-stepping. Change progress to a double as that it what it should be.
2020-10-06 16:47:51 -04:00
Andrew Bauer
76af02cc76
whitespace
2020-10-05 16:31:26 -05:00
Andrew Bauer
01596ec26c
whitespace
2020-10-05 15:53:46 -05:00
Andrew Bauer
9c7ebf8c9e
unpopup video view
2020-10-05 15:44:07 -05:00
Andrew Bauer
f93450f9ea
remove plugin support for viewing downloads
2020-10-05 14:44:45 -05:00
Andrew Bauer
321de3c604
only update changed elements in video view
2020-10-05 13:59:44 -05:00
Andrew Bauer
862f0ca732
add xmlfooter to video view, replace mootools
2020-10-05 09:37:00 -05:00
Andrew Bauer
2e6efbb349
replace inlince onchange event in control view
2020-10-03 21:44:24 -05:00
Andrew Bauer
adb715c42c
fix typo
2020-10-03 21:32:07 -05:00
Andrew Bauer
a0ad52bac9
replace another inline onchange event
2020-10-03 21:30:48 -05:00
Andrew Bauer
b4d2fa5e75
replace inline onchange event
2020-10-03 21:14:24 -05:00
Andrew Bauer
65b6dad48c
eslint
2020-10-03 17:38:56 -05:00
Andrew Bauer
8d19cee811
unpopup the addnewuser button
2020-10-03 17:12:44 -05:00
Andrew Bauer
aee5430bc8
only load preset and settings modals when needed
2020-10-03 17:00:20 -05:00
Andrew Bauer
1643fb686b
convert settings popup to modal
2020-10-03 16:51:25 -05:00
Andrew Bauer
391ce88f05
eslint
2020-10-02 21:11:54 -05:00
Andrew Bauer
a97e526298
fix save button in controlpreset modal
2020-10-02 16:10:32 -05:00
Andrew Bauer
802e439cb5
convert controlpreset view to a modal
2020-10-02 15:46:28 -05:00
Andrew Bauer
7b5090ceab
move newlog view to log view
2020-10-02 13:26:35 -05:00
Andrew Bauer
c5f69b9441
eslint
2020-10-02 13:24:30 -05:00
Andrew Bauer
6c0f61ebbd
rework devices view, remove inline onclick
2020-10-02 12:39:05 -05:00
Andrew Bauer
186b8ac947
convert x10 device view to a modal
2020-10-01 15:52:33 -05:00
Andrew Bauer
c61c111d9e
modernize devices view
2020-10-01 12:52:20 -05:00
Andrew Bauer
c4cf52c2bc
new version notice is now part of the navbar
2020-10-01 08:15:20 -05:00
Andrew Bauer
591a30f1fe
fix typo
2020-09-30 13:33:11 -05:00
Andrew Bauer
4bc373105d
fix typo
2020-09-30 13:12:58 -05:00
Andrew Bauer
9b9138f113
replace popup calls in montagereview
2020-09-30 12:20:24 -05:00
Andrew Bauer
d77b55d1d6
replace popup code in add_monitor
2020-09-30 10:40:13 -05:00
Andrew Bauer
2d30d7aafa
convert download view to modal
2020-09-30 09:12:54 -05:00
Isaac Connor
3024c46dbb
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-09-29 14:50:13 -04:00
Andrew Bauer
6eaa8aa211
whitespace
2020-09-29 13:05:00 -05:00
Andrew Bauer
4694ce59bb
export event function does not need element
2020-09-29 12:55:57 -05:00
Andrew Bauer
a12a870e2c
download.js - replace mootools with jquery
2020-09-29 12:51:01 -05:00
Isaac Connor
a39a656373
Merge branch 'master' into zma_to_thread
2020-09-29 11:02:40 -04:00
Isaac Connor
1af20cea6a
Fix unarchive. The reload was killing the getJSON. Should only do that on success
2020-09-29 09:42:31 -04:00
Isaac Connor
ecac5e051a
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-09-28 09:34:14 -04:00
Isaac Connor
0a4a144bbc
Merge branch 'location'
2020-09-28 09:33:28 -04:00
Andrew Bauer
699cbed6af
add back and refresh buttons to export view
2020-09-27 12:43:12 -05:00
Andrew Bauer
9ea58dc4a1
eslint
2020-09-27 12:16:04 -05:00
Andrew Bauer
c1a0afef95
make group view into a modal
2020-09-27 12:12:01 -05:00
Andrew Bauer
47e5a26da4
eslint
2020-09-27 07:41:05 -05:00
Andrew Bauer
a6413ccd7f
call modal when edit btn is clicked on event view
2020-09-27 07:12:32 -05:00
Andrew Bauer
2655118cbd
change call to popup -> view in event.js
2020-09-26 21:21:29 -05:00
Andrew Bauer
9d2450d55d
load export view, rather than popup
2020-09-26 21:15:50 -05:00
Andrew Bauer
b2cf48a645
remove unused call to filter popup
2020-09-26 21:06:57 -05:00
Andrew Bauer
935f73ad33
reconfig controlcap cancel button
2020-09-26 16:39:31 -05:00
Andrew Bauer
112003f9de
eslint
2020-09-26 13:55:56 -05:00
Andrew Bauer
0c4fcbbe97
convert controlcaps view to bstable
2020-09-26 12:09:41 -05:00
Andrew Bauer
b7efdebf9a
dynamically find the Level col index
2020-09-25 21:26:22 -05:00
Andrew Bauer
582d85f083
unpopup the controlcaps views
2020-09-25 16:12:05 -05:00
Andrew Bauer
eedf18073f
add navbar to controlcap views
2020-09-25 16:05:16 -05:00
Andrew Bauer
6a5610e404
add back and refresh buttons to user view
2020-09-25 15:49:18 -05:00
Andrew Bauer
2b0badfebe
add back and refresh buttons to zones
2020-09-25 13:44:55 -05:00
Andrew Bauer
8018bd4ed9
add back & refresh buttons to zone view
2020-09-25 13:37:06 -05:00
Andrew Bauer
d66b0be1bb
fix scalecontrol on frame view
2020-09-25 13:08:55 -05:00
Andrew Bauer
ae9139b00c
unpopup zone view
2020-09-25 10:52:13 -05:00
Andrew Bauer
493b9d0ef7
revert newlog row colors back to former
2020-09-25 07:21:14 -05:00
Isaac Connor
a3f4837186
Use config options for tile datam access tokens and turning geolocation on/off
2020-09-24 20:30:57 -04:00
Isaac Connor
386f991364
Merge branch 'master' into location
2020-09-24 19:28:57 -04:00
Andrew Bauer
89fddf3555
decrease refresh timing
2020-09-24 12:27:03 -05:00
Andrew Bauer
e4a1bacbbf
get adv search working in newlog view
2020-09-24 11:05:34 -05:00
Andrew Bauer
88f1dcca13
centralize bstable icon var, change table refresh icon
2020-09-24 08:25:39 -05:00
Isaac Connor
e4bbbce161
fix eslint
2020-09-24 09:13:44 -04:00
Isaac Connor
624bcdcde0
Add Latitude and Longitude to Monitors and monitor edit as well as using the geolocation api to auto-populate them
2020-09-24 09:01:30 -04:00
Andrew Bauer
b4450fecec
init bootstrap-table only once
2020-09-23 14:32:40 -05:00
Andrew Bauer
16a593e904
eslint
2020-09-23 13:56:41 -05:00
Andrew Bauer
3f2f7359f0
rough in new log view - very rough
2020-09-23 13:09:19 -05:00
Isaac Connor
70be6bc84c
Add an estimated ram use to buffer tabs
2020-09-22 16:21:59 -04:00
Isaac Connor
ed6d5a55a5
put an onchange on the monitorType causing a form submit so that Source and Storage tabs update. Rename action to save and put it on the submit button
2020-09-22 14:33:26 -04:00
Isaac Connor
b6541aa1ff
Move log export to a generic modal
2020-09-21 13:01:58 -04:00
Andrew Bauer
1d1b0e58d2
consolidate getJson fail callbacks to one function
2020-09-20 08:41:16 -05:00
Andrew Bauer
0a7848d9d2
remove uneeded state php and js files
2020-09-19 12:36:55 -05:00
Andrew Bauer
03a0e849b8
remove unneeded js from console.js
2020-09-19 10:24:28 -05:00
Andrew Bauer
ec20fdf3ad
convert function modal to ajax request
2020-09-19 10:18:59 -05:00
Andrew Bauer
d2963fe28f
convert donate modal to ajax request
2020-09-19 08:55:08 -05:00
Isaac Connor
8f3b3466af
setup onblur function for presetSelector
2020-09-17 20:58:18 -04:00
Isaac Connor
6aa4302fe0
Add EventDiskSpace as a term and add a Debug modal button
2020-09-17 15:17:29 -04:00
Andrew Bauer
b64bd97a64
whitespace
2020-09-16 18:22:37 -05:00
Andrew Bauer
c8c3b75e33
Reload the page after table refresh
...
This wasn't needed on my machine, but might be on others
2020-09-16 18:21:06 -05:00
Isaac Connor
bea23e2241
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-09-16 09:58:49 -04:00
Isaac Connor
c1f872c9aa
Reinit chosen on log filters after updating them
2020-09-16 09:58:15 -04:00
Andrew Bauer
afdd4702a2
add server modal
2020-09-16 08:30:45 -05:00
Isaac Connor
4fa9237048
Fix eslint
2020-09-16 08:57:44 -04:00
Isaac Connor
a430fe1f7a
correct EndTime to End Date/Time. EndTime and EndDate terms are also effective
2020-09-15 21:19:10 -04:00
Andrew Bauer
33ef700dda
Cause links in events use eventdetail modal
2020-09-15 09:49:03 -05:00
Andrew Bauer
121671327c
call eventdetail modal rather than popup
2020-09-15 08:55:32 -05:00
Isaac Connor
ab8e2d2e6c
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-09-14 14:05:02 -04:00
Isaac Connor
d02a61e715
change will to might
2020-09-14 14:03:55 -04:00
Andrew Bauer
cc7b65e8aa
eslint
2020-09-14 10:31:44 -05:00
Andrew Bauer
d2bc39f65f
replace storage popup with modal
2020-09-14 09:50:04 -05:00
Andrew Bauer
0a0b555c4c
refresh table after archive or unarchive
2020-09-13 11:32:28 -05:00
Andrew Bauer
29710f67ac
fix table refresh after delete
2020-09-13 11:25:31 -05:00
Andrew Bauer
c4c4551436
replace no permission alerts with enoperm()
2020-09-13 11:09:15 -05:00
Andrew Bauer
096f4a446f
Use Ajax to load delete confirm modal
2020-09-13 10:39:51 -05:00
Andrew Bauer
7e55dd14a2
eslint
2020-09-13 08:52:52 -05:00
Andrew Bauer
951afc669f
eslint
2020-09-13 08:33:47 -05:00
Andrew Bauer
1599bc4c14
load stats on deman via ajax
2020-09-13 07:32:49 -05:00
Andrew Bauer
0c8bb25889
eslint
2020-09-11 16:49:36 -05:00
Andrew Bauer
2ee70442c0
use done() and fail() callbacks for getJSON
2020-09-11 14:30:36 -05:00
Isaac Connor
3fb62b7904
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-09-10 19:26:23 -04:00
Matthew Noorenberghe
46e69f8c27
Show correct enabled/disabled status in the function dialog
...
monitor.Enabled is a string and 0 is truthy in JS
2020-09-10 15:12:31 -04:00
Isaac Connor
2e5a897355
Merge pull request #3038 from mnoorenberghe/fix_function_save
...
Fix saving function changes
2020-09-10 11:52:38 -04:00
Isaac Connor
e37c5ac385
Use FrameId instead of FramesId
2020-09-10 11:10:19 -04:00
Isaac Connor
1f837c1718
Hide eventId not FrameId
2020-09-10 11:04:18 -04:00
Matthew Noorenberghe
f046b565c6
Fix saving function changes
...
Wait for the request to complete before reloading.
2020-09-10 11:01:44 -04:00
Isaac Connor
013e007141
run parseRows on init so that datetime fields get their popups etc
2020-09-09 15:40:44 -04:00
Isaac Connor
b34c6dcfc2
correct log, code docs
2020-09-07 13:29:36 -04:00
Isaac Connor
74dc8af76f
add global
2020-09-07 13:29:21 -04:00
Isaac Connor
b3b6445d60
Fix application of scales to montage streams
2020-09-05 09:15:33 -04:00
Isaac Connor
7e6fbe1ab4
Fix ControlTypes dropdown.
2020-09-05 08:46:18 -04:00
Matthew Noorenberghe
77cca7efac
eslint --fix
2020-09-04 10:02:43 -04:00
Isaac Connor
46790bf401
Add monitor json data
2020-09-03 18:25:00 -04:00
Isaac Connor
1f810c8947
Populate the function modal from the javascript monitors array before viewing.
2020-09-03 18:24:45 -04:00
Isaac Connor
d4d0a971d1
get rid of errant fo
2020-09-03 10:19:59 -04:00
Isaac Connor
cf1f408e96
Don't need pauseString and playStream anymore
2020-09-02 17:34:09 -04:00
Isaac Connor
c2760ef768
add needed js stuff for streaming
2020-09-02 17:28:08 -04:00
Isaac Connor
d243d798ff
add needed js stuff for streaming
2020-09-02 17:27:59 -04:00
Isaac Connor
5aef5e2312
populate monitorData for MonitorStream use
2020-09-02 14:45:10 -04:00
Isaac Connor
8d2ced0fbb
use MonitorStream to handle the video streaming. update buttons. Add onload event to streaming image so that we redraw the points where they should be. Handle padding in locating points.
2020-09-02 14:44:11 -04:00
Isaac Connor
4f90f37f0e
add back request queue
2020-09-02 14:42:47 -04:00
Isaac Connor
5544057a8d
Merge branch 'master' into improve_zone_editing
2020-08-31 18:47:24 -04:00
Isaac Connor
0995708b5b
Use ajax request instead of webui to delete events. The reason is that the web ui will spit out the events view after performing the action. Without a filter it will try to list every event.
2020-08-31 10:37:03 -04:00
Isaac Connor
fa18887f5c
zones can now list multiple monitors so populate a listof monitors with json data
2020-08-31 10:13:30 -04:00
Isaac Connor
f00f9ead79
Move monitor class into js/MonitorStream for use elsewhere
2020-08-31 10:12:47 -04:00
Isaac Connor
3e09840995
Merge branch 'master' into improve_zone_editing
2020-08-28 17:43:07 -04:00
Andrew Bauer
990b5bd9dc
monitor view - convert links to buttons
2020-08-28 15:22:57 -05:00
Andrew Bauer
d69b3e7f43
make cancel go back to console
2020-08-28 10:56:09 -05:00
Isaac Connor
04b3f5d294
Merge branch 'master' into improve_zone_editing
2020-08-28 09:43:48 -04:00
Andrew Bauer
2b6090d8c6
console.js - change all createPopup to window.location.assign
2020-08-28 07:58:42 -05:00
Andrew Bauer
1e78307735
add navigation buttons to monitor view
2020-08-27 16:30:49 -05:00
Isaac Connor
dc15663030
Fix scales after applying layout
2020-08-27 10:55:14 -04:00
Isaac Connor
4c1446d856
Fixes to scale selection and remove code that altered width&height in zms url. zms doesn't honour them. Calculate new scale and alter that parameter.
2020-08-27 10:33:08 -04:00
Andrew Bauer
8d202aeef0
eslint
2020-08-26 15:36:38 -05:00
Isaac Connor
ab68bef39a
Merge branch 'master' into filter_pre_post
2020-08-26 15:28:48 -04:00
Isaac Connor
0ced21dda7
Persist video volume in a cookie so that subsequent events remember the volume level.
...
Fixes #3013
2020-08-26 15:15:57 -04:00
Isaac Connor
74d2ba56db
Persist video volume in a cookie so that subsequent events remember the volume level.
2020-08-26 15:15:10 -04:00
Isaac Connor
24d1ba3a00
fix eslint
2020-08-26 13:41:40 -04:00
Andrew Bauer
ac7867eab3
make function view a modal
2020-08-26 11:39:48 -05:00
Isaac Connor
e3a48c2db4
Handle the case where the layout has invalid json
2020-08-25 12:07:45 -04:00
Isaac Connor
6fbe7457ff
Add missing globals
2020-08-25 11:47:49 -04:00
Isaac Connor
626e892b33
add global
2020-08-25 11:43:55 -04:00
Andrew Bauer
0879ecf9a5
update timeline header
2020-08-24 14:33:01 -05:00
Andrew Bauer
8c32511c83
whitespace
2020-08-24 12:05:31 -05:00
Andrew Bauer
e5e2c3b347
fix stats off by 1 frame, don't alert on score 0
2020-08-24 10:57:54 -05:00
Andrew Bauer
c6e3107a50
make donate view a modal
2020-08-24 09:31:21 -05:00
Isaac Connor
0f27243007
Merge branch 'master' into filter_pre_post
2020-08-24 09:23:24 -04:00
Andrew Bauer
8ea806e264
eslint
2020-08-23 18:40:58 -05:00
Andrew Bauer
699b20b961
whitespace
2020-08-23 17:54:57 -05:00
Andrew Bauer
65181c84ee
update frame top toolbar
2020-08-23 17:53:47 -05:00
Andrew Bauer
86f0d41d8e
autoinit changeScale in frame view
2020-08-23 13:17:03 -05:00
Andrew Bauer
4b144dea74
whitespace
2020-08-23 13:02:35 -05:00
Andrew Bauer
f06bfe7cbb
use bootstrap-table on stats view
2020-08-23 12:23:58 -05:00
Andrew Bauer
69ba9e6d0e
eslint
2020-08-23 12:14:09 -05:00
Isaac Connor
2a7ea52330
Merge branch 'release-1.34'
2020-08-23 11:51:54 -04:00
Andrew Bauer
de1d1c2ac6
change close link to back link
2020-08-22 14:43:53 -05:00
Andrew Bauer
61f89e3306
rough in frames detail view
2020-08-22 12:45:19 -05:00
Andrew Bauer
73a01855f8
rough in thumbnail animation
2020-08-21 20:44:20 -05:00
Isaac Connor
ac0976324f
Fix case of filterQuery. Fixes #3017
2020-08-21 11:22:47 -04:00
Andrew Bauer
9357017a39
add export fx to tables
2020-08-21 07:11:57 -05:00
Andrew Bauer
de4d144cd4
fix scale dropdown in frame view
2020-08-20 10:16:28 -05:00
Andrew Bauer
247ace7fa2
process clicks per cell in frames
2020-08-20 09:13:11 -05:00
Andrew Bauer
c9de30d427
click any row to load frame
2020-08-19 17:54:39 -05:00
Andrew Bauer
b2a632a3f8
reinit thumbnail ani on click events
2020-08-19 16:16:27 -05:00
Andrew Bauer
8f70ae192d
enable thumbnail zoom on frames view
2020-08-19 15:42:35 -05:00