Isaac Connor
|
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 |
|
Isaac Connor
|
858674c0b2
|
Merge branch 'master' into filter_locking
|
2020-10-28 12:52:52 -04: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 |
|
Isaac Connor
|
a2596505e9
|
add LockRows to Filters
|
2020-10-26 18:47:17 -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
|
8a3e0e108c
|
Put back filter query code
|
2020-10-23 14:02:27 -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
|
29819d8044
|
fix copy/paste error with events.php
|
2020-10-22 13:27:47 -05:00 |
|
Andrew Bauer
|
230f35f0c0
|
comment out debug in events.js
|
2020-10-22 08:50:06 -05:00 |
|
Andrew Bauer
|
0d14dcfbfa
|
WIP events view server pagination
|
2020-10-22 08:49:07 -05:00 |
|
Isaac Connor
|
9372b2ef8c
|
remove debug
|
2020-10-22 08:53:05 -04:00 |
|
Isaac Connor
|
452416e72a
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-10-20 19:23:12 -04:00 |
|
Isaac Connor
|
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 |
|
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 |
|
Isaac Connor
|
080557d580
|
add an id to buttons div so that we can use it when calling scaleToFit
|
2020-10-19 14:27:43 -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 |
|
Isaac Connor
|
14894dfb00
|
remove extra comma
|
2020-10-19 09:08:25 -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
|
442fadb585
|
link bstable locale to zoneminder's
|
2020-10-17 07:28:14 -05:00 |
|
Andrew Bauer
|
1ed160866b
|
add legacy watch view alarm buttons to toolbar
|
2020-10-16 15:47:42 -05:00 |
|
Isaac Connor
|
3fdbae7761
|
add 1440p to the resolution list
|
2020-10-16 14:54:54 -04: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 |
|
Isaac Connor
|
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 |