ad3894ab1b
WIP replace with jquery
2021-01-11 13:46:50 -05:00
4ade926df4
eslint
2021-01-11 13:46:50 -05:00
d25d2b4894
replace mootools in montagereview.js
2021-01-11 13:46:50 -05:00
3d77069b0b
bring montage minimize chervron into the view
2021-01-11 13:46:50 -05:00
113d2d1797
replace mootools in montage.js
2021-01-11 13:46:50 -05:00
0a5d6ca4ba
replace mootools in cycle.js
2021-01-11 13:46:50 -05:00
b1b71e5f09
fix return too soon when no log results
2021-01-11 13:46:50 -05:00
ddce421cab
eslint
2021-01-11 13:46:50 -05:00
cb6bf682e8
eslint
2021-01-11 13:46:50 -05:00
b6d5802301
revert back to a standard modal (no static backdrop) for objdetect
2021-01-11 13:46:50 -05:00
d9a97fbf40
eslint
2021-01-11 13:46:50 -05:00
6f78b5a105
eslint
2021-01-11 13:46:50 -05:00
b95f1baa96
WIP replace mootools in zone.js
2021-01-11 13:46:50 -05:00
e6a6c1b52f
WIP replace mootools in zone.js
2021-01-11 13:46:50 -05:00
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
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
baeb1dbd5b
Take an optional debug param in dbQuery
2020-12-01 14:07:23 -05:00
ae7a706526
Handle minTime and maxTime being specified as either a timstamp or a datetime. Remove duplicated query building code. Reduce ram requirements when exporting logs.
2020-12-01 14:04:51 -05:00
051e361958
eslint
2020-12-01 12:19:01 -06:00
b0da7f5920
fix navbar bandwidth dropdown
2020-12-01 10:27:08 -06:00
93f11bbc82
set responsive breakpoint for small screens on watch & events views
2020-12-01 09:50:32 -06:00
f12c8f453e
after deleting an event, call streamNext rather than reload
2020-12-01 09:30:06 -06:00
23fcd1f2c5
modernize the event playback view
2020-12-01 09:07:42 -06:00
ac01e0638a
Update skin.css
2020-11-30 10:19:12 -06:00
ee9f98d7e6
make modal content more readable on dark skin
2020-11-30 10:06:35 -06:00
836cd2d58d
Merge branch 'Font' of https://github.com/hax0kartik/zoneminder into font
2020-11-30 09:45:39 -05:00
67dac2651b
Log an error with path when can't open video
2020-11-29 17:06:07 -05:00
528699f942
Use ctzll + new font format for improving drawing speed
2020-11-28 18:46:20 +05:30
d68b922632
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-11-27 13:30:31 -05:00
8c56ac80c5
Make Name,Path,Url in storage modal 100%
2020-11-27 13:30:24 -05:00
80c4e2fa57
Fix table not being 100%. Use appropriate bootstrap style labels for radios
2020-11-27 13:29:57 -05:00
a67fb0bb16
eslint
2020-11-26 19:28:25 -06:00
8d8054bc0f
deploy bstable to watch view
2020-11-26 17:00:05 -06:00
08dabf1a4f
don't add "zoom" class when thumb animation is off
2020-11-25 13:29:14 -06:00
28614ce703
change where we check for web_animate_thumbs
2020-11-25 13:16:11 -06:00
ff4b0e6309
add option to disable thumb animation
2020-11-25 13:03:16 -06:00
cf08010ebe
Fix redirect on zone editing
2020-11-18 13:04:56 -05:00
5bf5d58ac1
Fixes recovering frames from jpegs. Use Time::HiRes stat to get microseconds.
2020-11-16 11:32:50 -05:00
a2b5271835
fix copy/paste typo
2020-11-14 17:34:59 -06:00
0ffb5e153c
modify FilterTerm to support Frames view searches
2020-11-14 17:33:18 -06:00
f3756def08
deploy server side pagination for frames view
2020-11-14 14:45:22 -06:00
9aa6fea6a3
frames view server pagination WIP
2020-11-14 14:19:28 -06:00
f88d721ae3
fix issue with events view and ALL pagination
2020-11-14 10:27:33 -06:00
f32d10a1ab
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-11-13 17:16:13 -05:00
66f7cc55dc
Spacing code comments, quotes
2020-11-13 17:05:23 -05:00
52e747791d
rough in frames server pagination backend
2020-11-13 12:34:01 -06:00
a581cb9de1
Make various text input options be 90%
2020-11-13 10:18:35 -05:00
70ebd570e0
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-11-13 09:52:10 -05:00
3cf31435a7
fix next/prev buttons by correcting the sort_field when it is StartTime or EndTime
2020-11-13 09:51:54 -05:00
c0225a35aa
use different variable assignment for clarity
2020-11-13 07:24:17 -06:00
a15c8ea7d8
Merge pull request #3072 from ZoneMinder/iconnor_ajax_event_changes
...
Rework code to use Filter methods to generate advanced search
2020-11-13 07:10:08 -06:00
df783f4835
Merge branch 'master' into zma_to_thread
2020-11-12 12:53:55 -05:00
95f8aad19b
Fix detection of filter['id']
2020-11-11 17:39:55 -05:00
fe733fe1e6
Must use & instead of & in filter redirect
2020-11-11 17:39:37 -05:00
73e8c04b6f
Fix encoding of = in filter['Id']. Fixes redirect after saving
2020-11-11 17:39:20 -05:00
52c7cc5869
reorganize code. Remove Server caching as it is done in Object.php.
2020-11-11 11:49:44 -05:00
b4aacde5bf
Remove debug. Auth is pretty solid these days
2020-11-10 13:15:46 -05:00
5b10fff2a0
Use cached objects when using new instead of only find_one
2020-11-10 13:14:36 -05:00
f2630b8fbc
Merge branch 'master' into move_event_totals_to_monitor_status
2020-11-06 14:17:23 -05:00
59403dc11b
Move event stat totals to Monitor_Status.
2020-11-06 14:00:18 -05:00
6ed006bc60
rename StartTime and EndTime to StartDateTime and EndDateTime in the named query params
2020-11-06 12:25:04 -05:00
402b559b2c
Add StartTime and EndTime virtual fields for backwards compatability
2020-11-06 11:15:12 -05:00
68cdd2123d
Merge branch 'release-1.34'
2020-11-05 13:55:15 -05:00
746882ba85
Get rid of zmEventScaleAuto cookie. Just use the per monitor zmEventScale cookie. Fixes #3070
2020-11-05 13:45:02 -05:00
7b8ee6af9f
Rework code to use Filter methods to generate advanced search functionality. Reduces sql queries to 1 or 2, using count() to populate [total] and [totalNotFiltered]. Does pagination using array_splice instead of SQL queries. Will use more ram, but reduces db load.
2020-11-05 12:20:49 -05:00
ee89eb45e6
Fix EndTime to EndDateTime
2020-11-04 18:39:02 -05:00
e085e08caa
Fix missed StartTime to StartDateTime
2020-11-04 18:27:51 -05:00
130588eb8f
fix typos
2020-11-04 18:22:50 -05:00
d37bce4e0e
Fix missed StartTime to StartDateTime
2020-11-04 18:20:59 -05:00
289612a826
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2020-11-04 18:10:55 -05:00
b17fa8f9c1
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:58:03 -05:00
ce99a9456b
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:56:44 -05:00
68ad1cf1f7
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:56:37 -05:00
786e2fec92
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:56:27 -05:00
af9e279f9e
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:55:27 -05:00
d75e93249c
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:54:12 -05:00
9d22de98a3
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:53:45 -05:00
9e6a9cad80
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:53:17 -05:00
8029f59eac
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:52:50 -05:00
2d33dd5386
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:52:32 -05:00
0d404ac66f
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:50:45 -05:00
4731041a40
FS Storage DiskSpace isn't implemented.
2020-11-04 12:42:04 -05:00
e67532ef76
implement is_valid_attr. Fix incorrect EventDiskspace vs FS DiskSpace. FS DiskSpace isn't implemented. DiskPercent is.
2020-11-04 12:40:43 -05:00
387b2b1fc2
add attr validation to addTerm. Add addTerms
2020-11-04 12:39:42 -05:00
af399bb174
Reqiure Id to have a value not just be set
2020-11-04 09:18:41 -05:00
2c899bd3c5
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-11-03 12:11:58 -05:00
6112db627c
Even if we found the filter in the db, if it is present in the query string, update the object with the new values
2020-11-03 11:59:28 -05:00
b2385ccecc
colour match a:link to navbar colour. This has the effect of brightening up all links.
2020-11-03 11:53:15 -05:00
dda1decfb1
When redirecting after execute, redirect to the full filter querystring, as it may not have an Id and may have additional changes
2020-11-03 11:45:22 -05:00
f7c9a0e03d
Must urlencode [Id]=
2020-11-03 11:44:54 -05:00
3b785cfde0
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-11-02 16:31:53 -05:00
736c2e4cf5
Merge pull request #3068 from ZoneMinder/fix_endtime
...
Test for EndTime value before using strftime on it.
2020-11-02 15:21:43 -06:00
0f74e24bfc
Join Monitors as M as well in total and totalNotFiltered queries
2020-11-02 15:50:38 -05:00
bd1d4f954b
Test for EndTime value before using strftime on it.
2020-11-02 15:45:05 -05:00
96a9a73320
roll back events.php
2020-11-02 14:33:40 -06:00
7650e0bf51
cleanup my totalNotFiltered code. Join Monitors as well as they can be referenced by the filter
2020-11-02 12:43:45 -05:00
492e65c2fd
Add missing PathToAPI
2020-11-02 12:42:30 -05:00
73e6d5a9d0
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-11-01 18:44:15 -05:00
6e3eb922e0
Use relative symlinks for monitor event directories
...
This way the link continues to work from backups and after the user moves ZM data to a new directory.
2020-11-01 14:55:08 -08:00
3d795be864
remove the thumbnail col if WEB_LIST_THUMBS is off
2020-11-01 15:46:43 -06:00
787953559d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-11-01 16:11:10 -05:00
824f38c746
hide settings buttons rather than disable for non Local monitors
2020-11-01 08:05:53 -06:00
30e0e49ee7
Fix total rows when using search
2020-10-31 14:09:47 -04:00
5047c28157
attempt to fix totalnotfiltered
2020-10-31 11:26:29 -05:00
41e88fad6e
translate \n to <br/>. Fixes #3064
2020-10-29 15:08:14 -04:00
75ec13871d
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2020-10-29 09:40:49 -04:00
97f4d9e7a2
Make the event count and diskspace in the storage row be a link to events for that storage area.
2020-10-29 09:40:14 -04:00
638a05b207
Fix totalrows in pagination. Still figuring this out.
2020-10-29 09:39:48 -04:00
368c1649fe
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2020-10-29 08:47:34 -04:00
858674c0b2
Merge branch 'master' into filter_locking
2020-10-28 12:52:52 -04:00
686f793d09
fix truth value for ZM_OPT_USE_GEOLOCATION
2020-10-28 12:49:39 -04:00
b3a28b2ba2
fix confusion in syslog reporting web_php when the error was actually web_js
2020-10-28 12:49:03 -04:00
df788f2810
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-28 12:40:00 -04:00
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
1690bcbd38
update auth_relay when we update auth_hash
2020-10-26 18:49:14 -04:00
a5bb2365b5
update auth_relay when we update auth_hash
2020-10-26 18:49:03 -04:00
ffc5249a66
add LockRows to Filters
2020-10-26 18:47:55 -04:00
a2596505e9
add LockRows to Filters
2020-10-26 18:47:17 -04:00
7b106e2522
don't use wildcards in advanced search
2020-10-26 12:20:26 -05:00
fad4339713
no need for full page reload with server pagination
2020-10-26 12:12:50 -05:00
5ed168bccd
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-26 13:07:18 -04:00
1f64a263eb
give better log when jqxhr is empty
2020-10-26 13:06:41 -04:00
59cf5c33c2
reset search on events load
2020-10-26 13:06:22 -04:00
da87b5b475
Make invalid sort field non-fatal. Fix column specification in search and advscearch and fix resulting sql due to = instead of .=
2020-10-26 13:06:05 -04:00
97573122bc
fix EndTime
2020-10-26 09:33:11 -05:00
27b39a0258
comment out warning used for debug
2020-10-26 09:19:08 -05:00
4abfa61bbc
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-26 10:03:12 -04:00
4c791b390f
fix warning due to undefined vars being used
2020-10-26 09:59:15 -04:00
706bf085f4
Add pre and post sql conditions and pre-populate the return
2020-10-26 09:58:47 -04:00
e5563dc901
remove unwanted #
2020-10-25 16:06:37 -05:00
6d00924c9b
deploy server pagination for events view
2020-10-25 12:11:34 -05:00
8cf899efc5
remove commented line
2020-10-25 10:58:27 -05:00
e9b71b4ce1
events view server pagination - fix sorting name & monitor
2020-10-25 10:40:29 -05:00
cb073950b9
events view server pagination WIP
2020-10-25 10:28:22 -05:00
f87be2d289
specify the table name when we sort in events view
2020-10-25 08:24:56 -05:00
a2dc4b5f08
handle params.daa not existing
2020-10-24 09:45:38 -04:00
90c5f63d6d
Fix session.gc SQL issue. Don't need a * when deleting
2020-10-24 09:05:39 -04:00
efaf95beda
dirty hack to rename data.filter to data.advsearch
2020-10-24 08:51:26 -04:00
760e20bc0f
Populate Monitor name and use event class DiskSpace to get DiskSpace when it hasn't been populated in the db yet
2020-10-24 08:50:59 -04:00
2178da387d
pass desired object name into querystring()
2020-10-23 17:56:38 -04:00
b6004012e9
implement passing the object name to use when constructing the querystring
2020-10-23 17:56:05 -04:00
2ebd686d19
Use a ZM\Filter for initial filtering. SELECT E.*,M.* to match how we do it in Filters and older event code. pass the row into new Event() so that it doesn't go back to the DB to get the Event property data.
2020-10-23 17:55:43 -04:00
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
8a3e0e108c
Put back filter query code
2020-10-23 14:02:27 -04:00
ad137adb4c
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-23 11:30:19 -04:00
d425d1006e
push newevents.php to master
2020-10-23 10:21:32 -05:00
5d7e3b0510
handle no responseText in jqxhr
2020-10-23 11:12:57 -04:00
d62a5caccd
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-23 09:35:13 -04:00
90e81c5774
Merge branch 'release-1.34'
2020-10-23 09:34:35 -04:00
c8392feba3
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2020-10-22 16:35:44 -04:00
235dd2a2fb
don't use wildcards in event view advanced search fields
2020-10-22 15:06:06 -05:00
29819d8044
fix copy/paste error with events.php
2020-10-22 13:27:47 -05:00
d117e993ad
add create task to ajax/log.php
2020-10-22 10:17:34 -05:00
230f35f0c0
comment out debug in events.js
2020-10-22 08:50:06 -05:00
0d14dcfbfa
WIP events view server pagination
2020-10-22 08:49:07 -05:00
9372b2ef8c
remove debug
2020-10-22 08:53:05 -04:00
4a0ada5335
improve logging of invalid task in ajax/log
2020-10-22 08:52:54 -04:00
e6f08959fa
Fix use of result instead of NearEvents
2020-10-21 10:40:26 -04:00
8f8526c2f1
add some debug to session garbage collection
2020-10-21 10:38:42 -04:00
946a59ce8b
add special case for sort_field being StartDateTime. This is not an event column and must be corrected to StartTime
2020-10-21 10:37:39 -04:00
1c5e161909
quotes
2020-10-21 10:37:06 -04:00
1dfebc24b0
Fix ZM\
2020-10-21 10:36:58 -04:00
34ce3a1498
Use Filter::parse instead of parseFilter. Use Filter->addTerm to limit to User's monitor restrictions. Return early with better logging in the event of error. Introduce Filter->addTerm
2020-10-21 10:36:40 -04:00
452416e72a
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-20 19:23:12 -04:00
d88fd5e4e0
Revert WEB_EVENT_SORT_FIELD change from StartTime to StartDateTime back to StartTime. StartTime is the column name.
2020-10-20 19:23:03 -04:00
2eda49333f
Merge branch 'master' into zma_to_thread
2020-10-20 16:20:29 -04:00
b5aa215e31
WIP events view server pagination
2020-10-20 12:59:30 -05:00
6357c02ec9
WIP events view server pagination
2020-10-20 12:13:12 -05:00
41ed267b71
move view to the form action so that it is part of get request instead of post
2020-10-20 12:31:38 -04:00
bb5646baac
Load Logout modal content on click instead of every page load
2020-10-20 12:31:06 -04:00
5b27d77ea4
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-20 11:52:25 -04:00
1a77958548
Make loading the function modal happen on click instead of every page load.
2020-10-20 11:52:18 -04:00
bfa45b0c43
continue work on event view server pagination
2020-10-20 08:10:43 -05:00
4e391708f1
event view server pagination WIP
2020-10-19 14:18:21 -05:00
8a6aaa019f
Bump version for release to 1.34.22
2020-10-19 14:29:18 -04:00
0e63874533
fix calling changeScale when scale is 0 instead of auto
2020-10-19 14:28:21 -04:00
127ef9a130
Fix scaling when using ScaleToFit
2020-10-19 14:28:02 -04:00
080557d580
add an id to buttons div so that we can use it when calling scaleToFit
2020-10-19 14:27:43 -04:00
89f298771f
server pagination backend improvements
2020-10-19 12:25:13 -05:00
7ae7e05f14
roughin ajax call in event.js for server side pagination
2020-10-19 09:29:39 -05:00
e2b76257eb
Merge branch 'release-1.34'
2020-10-19 09:10:28 -04:00
14894dfb00
remove extra comma
2020-10-19 09:08:25 -04:00
6f45de04f8
partial roughin ajax event view server side pagination
2020-10-19 07:50:11 -05:00
97d05c2f88
move newlog ajax request to log
2020-10-18 07:20:59 -05:00
220a89b459
fix eslint
2020-10-17 16:17:30 -04:00
be63acdcc0
rollback bstable to 1.17.1git90f47e7
2020-10-17 11:49:17 -05:00
5bf0524bdc
chinese locale designation was backwards, fixing...
2020-10-17 07:29:32 -05:00
442fadb585
link bstable locale to zoneminder's
2020-10-17 07:28:14 -05:00
4044d60412
update bstable to 9fa4c82, add bstable locale extenstion
2020-10-17 07:23:26 -05:00
1ed160866b
add legacy watch view alarm buttons to toolbar
2020-10-16 15:47:42 -05:00
3fdbae7761
add 1440p to the resolution list
2020-10-16 14:54:54 -04:00
c5cd617204
Load logoutModal on click instead of always
2020-10-16 14:51:47 -04:00
d6dfde5630
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-16 12:21:22 -04:00
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
b9b45d8b9e
definitionPanel shouldn't be floated, or relse should be set to 100% width
2020-10-16 12:14:58 -04:00
c70493a43f
Add clear: both to content div. In general the content div is 100% so should drop below floats
2020-10-16 12:14:31 -04:00
f98a885ed5
update the watch view header
2020-10-16 08:08:23 -05:00
4f56f9d82b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-15 17:20:10 -04:00
12b75e93b8
Merge branch 'release-1.34'
2020-10-15 17:19:56 -04:00
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
5869817e0d
set playbackrates in video.js to match the ones offered by the zms player. Use the rates array set in includes/config.php
2020-10-15 17:17:20 -04:00
3c5dc8e8b3
Add line breaks in select options
2020-10-15 17:16:14 -04:00
7bb227283d
Update rates in includes/config.php
2020-10-15 17:15:54 -04:00
2fbbe11079
make the filter button style consistent
2020-10-15 08:01:32 -05:00
f32a7aaff5
deploy insertModalHtml
2020-10-14 15:58:39 -05:00
ec040b1bfd
don't set popup flag in event view
2020-10-14 13:59:15 -05:00
e69b3800c7
set return status for cancel and restart commands
2020-10-14 12:22:21 -05:00
a60815a700
eslint
2020-10-14 11:20:37 -05:00
bea95bca68
use ZM\Debug
2020-10-14 10:33:40 -05:00
57a1a383ad
Merge branch 'release-1.34'
2020-10-14 11:32:50 -04:00
e9fb150880
Improve error message when a row doesn't exist in the Monitor_Status table
2020-10-14 11:32:33 -04:00
c3a98c1f44
replace shutdown form submit with ajax
2020-10-14 10:03:33 -05:00
da948065bb
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-14 10:39:31 -04:00
10c0a6617c
Return Debug to a regular function to match other logging functions. Since we switched to using namespaces we no longer clash with cake_php.
2020-10-14 10:39:25 -04:00
ba82088b99
make all the data-on-xxx js bindings functions
2020-10-14 08:51:44 -05:00
ff14d11fef
Don't output the filter, just log it!
2020-10-13 10:07:27 -04:00
e8c9845e08
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-13 09:02:47 -04:00
e4fec8c5ea
code style cleanups, most defaulting to 'Id' as the term attr so that we can use an empty filter as a quick jump to event feature
2020-10-13 09:02:38 -04:00
031b41f78a
remove the english word popup from lang files
2020-10-13 07:59:34 -05:00
cd2e96eaec
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-13 08:42:28 -04:00
908c20e959
add ZM prefix to Warning
2020-10-13 08:42:22 -04:00
89c76ec140
no need to clare $view as global
2020-10-12 14:52:57 -05:00
c4ea27db8d
fix buttons in shutdown modal
2020-10-12 14:51:33 -05:00
49fec5142c
remove popup code form skin.js
2020-10-12 13:34:40 -05:00
e5e1455f7a
replace embedded popuplinks in watch view
2020-10-12 13:26:20 -05:00
332ec2032a
replace createPopup with location.assign
2020-10-12 12:37:23 -05:00
1db31ba574
remove makePopupLink function. Use makeLink instead
2020-10-12 12:20:21 -05:00
ed5f6b2625
convert shutdown popup to modal
2020-10-12 12:16:52 -05:00
0f263407a5
make redirect conditional on previous view
2020-10-12 10:32:25 -05:00
66a8d3876d
add caching of users by username to improve performance
2020-10-12 11:25:20 -04:00
3646a66168
translate unquoted literal Filter
2020-10-12 11:20:22 -04:00
1ffa1cc33b
Add button update checks for AutoUnarchive
2020-10-12 10:56:01 -04:00
1854e02ab3
Accept both Id and filter[Id] when loading filters.
2020-10-12 10:55:42 -04:00
3fa0ef25f6
Add a link to the filter representing the events list
2020-10-12 10:55:03 -04:00
637551b7e7
Add english for FilterUnarchiveEvents
2020-10-12 10:54:38 -04:00
046124fe0e
Add AutoUnarchive column, also add Id to querystring if this is a saved Filter
2020-10-12 10:54:22 -04:00
fa34d00392
Add object classes for Manufacturer and Model
2020-10-11 09:57:51 -04:00
a6de3e15f4
AddManufacturerId and ModelId to Monitor view
2020-10-11 09:57:08 -04:00
03c8e86908
update some quotes
2020-10-10 11:09:51 -04:00
9e6db17e68
Fix getting next event due to case of asc
2020-10-10 11:09:39 -04:00
630d9011f3
Fix redirect when saving users
2020-10-10 09:48:09 -04:00
9cc7f0d360
Merge branch 'release-1.34'
2020-10-08 09:28:25 -04:00
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
624006022c
Use a redirect to get rid of post on reload
2020-10-07 11:59:11 -04:00
95b09ad182
Add samesite=strict to all Cookie setting
2020-10-07 11:26:18 -04:00
b683d5326a
Test for empty array in htmlOPtions when notifying about not selecting a value
2020-10-07 11:22:42 -04:00
efd56a2e09
spacing
2020-10-07 11:16:02 -04:00
7f67d09749
test for monitorIds value before calling explode because explode will return an array with an empty first element instead of an empty array
2020-10-07 11:14:57 -04:00
ae7ed5a342
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-06 16:51:24 -04:00
9abde9ee06
Merge branch 'release-1.34'
2020-10-06 16:51:12 -04:00
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
rabsym
Isaac Connor
Steve Gilvarry
Isaac Connor
Andrew Bauer
hax0kartik
Matt N