39023b3e7b
don't set zoom class in frames.js
2020-12-09 18:19:10 -06:00
026b8cfb0c
eslint
2020-12-09 17:58:46 -06: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
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
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
df35bd75a5
Escape column names for mysql 8
2020-12-05 16:29:23 -05: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
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
e93de2a3a4
partial jquery convesion of watch.js
2020-12-03 13:12:01 -06:00
6877054fea
Parse tree dumping should be debug not warning
2020-12-03 11:17:41 -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
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
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
051e361958
eslint
2020-12-01 12:19:01 -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
836cd2d58d
Merge branch 'Font' of https://github.com/hax0kartik/zoneminder into font
2020-11-30 09:45:39 -05:00
528699f942
Use ctzll + new font format for improving drawing speed
2020-11-28 18:46:20 +05:30
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
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
52e747791d
rough in frames server pagination backend
2020-11-13 12:34:01 -06:00
95f8aad19b
Fix detection of filter['id']
2020-11-11 17:39:55 -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
289612a826
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2020-11-04 18:10:55 -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
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
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
492e65c2fd
Add missing PathToAPI
2020-11-02 12:42:30 -05:00
3d795be864
remove the thumbnail col if WEB_LIST_THUMBS is off
2020-11-01 15:46:43 -06:00
824f38c746
hide settings buttons rather than disable for non Local monitors
2020-11-01 08:05:53 -06: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
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
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
a2596505e9
add LockRows to Filters
2020-10-26 18:47:17 -04:00
fad4339713
no need for full page reload with server pagination
2020-10-26 12:12:50 -05:00
59cf5c33c2
reset search on events load
2020-10-26 13:06:22 -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
cb073950b9
events view server pagination WIP
2020-10-25 10:28:22 -05:00
a2dc4b5f08
handle params.daa not existing
2020-10-24 09:45:38 -04:00
efaf95beda
dirty hack to rename data.filter to data.advsearch
2020-10-24 08:51:26 -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
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
29819d8044
fix copy/paste error with events.php
2020-10-22 13:27:47 -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
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
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
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
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
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
442fadb585
link bstable locale to zoneminder's
2020-10-17 07:28:14 -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
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
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
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
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
ff14d11fef
Don't output the filter, just log it!
2020-10-13 10:07:27 -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
c4ea27db8d
fix buttons in shutdown modal
2020-10-12 14:51:33 -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
0f263407a5
make redirect conditional on previous view
2020-10-12 10:32:25 -05: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
03c8e86908
update some quotes
2020-10-10 11:09:51 -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
95b09ad182
Add samesite=strict to all Cookie setting
2020-10-07 11:26:18 -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
76af02cc76
whitespace
2020-10-05 16:31:26 -05:00
01596ec26c
whitespace
2020-10-05 15:53:46 -05:00
9c7ebf8c9e
unpopup video view
2020-10-05 15:44:07 -05:00
f93450f9ea
remove plugin support for viewing downloads
2020-10-05 14:44:45 -05:00
321de3c604
only update changed elements in video view
2020-10-05 13:59:44 -05:00
862f0ca732
add xmlfooter to video view, replace mootools
2020-10-05 09:37:00 -05:00
2e6efbb349
replace inlince onchange event in control view
2020-10-03 21:44:24 -05:00
d9b8a7ceb2
remove unused view
2020-10-03 21:35:38 -05:00
adb715c42c
fix typo
2020-10-03 21:32:07 -05:00
a0ad52bac9
replace another inline onchange event
2020-10-03 21:30:48 -05:00
Andrew Bauer
Isaac Connor
Isaac Connor
hax0kartik
Andrew Bauer