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
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
d7429014b6
Convert progress to a double instead of int.
2020-10-06 16:36:56 -04:00
0e89d28c26
Send SEEK as two integers representing a float
2020-10-06 16:34:06 -04:00
87fd316e5b
makePopupButton removed, use makeButton instead
2020-10-05 16:40:14 -05: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
2faedc6248
Sort sessions by access time so that we list active users first
2020-10-05 10:34:52 -04:00
1cf181372f
Only load users for logged in sessions
2020-10-05 10:30:57 -04:00
fa641a0345
Convert progress to a double instead of int.
2020-10-05 10:30:38 -04:00
6d1e5330e3
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-10-05 09:30:49 -04:00
93021f5806
Update getNearEvents to handle when event doesn't exist
2020-10-05 09:30:33 -04:00
2852d14ca6
use data-on-change-this instead of inline js
2020-10-04 08:04:11 -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
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
1ef1b48c71
remove warnings used for testing
2020-10-03 07:08:04 -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
311ba4ef69
use bootstrap styles on logged in user table. Include ip address
2020-10-02 16:04:56 -04:00
7261a7b1dd
Merge branch 'sessions_in_db'
2020-10-02 15:57:11 -04:00
e9d120f032
remove debug
2020-10-02 15:56:56 -04:00
bc5002515e
remove debug
2020-10-02 15:56:50 -04:00
d97f8af215
Finish showing logged in users
2020-10-02 15:56:39 -04:00
23f2c1468f
rough in a table of the logged in users
2020-10-02 15:21:58 -04:00
5d20dde85c
Implement a Session class that takes over session functions and stores in the database
2020-10-02 14:50:22 -04: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
950b04c659
convert popuplink
2020-10-02 12:51:17 -05:00
6c0f61ebbd
rework devices view, remove inline onclick
2020-10-02 12:39:05 -05:00
1691e4321b
don't log ajax response text if it is empty
2020-10-02 10:28:50 -05:00
a80b4b91fb
fix x10 device edit
2020-10-01 16:03:58 -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
ef958b1649
enable mgmt of x10 device permissions
2020-10-01 10:51:59 -05:00
928fa67fce
redirect to previous view after user perm changes
2020-10-01 10:45:44 -05:00
b8d95dfa05
fix array to string php warning
2020-10-01 09:13:50 -05:00
e26e36606f
update version check logic in navbar
2020-10-01 08:46:58 -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
9bb82f6e9a
whitespace
2020-09-30 09:25:52 -05:00
2d30d7aafa
convert download view to modal
2020-09-30 09:12:54 -05:00
aa7ba44ed9
Use ->zmaControl instead of invalid zmaControl(). the old zmaControl takes a mid, not a monitor object
2020-09-29 16:48:22 -04:00
24d8b99eea
test for property_exists to quiet errors
2020-09-29 16:47:49 -04: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
953a6e0785
more fixes to download view
2020-09-29 10:15:58 -05:00
5200af8206
add missing return to download view
2020-09-29 09:50:15 -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
fc366aa503
add missing echo
2020-09-28 15:41:07 -05:00
1361f0936c
clean up download view
2020-09-28 15:38:56 -05:00
58902c70d6
use output_script_if_exists to cache_bust most of the js
2020-09-28 09:49:07 -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
3b46ebacae
remove warning used for testing
2020-09-27 12:20:09 -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
784533ac07
clean up group view
2020-09-27 08:11:45 -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
1260d7bbb2
convert controlcap tabs to pills
2020-09-26 17:05:13 -05:00
935f73ad33
reconfig controlcap cancel button
2020-09-26 16:39:31 -05:00
2d8349073d
redirect to controlcaps after saving a control
2020-09-26 14:31:59 -05:00
dc08319037
add navbar to error view
2020-09-26 14:29:02 -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
e2fb5ae9ea
use br html tag to break the text
2020-09-26 09:24:17 -05:00
9d1c24234b
add ConfirmDeleteControl to lang
2020-09-26 08:58:26 -05:00
c831f16d92
add EditControl to lang
2020-09-26 08:05:00 -05:00
5b1d6331e4
make the delconfirm modal generic
2020-09-26 07:53:22 -05:00
48a649a132
extend pill list bkgnd vertically in options
2020-09-26 07:30:15 -05:00
df5192a6b4
link to controlcaps from options view
2020-09-25 21:46:54 -05:00
b7efdebf9a
dynamically find the Level col index
2020-09-25 21:26:22 -05:00
f4e7e264f0
fix makelink
2020-09-25 16:18:44 -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
ea99bc173e
add navbar to monitor probe views
2020-09-25 14:49:14 -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
c73dbc480f
unpopup the svg ploygon in zones
2020-09-25 12:34:04 -05:00
ae9139b00c
unpopup zone view
2020-09-25 10:52:13 -05:00
1ac5572d59
unpopup the zones view
2020-09-25 07:56:09 -05:00
493b9d0ef7
revert newlog row colors back to former
2020-09-25 07:21:14 -05:00
f9d28ddabe
stick a map on the location tab
2020-09-24 20:31:22 -04:00
a3f4837186
Use config options for tile datam access tokens and turning geolocation on/off
2020-09-24 20:30:57 -04:00
a109d7bba0
leaflet can't be cache busted so update output_link_if_exists and output_script_if_exists to take a cache_bust flag
2020-09-24 20:21:38 -04:00
386f991364
Merge branch 'master' into location
2020-09-24 19:28:57 -04:00
bcb430d393
copy log.css to newlog and add a style for bg-danger
2020-09-24 16:03:26 -04:00
310e52840d
remove under construction banner
2020-09-24 12:29:28 -05:00
89fddf3555
decrease refresh timing
2020-09-24 12:27:03 -05:00
d58f776d9d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-09-24 12:13:01 -04:00
e6d7a528d8
Use newer Filter object methods
2020-09-24 12:12:49 -04:00
cdc07715b7
remove parseFilterToTre and fix filter['query'] to filter['querystring']
2020-09-24 12:12:37 -04:00
8bd958e91c
pass querySep to querystring
2020-09-24 12:12:06 -04:00
e47fa48a8e
move parseFilterToTree from timeline_functions to Filter->tree(). Fix passing separator in querystring
2020-09-24 12:11:45 -04: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
9c7bbd4aa7
introduce output_script_if_exists, use it to link leaflet.js if it exists
2020-09-24 09:13:25 -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
f416ab96c5
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-09-22 16:22:07 -04:00
70be6bc84c
Add an estimated ram use to buffer tabs
2020-09-22 16:21:59 -04:00
5771e74a6f
eslint
2020-09-22 15:16:42 -05:00
eb736df405
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-09-22 15:51:49 -04:00
fbc15c8109
Fix FPS Report Interval label
2020-09-22 15:51:44 -04:00
d2ba9c5234
load bs-table toolbar & autorefresh
2020-09-22 14:23:25 -05:00
2bdbb48692
update to bootstrap-table 1.18.0 and more extensions
2020-09-22 14:09:02 -05: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
0aa0452b7e
Use a redirect instead of just changing the view on monitor save. This fixes the reload issue
2020-09-22 14:05:37 -04:00
b1dd42dd8b
Use bootstrap nav pills to just hide/show the tab instead of doing form submits in monitor editing
2020-09-22 14:05:11 -04:00
7196eaf0d0
Minimum value for label position is 0, not 1.
2020-09-22 13:14:25 -04:00
2457dcb16f
Minimum value for label position is 0, not 1.
2020-09-22 13:12:39 -04:00
a43cbc05af
Fix case on Servers. Turn off error reporting so that mkdir(ZM_DIR_EXPORTS) doesn't generate a warning. Fix server column in xml output
2020-09-21 13:03:03 -04:00
b6541aa1ff
Move log export to a generic modal
2020-09-21 13:01:58 -04:00
cbbdfdbd43
Introduce generic getModal and manageModalBtns
2020-09-21 13:00:55 -04:00
2ff2fbecd9
Remove fieldset styling. We were conflicting with bootstrap
2020-09-21 13:00:29 -04:00
96474a7d94
Fix case on Servers. Turn off error reporting so that mkdir(ZM_DIR_EXPORTS) doesn't generate a warning. Fix server column in xml output
2020-09-21 13:00:03 -04:00
3e3af0bca5
Fix zmcontrol.pl command line to not use = to match with usage elsewhere
2020-09-21 11:24:17 -04:00
b16d4045ee
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-09-21 11:15:41 -04:00
861ebedcae
Implement a crude view for a failed db connection with a 30 second reload interval.
2020-09-21 11:15:34 -04:00
1d1b0e58d2
consolidate getJson fail callbacks to one function
2020-09-20 08:41:16 -05:00
c75f5c68c1
unpopup the log view
2020-09-19 12:59:15 -05:00
0a7848d9d2
remove uneeded state php and js files
2020-09-19 12:36:55 -05:00
a3c0e160a2
convert state modal to ajax request
2020-09-19 12:36:04 -05:00
bf29357455
Merge branch 'release-1.34'
2020-09-19 12:01:21 -04:00
3492582b98
add missing css for settings popup
2020-09-19 12:00:32 -04:00
7c1ec4f957
convert logout modal to ajax request
2020-09-19 10:44:05 -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
467e75a11c
convert eventdetail function to php file
2020-09-18 11:03:20 -05:00
2757b74957
convert servermodal function to php file
2020-09-18 10:34:33 -05:00
a058d077bb
fix typo
2020-09-18 10:11:58 -05:00
10119dc609
convert storage function to php file
2020-09-18 10:02:02 -05:00
1b2f0514b9
convert delconfirm function to php file
2020-09-18 09:43:29 -05:00
6e6b9a464b
convert enoperm function to php file
2020-09-18 09:24:23 -05:00
416de4a068
fix git screwup
2020-09-18 08:56:17 -05:00
bc7cadcc73
convert optionhelp function to php file
2020-09-18 08:35:21 -05:00
e491f2ee76
Add id's to dropdowns to fix zone edit behaviour. Remove CSP violations
2020-09-17 20:58:53 -04:00
8f3b3466af
setup onblur function for presetSelector
2020-09-17 20:58:18 -04:00
29880cdab3
handle width options['width'] and options['height'] aren't set
2020-09-17 20:57:14 -04:00
006cc079c4
Rework action to use Zone class and just take a list of Zid's so that technically we can delete zones from multiple monitors at once.
2020-09-17 20:56:56 -04:00
1701089211
Add MonitorId to Zone fields and add Monitor() method
2020-09-17 20:56:21 -04:00
42dc4e46b1
add canEdit method to Monitor object
2020-09-17 20:56:04 -04:00
f61a21fec4
Add modals dir with filterdebug modal
2020-09-17 15:17:53 -04:00
6aa4302fe0
Add EventDiskSpace as a term and add a Debug modal button
2020-09-17 15:17:29 -04:00
bb4bd935d6
use getBodyTopHTML as it include an error message div. Show db errors with the error message
2020-09-17 15:17:06 -04:00
6a77591237
Add lang for Event DiskSpace and FileSystem ISKSpace
2020-09-17 15:15:28 -04:00
4a6743be3f
turn off debug
2020-09-17 15:15:13 -04:00
123b2a4747
Change Event Diskspace case to not interfere with Filesystem DiskSpace
2020-09-17 15:14:54 -04:00
1caaf01502
Add code to the default case to include a file in ajax/modals/.php so that the modals template can be kept out of functions.php. We don't need the auth stuff. Also turn off error reporting as we should only return json.
2020-09-17 15:14:09 -04:00
ef8fb774df
Handle no data in setNavBar
2020-09-17 13:51:31 -04:00
Andrew Bauer
Isaac Connor
Andrew Bauer