Andrew Bauer
|
4a2b3e569b
|
increase timeout value for streamQuery to avoid contention with streamScale during jpeg playback
|
2021-01-10 13:02:07 -06:00 |
|
Andrew Bauer
|
d45b4ca434
|
deprecate legacy "stills" option from event view
|
2021-01-10 10:25:22 -06:00 |
|
Andrew Bauer
|
2e0b32b2fc
|
add a button to go to the stats view
|
2021-01-09 16:13:33 -06:00 |
|
Andrew Bauer
|
08d640a06c
|
autohide frame stats when out of pixels
|
2021-01-09 16:01:32 -06:00 |
|
Andrew Bauer
|
1ea4ee6ef1
|
remove extra uneeded on change event handler
|
2021-01-09 15:09:20 -06:00 |
|
Andrew Bauer
|
9cb1709f77
|
fix frame view scale control
|
2021-01-09 15:08:08 -06:00 |
|
Andrew Bauer
|
e415118f77
|
clean up postlogin js
|
2021-01-09 14:40:38 -06:00 |
|
Andrew Bauer
|
22be24ccde
|
eslint
|
2021-01-09 08:54:13 -06:00 |
|
Andrew Bauer
|
4eeb0a90f6
|
remove unneeded comment
|
2021-01-09 08:45:20 -06:00 |
|
Andrew Bauer
|
df44afb164
|
autohide the event stats when out of pixels
|
2021-01-09 08:43:53 -06:00 |
|
Andrew Bauer
|
a55e53a737
|
replace mootools Request.JSON
|
2021-01-08 14:34:10 -06:00 |
|
Andrew Bauer
|
ece8fccc63
|
fix cyclePrev with only 1 monitor
|
2021-01-08 13:16:16 -06:00 |
|
Andrew Bauer
|
9ec09c0c85
|
replace mootools .delay method
|
2021-01-08 12:25:17 -06:00 |
|
Andrew Bauer
|
c0431eca86
|
eslint
|
2021-01-08 10:42:45 -06:00 |
|
Andrew Bauer
|
f816c72517
|
replace mootool Cookie object with plain JS
|
2021-01-08 10:04:46 -06:00 |
|
Andrew Bauer
|
d0f035596c
|
eslint
|
2021-01-08 08:50:57 -06:00 |
|
Andrew Bauer
|
d3a71aff14
|
use JS instead of Mootools to detect IE browser
|
2021-01-08 08:27:06 -06:00 |
|
Andrew Bauer
|
43fabd9b65
|
replace mootools periodical method
|
2021-01-08 07:32:52 -06:00 |
|
Andrew Bauer
|
9d7f738f61
|
replace mootools in MonitorStream
|
2021-01-06 14:19:25 -06:00 |
|
Andrew Bauer
|
0cdc2b448d
|
remove obsolete controlpreset js files
|
2021-01-04 13:18:05 -06:00 |
|
Andrew Bauer
|
75e2f526ae
|
WIP jquery conversion
|
2021-01-04 13:05:33 -06:00 |
|
Andrew Bauer
|
a1b26c8f61
|
WIP replace with jquery
|
2021-01-04 10:28:16 -06:00 |
|
Andrew Bauer
|
21180777b4
|
eslint
|
2021-01-03 14:23:13 -06:00 |
|
Andrew Bauer
|
49a535abaa
|
replace mootools in montagereview.js
|
2021-01-03 11:45:53 -06:00 |
|
Andrew Bauer
|
1f6b2798ff
|
replace mootools in montage.js
|
2021-01-03 07:40:50 -06:00 |
|
Andrew Bauer
|
1ab181ec54
|
replace mootools in cycle.js
|
2021-01-02 16:57:23 -06:00 |
|
Andrew Bauer
|
5ad8e90dda
|
eslint
|
2021-01-02 13:48:40 -06:00 |
|
Andrew Bauer
|
f0610b5eb7
|
eslint
|
2021-01-02 13:25:38 -06:00 |
|
Andrew Bauer
|
809e67d352
|
eslint
|
2021-01-02 12:24:12 -06:00 |
|
Andrew Bauer
|
e9bdaa988e
|
eslint
|
2021-01-02 12:06:02 -06:00 |
|
Andrew Bauer
|
cc69b150de
|
WIP replace mootools in zone.js
|
2021-01-02 11:58:03 -06:00 |
|
Andrew Bauer
|
62575c0d0e
|
WIP replace mootools in zone.js
|
2021-01-02 11:33:21 -06:00 |
|
Andrew Bauer
|
ebad6194ee
|
remove replace mootools in drawZonePoints function
|
2021-01-02 10:52:17 -06:00 |
|
Andrew Bauer
|
12c0ccea7c
|
handle objdetect links in a more consistent manner
|
2021-01-02 08:52:26 -06:00 |
|
Andrew Bauer
|
a61da04969
|
prevent page scrolling when objdetect modal is opened
|
2021-01-02 08:06:35 -06:00 |
|
Andrew Bauer
|
ea7184e619
|
remove redundant modal toggle from events.js
|
2021-01-01 09:36:49 -06:00 |
rabsym
|
b7970d69a5
|
Avoid top-scroll when returning from bs_modal objdetect
|
2021-01-01 14:15:35 +01:00 |
Isaac Connor
|
284b9f963f
|
Merge branch 'master' into zma_to_thread
|
2020-12-29 12:18:26 -05:00 |
|
Andrew Bauer
|
2adeedf418
|
additional mootools cleanup in event.js
|
2020-12-25 07:19:41 -06:00 |
|
Andrew Bauer
|
5fa8cbf158
|
add Frames button to event view
|
2020-12-24 14:46:13 -06:00 |
|
Andrew Bauer
|
e66b050c72
|
WIP jquery conversion of event view
|
2020-12-24 10:38:44 -06:00 |
|
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 |