0dbeb89c62
remove replace mootools in drawZonePoints function
2021-01-11 13:46:50 -05:00
dcda8cb679
handle objdetect links in a more consistent manner
2021-01-11 13:46:50 -05:00
a8f79a6e00
prevent page scrolling when objdetect modal is opened
2021-01-11 13:46:50 -05:00
6da429f49f
remove redundant modal toggle from events.js
2021-01-11 13:46:50 -05:00
56bb4a74fc
Avoid top-scroll when returning from bs_modal objdetect
2021-01-11 13:46:50 -05:00
e27dd44547
upgrade to bootstrap-table 18.1 release
2021-01-11 13:46:50 -05:00
f7de6045ef
Change Disabled to Auto and add h265 as codec options
2021-01-11 13:46:50 -05:00
9e9860d6c0
replace mootools getelement and addevent
2021-01-11 09:06:21 -06:00
2094f78adf
use plain js to get the livestream rather than mootools
2021-01-11 07:27:11 -06:00
ff7a1037be
use plain js for mouseover thumb animation
2021-01-11 07:21:51 -06:00
9968a65ee6
bind this to streamCmdQuery
2021-01-10 14:21:52 -06:00
4a2b3e569b
increase timeout value for streamQuery to avoid contention with streamScale during jpeg playback
2021-01-10 13:02:07 -06:00
d45b4ca434
deprecate legacy "stills" option from event view
2021-01-10 10:25:22 -06:00
2e0b32b2fc
add a button to go to the stats view
2021-01-09 16:13:33 -06:00
08d640a06c
autohide frame stats when out of pixels
2021-01-09 16:01:32 -06:00
1ea4ee6ef1
remove extra uneeded on change event handler
2021-01-09 15:09:20 -06:00
9cb1709f77
fix frame view scale control
2021-01-09 15:08:08 -06:00
e415118f77
clean up postlogin js
2021-01-09 14:40:38 -06:00
22be24ccde
eslint
2021-01-09 08:54:13 -06:00
4eeb0a90f6
remove unneeded comment
2021-01-09 08:45:20 -06:00
df44afb164
autohide the event stats when out of pixels
2021-01-09 08:43:53 -06:00
a55e53a737
replace mootools Request.JSON
2021-01-08 14:34:10 -06:00
ece8fccc63
fix cyclePrev with only 1 monitor
2021-01-08 13:16:16 -06:00
c67c1ce6a0
replace Mootool delay with setTimeout
2021-01-08 13:06:56 -06:00
c7690a7088
go back rather than close window
2021-01-08 12:40:26 -06:00
9ec09c0c85
replace mootools .delay method
2021-01-08 12:25:17 -06:00
72eaf267c1
eslint
2021-01-08 10:45:59 -06:00
c0431eca86
eslint
2021-01-08 10:42:45 -06:00
55d99e8e7c
eslint
2021-01-08 10:10:47 -06:00
f816c72517
replace mootool Cookie object with plain JS
2021-01-08 10:04:46 -06:00
b56883a985
add reference to browserInfo function
2021-01-08 09:35:32 -06:00
62fc1fb1aa
replace Mootools Browser object with our own
2021-01-08 09:32:51 -06:00
d0f035596c
eslint
2021-01-08 08:50:57 -06:00
d3a71aff14
use JS instead of Mootools to detect IE browser
2021-01-08 08:27:06 -06:00
43fabd9b65
replace mootools periodical method
2021-01-08 07:32:52 -06:00
a431f08133
eslint
2021-01-06 15:57:30 -06:00
4756a03b16
show alarm state and fps on zones view
2021-01-06 14:27:06 -06:00
9d7f738f61
replace mootools in MonitorStream
2021-01-06 14:19:25 -06:00
6dcedb584d
modernize monitors view
2021-01-05 10:16:51 -06:00
ebbd2888f0
tableExport plugin is no longer used
2021-01-04 15:40:53 -06:00
bd18904bf4
remove js files that define popupSizes
2021-01-04 15:33:26 -06:00
51132cb5e1
old overlay code is no longer used
2021-01-04 13:51:03 -06:00
0cdc2b448d
remove obsolete controlpreset js files
2021-01-04 13:18:05 -06:00
75e2f526ae
WIP jquery conversion
2021-01-04 13:05:33 -06:00
a1b26c8f61
WIP replace with jquery
2021-01-04 10:28:16 -06:00
21180777b4
eslint
2021-01-03 14:23:13 -06:00
49a535abaa
replace mootools in montagereview.js
2021-01-03 11:45:53 -06:00
0dd98855cc
bring montage minimize chervron into the view
2021-01-03 08:53:07 -06:00
1f6b2798ff
replace mootools in montage.js
2021-01-03 07:40:50 -06:00
1ab181ec54
replace mootools in cycle.js
2021-01-02 16:57:23 -06:00
c166b0de0f
fix return too soon when no log results
2021-01-02 16:33:56 -06:00
5ad8e90dda
eslint
2021-01-02 13:48:40 -06:00
f0610b5eb7
eslint
2021-01-02 13:25:38 -06:00
56e88aea89
revert back to a standard modal (no static backdrop) for objdetect
2021-01-02 12:34:33 -06:00
809e67d352
eslint
2021-01-02 12:24:12 -06:00
e9bdaa988e
eslint
2021-01-02 12:06:02 -06:00
cc69b150de
WIP replace mootools in zone.js
2021-01-02 11:58:03 -06:00
62575c0d0e
WIP replace mootools in zone.js
2021-01-02 11:33:21 -06:00
ebad6194ee
remove replace mootools in drawZonePoints function
2021-01-02 10:52:17 -06:00
12c0ccea7c
handle objdetect links in a more consistent manner
2021-01-02 08:52:26 -06:00
a61da04969
prevent page scrolling when objdetect modal is opened
2021-01-02 08:06:35 -06:00
ea7184e619
remove redundant modal toggle from events.js
2021-01-01 09:36:49 -06:00
b7970d69a5
Avoid top-scroll when returning from bs_modal objdetect
2021-01-01 14:15:35 +01:00
7c783aa53d
Deal with Error for Auto not in Array
...
Add value auto into the array, even if not implemented as without it you cannot save a monitor.
2021-01-01 14:38:33 +11:00
bc30d303f7
upgrade to bootstrap-table 18.1 release
2020-12-30 08:01:28 -06:00
284b9f963f
Merge branch 'master' into zma_to_thread
2020-12-29 12:18:26 -05:00
a362f2abc2
Merge pull request #3102 from connortechnology/fix_3101
...
fix api monitor save daemon control
2020-12-25 13:29:01 -05:00
2adeedf418
additional mootools cleanup in event.js
2020-12-25 07:19:41 -06:00
9209f40daa
eslint
2020-12-24 14:59:27 -06:00
5fa8cbf158
add Frames button to event view
2020-12-24 14:46:13 -06:00
3fd50bb01d
reorganize logger.js and use jquery
2020-12-24 14:32:23 -06:00
e66b050c72
WIP jquery conversion of event view
2020-12-24 10:38:44 -06:00
b093e99688
disable click to select on the events table Cause column
2020-12-24 07:10:47 -06:00
3132820a71
Move daemonControl logic into the model. daemonControl needs to be called on the previous monitor data so that it knows which daemons to stop.
2020-12-23 13:48:12 -05:00
816c306518
use jquery for submitTab
2020-12-23 12:29:39 -06:00
a94550795b
update setButtonState
2020-12-23 12:20:31 -06:00
f64f3262ed
WIP replace mootools in evnet.js
2020-12-23 12:19:35 -06:00
f857d12103
WIP replace mootools in event.js
2020-12-23 10:51:23 -06:00
493bfa6a16
eslint
2020-12-23 09:15:31 -06:00
3c79204592
replace mootools in add_monitors
2020-12-23 08:54:11 -06:00
286a5a72a3
Merge branch 'master' into zma_to_thread
2020-12-23 09:47:31 -05:00
c91a0b2c09
fixup jquery click functions
2020-12-23 08:37:28 -06:00
c497b94378
use tlzoom class to avoid conflict with thumbnail zoom
2020-12-23 07:57:44 -06:00
a9b92905ca
eslint
2020-12-22 19:07:12 -06:00
a1917d83d0
Merge branch 'master' into zma_to_thread
2020-12-22 19:52:09 -05:00
cc5a732103
continue work on timeline.js
2020-12-22 16:06:21 -06:00
6be9b294ef
Hidden and hidden are two very different classes
2020-12-22 17:00:07 -05:00
8a26252914
update object detected link in events
2020-12-22 12:42:27 -06:00
9af383db92
set the width style for the objdetect modal
2020-12-22 12:30:44 -06:00
2ea4b39d93
don't use quotes around the event id
2020-12-22 11:46:31 -06:00
ee45916526
move objdetect image to a modal
2020-12-22 10:08:31 -06:00
a231125fb3
Replace Download with a direct link to the mp4 like it used to be. Add back a Frames link
2020-12-22 10:23:44 -05:00
cbe04674c5
remove non-existent id preview
2020-12-21 15:59:05 -06:00
d080109f4b
eslint
2020-12-21 15:20:38 -06:00
663748d9a7
partial replace mootools
2020-12-21 13:07:14 -06:00
1f3fd93296
use setTimeout instead of mootools pass
2020-12-20 15:21:38 -06:00
92361210ce
eslint
2020-12-20 15:07:16 -06:00
1d6c4664dc
replace mootools in export
2020-12-20 10:54:18 -06:00
0b569e7e37
replace mootools in control.js
2020-12-20 08:29:39 -06:00
66ae2c0461
replace mootools request JSON
2020-12-20 07:59:17 -06:00
381cc30e5d
Set default value for DefaultScale to 0 which is ScaleToFit
2020-12-18 10:54:08 -05:00
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
8d52baeee2
Merge branch 'master' into rtsp_server
...
Cleanup Analysis a bit. We can't skip packets just because they are audio. Clean up the state machine transitions a bit to make them a little more readable.
Change logic of PrimeCapture, success MUST return 1. 0 means no error but also no success.
Debugging and braces improvements in local_camera.
2020-12-17 10:16:54 -05:00
a855656b88
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
2020-12-17 09:27:23 -05:00
5602b92699
Fix issue with timeline where it only shows first frame
2020-12-17 09:26:59 -05:00
7f9b977ec2
rename onDownClick to onRenameClick cutnpaste error
2020-12-15 16:57:27 -05:00
8c85c50ce1
Add titles to fps values and only show analysis if doing it
2020-12-15 16:56:53 -05:00
997a05eb8b
AV_CODEC_ID for H264 is 27 not 220
2020-12-15 16:56:27 -05:00
7dc4633d27
rename onDownClick to onRenameClick cutnpaste error
2020-12-15 16:56:05 -05:00
48db741b4e
Fix merge from master
2020-12-15 15:59:02 -05:00
de38c29e83
Fix lack of # for zoomvalue
2020-12-15 15:56:41 -05:00
e123322d06
Merge branch 'master' into rtsp_server
2020-12-15 11:00:13 -05:00
99e7ae3505
Merge branch 'master' into rtsp_server
2020-12-15 10:14:19 -05:00
aed83cab31
Load delconfirm content on demand
2020-12-15 10:11:30 -05:00
bc07c38dc8
add 704x576 PAL D1
2020-12-14 12:57:59 -05:00
191e213337
upgrade to jquery 3.5.1, use minified javascripts
2020-12-14 10:02:43 -06:00
a5b945f97a
touch up event view stat list
2020-12-14 06:55:45 -06:00
4ae47659df
use js to build event stats
2020-12-13 21:19:38 -06:00
43d0b0fd55
Add D1-PAL resolution
2020-12-13 16:47:51 -05:00
48c6309394
add emailed & archived status to event view
2020-12-13 15:01:47 -06:00
882447317a
eslint
2020-12-13 14:42:39 -06:00
c24564e0cd
insert frame stats into frame view
2020-12-13 13:20:26 -06:00
71d1607f69
fix php -> js issue when $alarmframe was false
2020-12-12 15:06:59 -06:00
237335c022
watch.js - finish mootools replacement
2020-12-12 12:45:36 -06:00
2f0df74c54
show the analyse image in frames view if it exists
2020-12-12 11:37:50 -06:00
51a862057f
Fix a link missing a quote
2020-12-11 09:49:43 -05:00
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
3483ee8db1
clean up code a little by make an event_link string and using it. Fix the cause column not being a valid link. I think it used to popup an edit but it should just go to the event view
2020-12-11 09:34:50 -05:00
77a35c1813
right align colDiskSpace so that digits line up nicely
2020-12-11 09:33:54 -05:00
bfd16db34b
add format padding so that right align file size strings will line up nicely.
2020-12-11 09:33:36 -05:00
f89da79c27
Fix comparing empty arrays. explode on an empty string returns an array with a single element '' instead of an empty array
2020-12-10 16:25:24 -05:00
8bda0b5504
fix element name on DecodingEnabled
2020-12-10 16:24:45 -05:00
c37433acfc
show/hide DecodingEnabled depending on function
2020-12-10 16:24:33 -05:00
da8d96ddda
Don't pass types to changes, it doesn't do anything. Add DecodingEnabled to request
2020-12-10 16:24:09 -05:00
5c1135b2a7
Merge branch 'master' into no_decode
2020-12-10 15:15:32 -05:00
eb00cf405a
Add DecodingEnabled to monitor view
2020-12-10 15:14:37 -05:00
2e9f991211
give the label column in monitor view a min-width of 300px so that it is always large enough
2020-12-10 14:32:44 -05:00
b12f1cce5b
add Function help text to monitor view
2020-12-10 14:32:17 -05:00
66a1660423
Add missing comma
2020-12-10 14:08:01 -05:00
4667e21636
Add DecodingEnabled to Function modal
2020-12-10 14:06:40 -05:00
ced396e437
Add DecodingEnabled to Monitors
2020-12-10 14:06:26 -05:00
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
9fb953bc84
set the right image attributes for frames view
2020-12-10 07:24:48 -06:00
3a4cdb7e50
eslint
2020-12-09 20:06:38 -06:00
e0ac68786f
remove unneeded thumb animation functions from frames.js
2020-12-09 18:48:58 -06:00
39023b3e7b
don't set zoom class in frames.js
2020-12-09 18:19:10 -06:00
c43ffcf58f
eslint
2020-12-09 18:02:34 -06:00
026b8cfb0c
eslint
2020-12-09 17:58:46 -06:00
5482d3b3d5
Quiet error when calling logout when already logged out
2020-12-09 17:56:27 -05:00
eb4b7f248d
handle sort_field and limit not existing in _REQUEST
2020-12-09 17:56:27 -05:00
38cf667ee1
report both capture_fps and analysis_fps
2020-12-09 15:03:40 -05:00
28a3868069
report both capture_fps and analysis_fps
2020-12-09 15:03:33 -05:00
951debab7f
watch.js - replace mootools ajax w/ jquery
2020-12-09 12:25:40 -06:00
4e09a32836
fix one canEdit
2020-12-08 14:36:19 -06:00
69e540c104
deploy canView and canEdit js objects
2020-12-08 14:25:48 -06:00
63c483ba92
canEditMonitors is set in skin.js.php
2020-12-08 11:27:18 -05:00
63e36340c6
Remove extra }
2020-12-08 11:26:52 -05:00
84c7a117f5
Use width and height attrs instead of css for rendering speed. Also alt doesn't need validHtmlStr because Event.Id will have no weird characters
2020-12-08 11:26:43 -05:00
bfe5bb0249
Include code to handle when we are already logged in but trying to auth with a mismatched auth_hash
2020-12-08 11:19:22 -05:00
c156731f0b
Allow users with canView Events to view event list. Don't allow unarchive or delete if they don't have canEdit
2020-12-08 10:33:25 -05:00
b261fbb397
Merge branch 'master' into zma_to_thread
2020-12-07 16:26:26 -05:00
691f9a70f9
eslint
2020-12-07 14:44:45 -06:00
1772d37c08
convert updatePresetLabels() to jquery
2020-12-07 12:32:07 -06:00
389ad22dcd
watch.js - target not $target
2020-12-07 10:36:14 -06:00
6e17b04a7e
WIP continue jquery conversion of watch.js
2020-12-07 10:22:54 -06:00
7a827c1fd6
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-12-05 16:57:32 -05:00
4d33667a85
Merge branch 'release-1.34'
2020-12-05 16:51:42 -05:00
ea6478b8a0
Escape column names for mysql 8. Fixes #3092
2020-12-05 16:38:53 -05:00
fdbca4760f
dbFetchAll should always return an array. Not null on error
2020-12-05 16:38:25 -05:00
df35bd75a5
Escape column names for mysql 8
2020-12-05 16:29:23 -05:00
ed043f9d55
bw dropdown - match only on bwselect class
2020-12-05 12:31:30 -06:00
0a89b906a0
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-12-05 10:41:35 -05:00
9b8f63b36f
EstimatedRamUse to Estimated Ram Use so we don't an en_gb translation
2020-12-05 10:23:29 -05:00
7106cd43a7
eslint
2020-12-04 18:30:05 -06:00
ac069e6e5e
fix zoom class in skins.js
2020-12-04 14:47:13 -06:00
0bf39dc954
fix setting the thumbnail class in events
2020-12-04 14:44:05 -06:00
21aeccb5d0
centralize thumb animation js, add delay
2020-12-04 14:35:39 -06:00
0d0eac98be
Move the form below the navbar because it has a form in it. Remove oninput from minTime and maxTime
2020-12-04 15:28:51 -05:00
11f527514e
use a common function for datetime changes.
2020-12-04 15:28:26 -05:00
d998eac6ef
Update Filter code and Groups display
2020-12-04 15:17:04 -05:00
3a7571dd63
undo bogus cache use in Object constructor
2020-12-04 15:16:43 -05:00
5665eb14f5
fix bw select again
2020-12-03 19:33:10 -06:00
e93de2a3a4
partial jquery convesion of watch.js
2020-12-03 13:12:01 -06:00
05bd6e1c56
Fix editing groups causing a new Group to be added. You have to tell cakephp which Group you are saving. Also fix the resulting output to be the saved group, not a list of monitors. Fixes #3088
2020-12-03 13:14:19 -05:00
6877054fea
Parse tree dumping should be debug not warning
2020-12-03 11:17:41 -05:00
c8aac87f74
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-12-03 10:26:27 -05:00
19122d0824
Fix bandwidth dropdown clicking
2020-12-03 10:25:59 -05:00
ce4d9cd657
put back manual refresh button on watch view
2020-12-03 08:38:28 -06:00
74fe47c4c5
don't autorefresh watch view table
2020-12-03 08:31:52 -06:00
dd0cac35fe
include filterquery in watch view event list ajax
2020-12-03 07:53:09 -06:00
a38c392266
eslint
2020-12-03 07:22:32 -06:00
d5df996bca
deploy animated thumbnails on watch view
2020-12-02 19:44:12 -06:00
76eea525b7
Merge pull request #3085 from hax0kartik/Font
...
Font
2020-12-02 16:16:21 -05:00
1c10cc492b
Fix StartTime to StartDateTime
2020-12-02 13:15:32 -05:00
aac47ed361
fixes to export functions
2020-12-02 12:02:24 -06:00
f13533cab7
convert export functions to jquery
2020-12-02 10:53:55 -06:00
70689acf8d
remove data-mobile-responsive, use table-responsive-sm instead
2020-12-02 07:47:57 -06:00
347c64eb7d
remove warning
2020-12-01 13:30:57 -06:00
6da826d79c
fix typo
2020-12-01 13:29:43 -06:00
8397ec3b9d
Merge branch 'release-1.34'
2020-12-01 14:28:10 -05:00
Andrew Bauer
rabsym
Isaac Connor
Steve Gilvarry
Isaac Connor
Andrew Bauer