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
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
230f35f0c0
comment out debug in events.js
2020-10-22 08:50:06 -05:00
9372b2ef8c
remove debug
2020-10-22 08:53:05 -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
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
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
1ed160866b
add legacy watch view alarm buttons to toolbar
2020-10-16 15:47:42 -05: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
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
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
1ffa1cc33b
Add button update checks for AutoUnarchive
2020-10-12 10:56:01 -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
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
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
b4d2fa5e75
replace inline onchange event
2020-10-03 21:14:24 -05:00
65b6dad48c
eslint
2020-10-03 17:38:56 -05:00
8d19cee811
unpopup the addnewuser button
2020-10-03 17:12:44 -05:00
aee5430bc8
only load preset and settings modals when needed
2020-10-03 17:00:20 -05:00
1643fb686b
convert settings popup to modal
2020-10-03 16:51:25 -05:00
391ce88f05
eslint
2020-10-02 21:11:54 -05:00
a97e526298
fix save button in controlpreset modal
2020-10-02 16:10:32 -05:00
802e439cb5
convert controlpreset view to a modal
2020-10-02 15:46:28 -05:00
7b5090ceab
move newlog view to log view
2020-10-02 13:26:35 -05:00
c5f69b9441
eslint
2020-10-02 13:24:30 -05:00
6c0f61ebbd
rework devices view, remove inline onclick
2020-10-02 12:39:05 -05:00
186b8ac947
convert x10 device view to a modal
2020-10-01 15:52:33 -05:00
c61c111d9e
modernize devices view
2020-10-01 12:52:20 -05:00
c4cf52c2bc
new version notice is now part of the navbar
2020-10-01 08:15:20 -05:00
591a30f1fe
fix typo
2020-09-30 13:33:11 -05:00
4bc373105d
fix typo
2020-09-30 13:12:58 -05:00
9b9138f113
replace popup calls in montagereview
2020-09-30 12:20:24 -05:00
d77b55d1d6
replace popup code in add_monitor
2020-09-30 10:40:13 -05:00
2d30d7aafa
convert download view to modal
2020-09-30 09:12:54 -05:00
3024c46dbb
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-09-29 14:50:13 -04:00
6eaa8aa211
whitespace
2020-09-29 13:05:00 -05:00
4694ce59bb
export event function does not need element
2020-09-29 12:55:57 -05:00
a12a870e2c
download.js - replace mootools with jquery
2020-09-29 12:51:01 -05:00
1af20cea6a
Fix unarchive. The reload was killing the getJSON. Should only do that on success
2020-09-29 09:42:31 -04:00
ecac5e051a
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-09-28 09:34:14 -04:00
0a4a144bbc
Merge branch 'location'
2020-09-28 09:33:28 -04:00
699cbed6af
add back and refresh buttons to export view
2020-09-27 12:43:12 -05:00
9ea58dc4a1
eslint
2020-09-27 12:16:04 -05:00
c1a0afef95
make group view into a modal
2020-09-27 12:12:01 -05:00
47e5a26da4
eslint
2020-09-27 07:41:05 -05:00
a6413ccd7f
call modal when edit btn is clicked on event view
2020-09-27 07:12:32 -05:00
2655118cbd
change call to popup -> view in event.js
2020-09-26 21:21:29 -05:00
9d2450d55d
load export view, rather than popup
2020-09-26 21:15:50 -05:00
b2cf48a645
remove unused call to filter popup
2020-09-26 21:06:57 -05:00
935f73ad33
reconfig controlcap cancel button
2020-09-26 16:39:31 -05:00
112003f9de
eslint
2020-09-26 13:55:56 -05:00
0c4fcbbe97
convert controlcaps view to bstable
2020-09-26 12:09:41 -05:00
b7efdebf9a
dynamically find the Level col index
2020-09-25 21:26:22 -05:00
582d85f083
unpopup the controlcaps views
2020-09-25 16:12:05 -05:00
eedf18073f
add navbar to controlcap views
2020-09-25 16:05:16 -05:00
6a5610e404
add back and refresh buttons to user view
2020-09-25 15:49:18 -05:00
2b0badfebe
add back and refresh buttons to zones
2020-09-25 13:44:55 -05:00
8018bd4ed9
add back & refresh buttons to zone view
2020-09-25 13:37:06 -05:00
d66b0be1bb
fix scalecontrol on frame view
2020-09-25 13:08:55 -05:00
ae9139b00c
unpopup zone view
2020-09-25 10:52:13 -05:00
493b9d0ef7
revert newlog row colors back to former
2020-09-25 07:21:14 -05:00
a3f4837186
Use config options for tile datam access tokens and turning geolocation on/off
2020-09-24 20:30:57 -04:00
386f991364
Merge branch 'master' into location
2020-09-24 19:28:57 -04:00
89fddf3555
decrease refresh timing
2020-09-24 12:27:03 -05:00
e4a1bacbbf
get adv search working in newlog view
2020-09-24 11:05:34 -05:00
88f1dcca13
centralize bstable icon var, change table refresh icon
2020-09-24 08:25:39 -05:00
e4bbbce161
fix eslint
2020-09-24 09:13:44 -04:00
624bcdcde0
Add Latitude and Longitude to Monitors and monitor edit as well as using the geolocation api to auto-populate them
2020-09-24 09:01:30 -04:00
b4450fecec
init bootstrap-table only once
2020-09-23 14:32:40 -05:00
16a593e904
eslint
2020-09-23 13:56:41 -05:00
3f2f7359f0
rough in new log view - very rough
2020-09-23 13:09:19 -05:00
70be6bc84c
Add an estimated ram use to buffer tabs
2020-09-22 16:21:59 -04:00
ed6d5a55a5
put an onchange on the monitorType causing a form submit so that Source and Storage tabs update. Rename action to save and put it on the submit button
2020-09-22 14:33:26 -04:00
b6541aa1ff
Move log export to a generic modal
2020-09-21 13:01:58 -04:00
1d1b0e58d2
consolidate getJson fail callbacks to one function
2020-09-20 08:41:16 -05:00
0a7848d9d2
remove uneeded state php and js files
2020-09-19 12:36:55 -05:00
03a0e849b8
remove unneeded js from console.js
2020-09-19 10:24:28 -05:00
ec20fdf3ad
convert function modal to ajax request
2020-09-19 10:18:59 -05:00
d2963fe28f
convert donate modal to ajax request
2020-09-19 08:55:08 -05:00
8f3b3466af
setup onblur function for presetSelector
2020-09-17 20:58:18 -04:00
6aa4302fe0
Add EventDiskSpace as a term and add a Debug modal button
2020-09-17 15:17:29 -04:00
b64bd97a64
whitespace
2020-09-16 18:22:37 -05:00
c8c3b75e33
Reload the page after table refresh
...
This wasn't needed on my machine, but might be on others
2020-09-16 18:21:06 -05:00
bea23e2241
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-09-16 09:58:49 -04:00
c1f872c9aa
Reinit chosen on log filters after updating them
2020-09-16 09:58:15 -04:00
afdd4702a2
add server modal
2020-09-16 08:30:45 -05:00
4fa9237048
Fix eslint
2020-09-16 08:57:44 -04:00
a430fe1f7a
correct EndTime to End Date/Time. EndTime and EndDate terms are also effective
2020-09-15 21:19:10 -04:00
33ef700dda
Cause links in events use eventdetail modal
2020-09-15 09:49:03 -05:00
121671327c
call eventdetail modal rather than popup
2020-09-15 08:55:32 -05:00
ab8e2d2e6c
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-09-14 14:05:02 -04:00
d02a61e715
change will to might
2020-09-14 14:03:55 -04:00
cc7b65e8aa
eslint
2020-09-14 10:31:44 -05:00
d2bc39f65f
replace storage popup with modal
2020-09-14 09:50:04 -05:00
0a0b555c4c
refresh table after archive or unarchive
2020-09-13 11:32:28 -05:00
29710f67ac
fix table refresh after delete
2020-09-13 11:25:31 -05:00
c4c4551436
replace no permission alerts with enoperm()
2020-09-13 11:09:15 -05:00
096f4a446f
Use Ajax to load delete confirm modal
2020-09-13 10:39:51 -05:00
7e55dd14a2
eslint
2020-09-13 08:52:52 -05:00
951afc669f
eslint
2020-09-13 08:33:47 -05:00
1599bc4c14
load stats on deman via ajax
2020-09-13 07:32:49 -05:00
0c8bb25889
eslint
2020-09-11 16:49:36 -05:00
2ee70442c0
use done() and fail() callbacks for getJSON
2020-09-11 14:30:36 -05:00
3fb62b7904
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-09-10 19:26:23 -04:00
46e69f8c27
Show correct enabled/disabled status in the function dialog
...
monitor.Enabled is a string and 0 is truthy in JS
2020-09-10 15:12:31 -04:00
2e5a897355
Merge pull request #3038 from mnoorenberghe/fix_function_save
...
Fix saving function changes
2020-09-10 11:52:38 -04:00
e37c5ac385
Use FrameId instead of FramesId
2020-09-10 11:10:19 -04:00
1f837c1718
Hide eventId not FrameId
2020-09-10 11:04:18 -04:00
f046b565c6
Fix saving function changes
...
Wait for the request to complete before reloading.
2020-09-10 11:01:44 -04:00
013e007141
run parseRows on init so that datetime fields get their popups etc
2020-09-09 15:40:44 -04:00
Isaac Connor
Andrew Bauer
Andrew Bauer
Matthew Noorenberghe
Isaac Connor