2457dcb16f
Minimum value for label position is 0, not 1.
2020-09-22 13:12:39 -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
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
bf29357455
Merge branch 'release-1.34'
2020-09-19 12:01:21 -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
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
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
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
6b2773ad8c
Handle invalid eid more gracefully.
2020-09-16 14:21:03 -04:00
9268db14a7
Fix xss reported by Noccolo Picca relating to not sanitizing connkey
2020-09-16 14:14:31 -04: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
32f60631b3
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-09-15 18:53:42 -04:00
81306928b8
Fix scale width and height dropdown actions on cycle
2020-09-15 18:53:39 -04:00
21d4773da9
fix badly formatted line
2020-09-15 13:08:44 -05:00
da73ecee08
delete commented line
2020-09-15 13:05:05 -05:00
5f361094bb
unpopup frames and alarmframes in export view
2020-09-15 13:01:35 -05:00
40eb60f644
unpopup monitor config from export view
2020-09-15 12:52:13 -05:00
798557604f
remove old pagination var from events.php
2020-09-15 10:58:42 -05:00
845815b566
unpopup call to image view
2020-09-15 10:51:45 -05:00
be150479a1
unpopup Max Score link in events view
2020-09-15 10:37:05 -05:00
df443326ea
unpopup monitor link in events view
2020-09-15 10:31:14 -05:00
b9d95f0833
fix typo
2020-09-15 09:50:53 -05:00
33ef700dda
Cause links in events use eventdetail modal
2020-09-15 09:49:03 -05:00
9e12090348
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-09-15 10:00:24 -04:00
121671327c
call eventdetail modal rather than popup
2020-09-15 08:55:32 -05:00
1d3ce1c916
must define sortQuery as a global in export view
2020-09-15 08:27:44 -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
56aa906dd8
call getStatsTableHTML in frames view
2020-09-12 11:55:24 -05:00
5d914d8b01
convert stats table to a function
2020-09-12 11:53:53 -05:00
f31b3bfc59
add xhtmlFooter to stats view
2020-09-12 11:48:33 -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
26cefda712
deploy optionhelp to option view
2020-09-11 13:23:14 -05:00
d2b2291721
deploy optionhelp to monitor view
2020-09-11 13:10:18 -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
4dc00ebe09
spacing, only add extra sort by Id column if we aren't already sorting by Id
2020-09-10 11:05:22 -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
b34c6dcfc2
correct log, code docs
2020-09-07 13:29:36 -04:00
74dc8af76f
add global
2020-09-07 13:29:21 -04:00
1659bb2116
Add id to scale dropdown
2020-09-06 12:12:26 -04:00
034bee9bb2
fix errors due to selects no longer having an id by default
2020-09-05 17:33:17 -04:00
23505159da
put scale code together with itself. Get rid of unneeded generateConnKey
2020-09-05 12:23:00 -04:00
b3b6445d60
Fix application of scales to montage streams
2020-09-05 09:15:33 -04:00
bf895f8f12
Make Zones a link to view/edit all zones
2020-09-05 09:15:09 -04:00
778fdb9ab0
fix lack of id's on width,height,scale dropdowns making their selection break
2020-09-05 08:56:00 -04:00
7e6fbe1ab4
Fix ControlTypes dropdown.
2020-09-05 08:46:18 -04:00
bd829f8aa1
Specify a function name for data-on-click to fix the Back/Close button for Events. Fixes #3033
2020-09-04 10:25:05 -04:00
77cca7efac
eslint --fix
2020-09-04 10:02:43 -04:00
46790bf401
Add monitor json data
2020-09-03 18:25:00 -04:00
1f810c8947
Populate the function modal from the javascript monitors array before viewing.
2020-09-03 18:24:45 -04:00
1e4d80ee7b
Make the function modal monitor-agnostic . It will get populated before being made visisble
2020-09-03 18:24:09 -04:00
ea5d19412c
Only include the function modal once at the end as it will get populated with data before being made visible
2020-09-03 18:23:26 -04:00
d4d0a971d1
get rid of errant fo
2020-09-03 10:19:59 -04:00
dd5e342196
use xhtmlFooter
2020-09-02 18:17:12 -04:00
b0eacba0ee
use xhtmlFooter
2020-09-02 18:14:45 -04:00
22a40edd71
spacing
2020-09-02 18:12:35 -04:00
18671b7c19
use xhtmlFooter instead of html since it now contains all the javascript
2020-09-02 17:57:32 -04:00
69bee20ef5
use xhtmlFooter instead of html since it now contains all the javascript
2020-09-02 17:56:30 -04:00
5b53289fee
fix html structure
2020-09-02 17:55:34 -04:00
7623733840
use xhtmlFooter and fix spacing
2020-09-02 17:55:23 -04:00
aa4e9600eb
Update to use MonitorStream
2020-09-02 17:36:01 -04:00
e25708ce99
use getBodyTopHTML and xhtmlFooter
2020-09-02 17:35:46 -04:00
fa780c5020
use xhtmlFooter instead of html since it now contains all the javascript
2020-09-02 17:35:24 -04:00
f38692795e
use xhtmlFooter instead of html since it now contains all the javascript
2020-09-02 17:35:13 -04:00
cf1f408e96
Don't need pauseString and playStream anymore
2020-09-02 17:34:09 -04:00
c6bc6704b3
use xhtmlFooter instead of html since it now contains all the javascript
2020-09-02 17:33:56 -04:00
bc710bc826
use xhtmlFooter instead of html since it now contains all the javascript
2020-09-02 17:33:09 -04:00
a6ad57b393
fix html validation errors
2020-09-02 17:32:24 -04:00
c2760ef768
add needed js stuff for streaming
2020-09-02 17:28:08 -04:00
d243d798ff
add needed js stuff for streaming
2020-09-02 17:27:59 -04:00
0cd35518c3
Fix id on nav
2020-09-02 14:47:07 -04:00
ab116a1a6f
use xhtmlFooter as it now contains the javascript instead of xhtmlHeader
2020-09-02 14:47:00 -04:00
84bed1b16a
include MonitorStream, fix layout of image stream. Update buttons. start with a static image, MonitorStream will start the streaming
2020-09-02 14:46:45 -04:00
7b4569392c
use xhtmlFooter as it now contains the javascript instead of xhtmlHeader
2020-09-02 14:46:08 -04:00
3d3966b1ea
use xhtmlFooter as it now contains the javascript instead of xhtmlHeader
2020-09-02 14:45:40 -04:00
5aef5e2312
populate monitorData for MonitorStream use
2020-09-02 14:45:10 -04:00
02d056b277
Fix left column positioning
2020-09-02 14:44:52 -04:00
8d2ced0fbb
use MonitorStream to handle the video streaming. update buttons. Add onload event to streaming image so that we redraw the points where they should be. Handle padding in locating points.
2020-09-02 14:44:11 -04:00
4f90f37f0e
add back request queue
2020-09-02 14:42:47 -04:00
9d84b8bd83
remove datetimepickers from static html. They get added later by javascript
2020-09-02 14:42:23 -04:00
5544057a8d
Merge branch 'master' into improve_zone_editing
2020-08-31 18:47:24 -04:00
762bea0761
Bulk load monitor/Group relationships. Instead of using DESCRIBE Monitors Function, use a new function getMonitorFUnctionTypes to get this data for dropdown purposeses. Reduces db hits a lot.
2020-08-31 18:30:05 -04:00
5a9cbdaa3f
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-08-31 16:43:41 -04:00
e120e21b11
fix off-by 1 in limiting results
2020-08-31 10:37:35 -04:00
0995708b5b
Use ajax request instead of webui to delete events. The reason is that the web ui will spit out the events view after performing the action. Without a filter it will try to list every event.
2020-08-31 10:37:03 -04:00
0b493cd85a
add svg circles for the points
2020-08-31 10:15:14 -04:00
3d5ad4902a
zones can now list multiple monitors
2020-08-31 10:14:53 -04:00
3f4f28f322
Move monitor class into js/MonitorStream for use elsewhere
2020-08-31 10:13:58 -04:00
fa18887f5c
zones can now list multiple monitors so populate a listof monitors with json data
2020-08-31 10:13:30 -04:00
f00f9ead79
Move monitor class into js/MonitorStream for use elsewhere
2020-08-31 10:12:47 -04:00
3e09840995
Merge branch 'master' into improve_zone_editing
2020-08-28 17:43:07 -04:00
990b5bd9dc
monitor view - convert links to buttons
2020-08-28 15:22:57 -05:00
9c56cd223f
move header right to shift pill list up
2020-08-28 13:32:46 -05:00
47732e2469
right align monitor item names
2020-08-28 13:18:01 -05:00
a919be7b2d
replace tabs with vert pills
2020-08-28 13:09:49 -05:00
d69b3e7f43
make cancel go back to console
2020-08-28 10:56:09 -05:00
04b3f5d294
Merge branch 'master' into improve_zone_editing
2020-08-28 09:43:48 -04:00
2b6090d8c6
console.js - change all createPopup to window.location.assign
2020-08-28 07:58:42 -05:00
a288a54fbe
make form id unique on logout view
2020-08-28 07:42:33 -05:00
1e78307735
add navigation buttons to monitor view
2020-08-27 16:30:49 -05:00
f294d099c9
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-27 17:16:18 -04:00
3d9557c5a4
Implement limit on returned events. Free ram in cache if post_condition fails
2020-08-27 17:16:10 -04:00
1f5f964ae3
add navbar to monitor view
2020-08-27 15:53:24 -05:00
948836ed96
enable jump-to feature on frames
2020-08-27 14:58:21 -05:00
e9cef72d9f
Use ViewWdith/ViewHeight to get rotated dimensions when calculating thumbnail size
2020-08-27 12:44:56 -04:00
1ad084c052
Remove parse
2020-08-27 12:14:17 -04:00
69be26213a
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-08-27 11:55:26 -04:00
dc15663030
Fix scales after applying layout
2020-08-27 10:55:14 -04:00
6173890a45
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-27 10:34:00 -04:00
702ea365c2
Remove cruft and fix the filter bar toggle
2020-08-27 10:33:52 -04:00
4c1446d856
Fixes to scale selection and remove code that altered width&height in zms url. zms doesn't honour them. Calculate new scale and alter that parameter.
2020-08-27 10:33:08 -04:00
62eddfdf2b
reorganize code a bit for better logical grouping
2020-08-27 10:31:27 -04:00
4bacb136c9
enable page-jump-to table extension
2020-08-27 07:46:52 -05:00
e8a2bbf6e0
continue to fix corrupted merge conflict
2020-08-27 07:42:39 -05:00
9b69eb5762
fix corrupted merge conflict
2020-08-27 07:35:05 -05:00
8ba91db1fb
make logout view a modal
2020-08-26 16:28:11 -05:00
8d202aeef0
eslint
2020-08-26 15:36:38 -05:00
ab68bef39a
Merge branch 'master' into filter_pre_post
2020-08-26 15:28:48 -04:00
99472242af
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-26 15:16:36 -04:00
0ced21dda7
Persist video volume in a cookie so that subsequent events remember the volume level.
...
Fixes #3013
2020-08-26 15:15:57 -04:00
74d2ba56db
Persist video volume in a cookie so that subsequent events remember the volume level.
2020-08-26 15:15:10 -04:00
67fe9d0cb4
un-popup the users views
2020-08-26 13:52:10 -05:00
24d1ba3a00
fix eslint
2020-08-26 13:41:40 -04:00
1c7bddf96e
monitor config no longer a popup
2020-08-26 12:22:19 -05:00
ac7867eab3
make function view a modal
2020-08-26 11:39:48 -05:00
06942746d6
Merge branch 'release-1.34'
2020-08-25 12:41:33 -04:00
b5ef7b08b9
settings popup has to come from the server hosting the v4l device, so use monitor->UrlToIndex and include auth.
2020-08-25 12:40:22 -04:00
6587cdd3de
Handle failure to get v4l settings. Fix assignment of values to monitor object.
2020-08-25 12:39:44 -04:00
e3a48c2db4
Handle the case where the layout has invalid json
2020-08-25 12:07:45 -04:00
6fbe7457ff
Add missing globals
2020-08-25 11:47:49 -04:00
626e892b33
add global
2020-08-25 11:43:55 -04:00
3d3dde22c4
Use zm_session_start
2020-08-25 11:31:06 -04:00
278be59c86
Use zm_session_start
2020-08-25 11:30:51 -04:00
3c29228df5
Use zm_session_start
2020-08-25 11:30:22 -04:00
586f9f3e52
Use zm_session_start
2020-08-25 11:27:25 -04:00
981439cbd9
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-24 17:42:37 -04:00
fe5e005d8e
Calculate scale to pass to getStreamSrc for thumbnail still and stream
2020-08-24 17:42:23 -04:00
0879ecf9a5
update timeline header
2020-08-24 14:33:01 -05:00
8c32511c83
whitespace
2020-08-24 12:05:31 -05:00
bce38ae2c6
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-24 12:05:25 -04:00
56e2ac5baa
add scale to query params because zms doesn't wupport width&height
2020-08-24 12:05:14 -04:00
e5e2c3b347
fix stats off by 1 frame, don't alert on score 0
2020-08-24 10:57:54 -05:00
c6e3107a50
make donate view a modal
2020-08-24 09:31:21 -05:00
67f2e3c1a0
Merge branch 'master' into filter_pre_post
2020-08-24 10:30:01 -04:00
b5cdc5c32d
Set width and height on image tag so browser knows how to lay them out. Fixes flickering.
2020-08-24 10:26:07 -04:00
0e9c8a35e6
fix thumbnail height style. Make thumbnail clickable.
2020-08-24 09:32:49 -04:00
0f27243007
Merge branch 'master' into filter_pre_post
2020-08-24 09:23:24 -04:00
8ea806e264
eslint
2020-08-23 18:40:58 -05:00
699b20b961
whitespace
2020-08-23 17:54:57 -05:00
65181c84ee
update frame top toolbar
2020-08-23 17:53:47 -05:00
773557ee8a
set view to stats rather than popup
2020-08-23 13:25:09 -05:00
86f0d41d8e
autoinit changeScale in frame view
2020-08-23 13:17:03 -05:00
63fc59568f
pad frames cells to account for detail view
2020-08-23 13:12:54 -05:00
4b144dea74
whitespace
2020-08-23 13:02:35 -05:00
f06bfe7cbb
use bootstrap-table on stats view
2020-08-23 12:23:58 -05:00
69ba9e6d0e
eslint
2020-08-23 12:14:09 -05:00
2a7ea52330
Merge branch 'release-1.34'
2020-08-23 11:51:54 -04:00
4cbac47d6d
add navbar to stats view
2020-08-22 21:09:58 -05:00
de1d1c2ac6
change close link to back link
2020-08-22 14:43:53 -05:00
ad67f74ba4
add formatting to stats table
2020-08-22 14:12:11 -05:00
afc3d2c548
fix horizontal scroll issues events
2020-08-22 13:00:53 -05:00
e69e767878
fix horizontal scroll nonsense
2020-08-22 12:56:31 -05:00
61f89e3306
rough in frames detail view
2020-08-22 12:45:19 -05:00
5d09ae91ab
move div tag into $imgHTML
2020-08-22 07:14:47 -05:00
8ea7b783b5
generate thumbnails when monitor is connected
2020-08-21 21:18:55 -05:00
c8e40eb5b3
don't generate tumbnails when not running
2020-08-21 21:14:16 -05:00
39d538d5cf
add missig }
2020-08-21 20:57:05 -05:00
73a01855f8
rough in thumbnail animation
2020-08-21 20:44:20 -05:00
ac0976324f
Fix case of filterQuery. Fixes #3017
2020-08-21 11:22:47 -04:00
9357017a39
add export fx to tables
2020-08-21 07:11:57 -05:00
519bfae1da
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-08-20 17:12:41 -04:00
de4d144cd4
fix scale dropdown in frame view
2020-08-20 10:16:28 -05:00
72d95275c3
add navbar for frame view
2020-08-20 09:19:04 -05:00
247ace7fa2
process clicks per cell in frames
2020-08-20 09:13:11 -05:00
7175fa3d86
no padding on frames outermost div
2020-08-20 08:19:53 -05:00
c9de30d427
click any row to load frame
2020-08-19 17:54:39 -05:00
b2a632a3f8
reinit thumbnail ani on click events
2020-08-19 16:16:27 -05:00
8f70ae192d
enable thumbnail zoom on frames view
2020-08-19 15:42:35 -05:00
a903a885b6
whitepsace
2020-08-19 14:07:00 -05:00
c2d6b8f493
revert code that passed the div hightlightOn/Off. Better to pass index. Fixes js errors.
2020-08-19 14:39:15 -04:00
d0c21995cd
Fixes to function converting from pixels to percent. Adjust to 100 if > 100.
2020-08-19 14:14:32 -04:00
efec1e7d4f
remove debug
2020-08-19 14:13:48 -04:00
177df46113
Apply min=0 to filterX and Y so that we don't get negative values
2020-08-19 14:11:16 -04:00
d366d41297
Update parseFilter to Filter::parse
2020-08-19 14:07:51 -04:00
842efc1574
remove <a> tags from col headers
2020-08-19 12:31:13 -05:00
74b0ad2cb3
get rid of horizontal scrollbar in frames
2020-08-19 12:20:57 -05:00
f317bf1722
fix copy/paste typo
2020-08-19 12:07:31 -05:00
e38a532b78
rough new frames view
2020-08-19 12:04:08 -05:00
ad9b9d91cc
disable the back button when new page
2020-08-18 16:57:03 -05:00
b38c5e98a8
Merge branch 'master' into filter_pre_post
2020-08-18 16:33:04 -04:00
3664a9b42c
set the pagination list
2020-08-18 15:12:07 -05:00
1e41bd0823
whitespace
2020-08-18 13:48:18 -05:00
6eb7b6d51c
set the right toolbar btn class to match
2020-08-18 13:13:32 -05:00
df02d84a56
don't go back if not referred
2020-08-18 13:08:17 -05:00
2c9caeb348
whitespace
2020-08-18 12:40:27 -05:00
2d5522df14
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-18 13:25:21 -04:00
c837a17aea
Add a warning about missing EndTime term on UpdateDiskSpace
2020-08-18 13:25:18 -04:00
bf63500b08
fix thumbnail animation after user event
2020-08-18 12:00:20 -05:00
e6d6ee1b67
Merge branch 'filter_warnings'
2020-08-18 11:17:46 -04:00
16efa9dbb2
Add extra checks for Deleting without an Archived State term and Running in the background without any actions.
2020-08-18 11:17:22 -04:00
1627b1d0d1
privacy view page formatting
2020-08-18 09:08:26 -05:00
287c585d3d
use translated text for delete confirmation
2020-08-18 08:26:45 -05:00
b32bcab91f
add a delete confirmation modal
2020-08-18 08:06:58 -05:00
610f73a835
Merge branch 'release-1.34'
2020-08-17 19:30:32 -04:00
0a3ad719cd
Merge branch 'master' into filter_pre_post
2020-08-17 18:30:44 -04:00
1dd0b44334
eslint nanny strikes again
2020-08-17 16:59:57 -05:00
dc451cbc85
Use filter class
2020-08-17 17:42:22 -04:00
e3fe75f21b
fix case on filterQuery
2020-08-17 17:42:03 -04:00
e5dd10fc04
use filter class instead of parseFilter
2020-08-17 17:41:50 -04:00
0f90b999c0
use filter class instead of parseFilter
2020-08-17 17:41:38 -04:00
6649a30bbb
Use querystring instead of query
2020-08-17 17:41:13 -04:00
80b92573b8
set the icons used in bstable toolbar
2020-08-17 16:18:18 -05:00
f4594f06d1
Add in pre_condition checks.
2020-08-17 16:58:37 -04:00
e452c23c4d
Merge branch 'master' into filter_pre_post
2020-08-17 12:56:43 -04:00
e4425d7565
Merge branch 'master' into filter_pre_post
2020-08-17 12:56:20 -04:00
11afad5c92
add pagination on/off toggle
2020-08-17 11:02:25 -05:00
1a6154752a
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-16 20:08:49 -04:00
a8455d4ecf
Add necessary globals
2020-08-16 20:08:42 -04:00
de0a4a18ee
fix checkbox column
2020-08-16 18:00:11 -05:00
5468c0322e
appease the eslint nanny
2020-08-16 16:30:35 -05:00
0cbf559821
only hide cols if cookie not exist
2020-08-16 16:02:43 -05:00
33ea9de8cf
better spacing archived & emailed tinytext
2020-08-16 15:19:08 -05:00
f27f6e6394
fix archive buttons, remove asterisk from event name
2020-08-16 14:46:56 -05:00
94d666b296
tiny text under event name, add emailed column
2020-08-16 14:41:50 -05:00
ee31761627
cleanup & consolidate events view buttons
2020-08-16 13:44:18 -05:00
77c391fcae
Add booleanvalues for operators support
2020-08-16 13:07:42 -04:00
77f9f4bffb
Add ExistsInFileSystem support in Filters. This also includes limiting operators to IS/IS NOT
2020-08-16 13:07:21 -04:00
303154c690
Remove countSQL code that ran the sql query once to get the # of entries returned to be used in pagination. Now that we support POSTSQL Conditions it is no longer useful. Pagination has to happen later. Implement POSTSQLConditions in filtering results.
2020-08-16 13:06:37 -04:00
9be63f1d99
reorganize and init eventTable
2020-08-16 11:34:37 -05:00
93475bef7e
eslint nanny
2020-08-15 16:08:53 -05:00
252bf7995a
eslint nannt
2020-08-15 15:54:58 -05:00
45fde13535
rough in new events view
2020-08-15 15:27:58 -05:00
c87886f5a5
Fix v4l2 channel and palette dropdowns allowing the saving of local monitors.
2020-08-15 12:31:30 -04:00
dbb2535a6b
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-08-14 13:08:04 -04:00
7225281771
enlarge event thumbs on hover
2020-08-13 12:50:59 -05:00
b45c4fac1f
tighten up event column spacing
2020-08-13 12:33:13 -05:00
047d69ace7
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-13 11:28:00 -04:00
c4ee4fb307
split start & end times into sep cols & wrap
2020-08-13 09:24:42 -05:00
27c80cedac
set small screen breakpoint on table-responsive
...
This gets rid of the ugly horizontal scroll bars on the table on larger screens
2020-08-12 10:10:55 -05:00
6cbc54ef87
When storage area has been deleted, say so
2020-08-11 14:11:48 -04:00
5f0da93c6e
turn off debug
2020-08-11 13:47:48 -04:00
303cec92f6
Add globals, fixing timeline view
2020-08-11 13:47:37 -04:00
0a7df075ae
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-11 11:41:15 -04:00
d42424d6d8
Merge branch 'release-1.34'
2020-08-11 11:41:11 -04:00
355428e93e
direct settings view to the monitor that is actually recording the stream
2020-08-10 21:32:23 -04:00
e8bf2aa386
Update settings view. Were assigning to a function. More work to be done.
2020-08-10 21:20:23 -04:00
4a31ebe045
Update options.php
2020-08-10 15:48:20 -05:00
b5553c968b
expand options to full width
2020-08-10 15:41:25 -05:00
4097693b38
appease the eslint nanny
2020-08-10 13:38:53 -05:00
3fa97f2bc1
reogranize state.php
2020-08-10 13:35:12 -05:00
bafffdb486
Test for configuration of ZM_PATH_SHUTDOWN and provide useul error message
2020-08-10 12:26:37 -04:00
5ee086bbfe
Test for configuration of ZM_PATH_SHUTDOWN and provide useul error message
2020-08-10 12:25:44 -04:00
f04e1a0ba7
Apply min=0 to filterX and Y so that we don't get negative values
2020-08-09 22:20:06 -04:00
ec707acdd1
Fixes to function converting from pixels to percent. Adjust to 100 if > 100.
2020-08-09 22:19:43 -04:00
a001c93321
fix zone editing globals and inputs being too big
2020-08-08 11:41:24 -04:00
8533ce7018
fix CSP on polygons
2020-08-08 11:38:54 -04:00
5fb56c9f57
Merge branch 'master' into zma_to_thread
2020-08-07 17:52:43 -04:00
fc5fabf1c5
fix zone editing globals and inputs being too big
2020-08-06 12:24:51 -04:00
a19990f4d7
Merge branch 'release-1.34'
2020-08-06 11:57:35 -04:00
ef2ad12846
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-05 20:00:45 -04:00
ddeef6f031
Fix globals and a Fatal without ZM\ prefix
2020-08-05 20:00:39 -04:00
76e0d155d3
declare globals
2020-08-05 19:15:01 -04:00
90671cd4e5
Add missing globals
2020-08-04 18:07:01 -04:00
1ab828c110
Add globals
2020-08-04 17:35:52 -04:00
dd627d9234
Update cycle monitorlist sidebar to bootstrap4
2020-08-04 17:35:41 -04:00
ba4d6dff64
Add globals definitions
2020-08-04 17:05:58 -04:00
9a06d6cab6
Fix some spacing
2020-08-04 17:05:44 -04:00
c0f21ab55d
Fix globals
2020-08-04 16:36:24 -04:00
ab9a135759
fix inability to stop zm from the web console
2020-08-03 12:10:34 -05:00
eb1d94345f
remove crud
2020-08-03 11:05:58 -04:00
a2958fe288
Spacing, and don't output mootools for postlogin. Don't use mootools in postlogin
2020-08-03 10:57:08 -04:00
325178a556
convert log filters to responsive bootstrap divs.
2020-08-02 20:25:24 -04:00
6f9947b583
Switch to jquery in login.js. We no longer include mootool for login view.
2020-08-02 19:12:07 -04:00
68b7277784
Fix sizing of option name by removing the non-semantic elements and just specifying the styles
...
in css/base/views/option.css. Alsoo apply h-100 to columns to that nav bar fills the vertical space.
2020-08-02 11:20:18 -04:00
4851f1f940
remove errant text
2020-08-01 09:50:25 -05:00
889b08519a
Set a small breakpoint on table-responsive
...
This fixes (ugly) horizontal scroll bars appearing at the bottom of the monitor table on larger screens, without breaking functionality on mobile devices. @roddone please test this on your mobile device
2020-08-01 09:49:27 -05:00
b46d3b81d6
Update user view to use User class
2020-08-01 10:27:54 -04:00
c2ac7ed4a9
spacing and escape sql fields
2020-07-30 17:07:43 -04:00
d8cd4386cf
rename GetOptEncoderParams to GetOptEncoderParams to GetOptEncoderParamsVec so that we can get at the std::string if we want to.
...
Use EncoderParams when setting movflags in VideoStore.
Move the content of this option to a help popup so that we can remove the comments from it. av_dict_parse doesn't handle the hash tag as a comment.
2020-07-30 15:06:05 -04:00
6a4ce29bce
eslint fixes
2020-07-30 12:15:05 -04:00
68dcc05cce
force the options labels small
...
seems backwards, but the bootstrap 4 docs have <small> and <strong> tags rather than a css class
2020-07-30 09:11:39 -05:00
6b303b67d0
continued adjustment of options view fields
2020-07-30 09:03:03 -05:00
484051a191
adjust column widths on options
2020-07-30 08:23:25 -05:00
b42eb44a79
handle when [fid] = 0; Fixes #2994
2020-07-29 18:51:11 -04:00
8e37efaa7a
handle when [fid] = 0; Fixes #2994
2020-07-29 18:50:14 -04:00
ded0dbc4ae
shrink the vert nav items further
2020-07-29 14:00:44 -05:00
32bbeb556f
set the vert navbar bg color in base.css
2020-07-29 13:51:36 -05:00
907063e385
use smaller font in form control item
2020-07-29 13:25:40 -05:00
fd5adc6623
remove blockquote from options.php
...
It makes the vertical navbar font unnaturally large
2020-07-29 12:49:32 -05:00
52d88e15fd
let options span the full column
2020-07-28 12:45:25 -05:00
cf9eb405ee
don't wrap the rows on small screens
2020-07-28 12:43:51 -05:00
aa8662f311
fix copy/paste typo
2020-07-28 10:37:10 -05:00
b88f0c3991
display user:port@ip when controladdress is empty
2020-07-28 10:08:24 -05:00
45f88ee04a
float web console statusBreakdown left then down
2020-07-28 08:59:28 -05:00
47b35e97fb
implement minimize chevron for filterbar
2020-07-27 16:14:15 -05:00
767f5ebb03
navbar closes the form, and doesn't need to be in the form.
2020-07-27 12:40:46 -04:00
5f9c62f266
spacing and slightly improve nav item code in options
2020-07-26 22:33:29 -04:00
003abfea29
Update class so that Submit button is hidden under new bootstrap
2020-07-26 22:32:36 -04:00
c48fa83c6d
upgrade to bootstrap 4.5
2020-07-25 13:18:09 -05:00
1416bc547e
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-22 17:37:52 -04:00
e746f0babe
Use 0 instead of the word auto for scale
2020-07-22 17:28:41 -04:00
869860bb26
Merge branch 'master' into zma_to_thread
2020-07-21 17:49:39 -04:00
7575afc8d5
Merge branch 'master' into zma_to_thread
2020-07-21 17:38:32 -04:00
495cd56b8b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-21 14:39:51 -04:00
64e4363302
update code populating DeviceChannel, DeviceFormat, CapturePalette
2020-07-21 13:40:04 -04:00
e23c6de373
populate monitors with monitor array which will be json-encoded. Fixes failed population of monitor names dropdown
2020-07-20 17:42:25 -04:00
9d6e0fc3af
Merge pull request #2977 from roddone/fix_events_table_responsive
...
make events table (events view) responsive
2020-07-16 15:49:01 -04:00
855efd57fd
Merge pull request #2977 from roddone/fix_events_table_responsive
...
make events table (events view) responsive
2020-07-15 10:44:34 -04:00
f22f3e9262
use a scaled svg and replace inline js
2020-07-13 14:51:07 -04:00
785ab58a80
make events table (events view) responsive
2020-07-13 11:33:26 +02:00
cfd57a851f
fix eslint
2020-07-08 20:53:12 -05:00
880219bb0f
Merge branch 'release-1.34'
2020-07-07 18:58:32 -04:00
6469300af5
fix some csp violations
...
y
2020-07-07 18:57:11 -04:00
89f975e646
remove code to play a sound on alarm. Not going to support that when editing a zone.
2020-07-07 16:40:33 -04:00
33d4680f02
Apply input limits when switching between percent and pixels. pixels must be integer, percent can be decimal.
2020-07-07 16:35:37 -04:00
2db65d3821
Merge branch 'release-1.34'
2020-07-04 09:09:24 -04:00
8a35ae2daf
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
2020-07-04 09:04:38 -04:00
d6d70ab06d
Put a list of cameras to cycle through on the left
2020-07-04 09:04:26 -04:00
ff265d2f17
replace buildSelect with htmlSelect. Update number inputs to take floats. Remove fixed sizes on various text inputs
2020-07-04 09:00:30 -04:00
e2a38268a0
replace buildSelect with htmlSelect. Update number inputs to take floats. Remove fixed sizes on various text inputs
2020-07-04 08:59:41 -04:00
fd10f545bd
if width/height don't evaluate to an integer, set to auto.
2020-07-04 08:58:09 -04:00
cc0624eb3f
Don't allow viewing of monitor setting if monitor permissions are set to View
2020-07-03 19:19:13 -04:00
1860ad188b
Don't allow viewing of zones or zone if Monitor permissions are view
2020-07-03 19:18:36 -04:00
343d8d832e
handle scale values of '' and 'auto'
2020-07-03 19:18:05 -04:00
2026788e7a
Turn close link into a button
2020-07-03 19:17:26 -04:00
66b155008c
Fix scale defaulting to monitor default Scale
2020-07-03 19:17:11 -04:00
9f821c74f6
Add tooltip on Add Monitor button explaining that the user doesn't have permission to add a monitor
2020-07-03 19:16:41 -04:00
4d8d926c89
minor code updates. Use user_row instead of generic row variable name.
2020-06-23 22:19:46 -04:00
e778ea0918
Update saving Users. Don't allow restrictions on admin user. Fix CSP violations.
2020-06-23 22:19:04 -04:00
93b0552ed7
Update saving Users. Don't allow restrictions on admin user. Fix CSP violations.
2020-06-23 22:18:45 -04:00
e68bf13a6b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-06-17 12:50:42 -04:00
d3c474fc8b
use translate on Show/Hide Zones
2020-06-17 12:50:36 -04:00
dcb77cdaea
apply stream scale in zoom coordinates
2020-06-17 14:46:10 +02:00
aba403e3f2
Correct handling of Transport in onvif results
2020-06-16 16:48:17 -04:00
30072cf9e1
Apply input limits when switching between percent and pixels. pixels must be integer, percent can be decimal.
2020-06-15 16:06:51 -04:00
0905655377
Merge branch 'master' into add_user_to_filters
2020-06-05 17:08:14 -04:00
30f90dbae4
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-06-05 13:04:22 -04:00
f71926c736
Merge branch 'release-1.34'
2020-06-05 10:09:07 -04:00
14f7e01c00
Merge pull request #2942 from roddone/fix_monitors_table_responsive
...
make monitors table (console view) responsive
2020-06-03 15:44:38 -04:00
02bf85bb34
Merge pull request #2950 from roddone/scale_to_fit_watchview
...
Fix the scale to fit option that is not persisted on page refresh
2020-06-02 12:53:50 -04:00
a9c52a21ec
call to changeScale() on page init when "scale to fit" is selected
2020-06-02 17:25:07 +02:00
20870e22fa
fix eslint errors
2020-05-29 13:28:33 -04:00
8121787ee6
make monitors table (console view) responsive
2020-05-27 10:08:08 +02:00
eb41e4fb39
Fix the array for the de-interlacing options
2020-05-24 11:09:13 -04:00
85e1dcadf4
Fix the array for the de-interlacing options
2020-05-24 11:07:52 -04:00
e72c357fd0
Unable to probe should not be fatal
2020-05-23 16:13:48 -04:00
a9cec3ebbd
spacing
2020-05-23 16:13:29 -04:00
46a13237b5
fix eslint errors
2020-05-22 09:28:15 -04:00
ce15e1c921
remove debug, don't pass element through event handler anymore on layout ddm
2020-05-20 09:42:29 -04:00
cc04ced406
load zmMontageLayout ddm explicitly instead of passing event element
2020-05-20 09:42:06 -04:00
3faf20516f
add changeInterface handler
2020-05-19 16:58:45 -04:00
074e270e79
populate network interfaces list, rescan on change.
2020-05-19 16:58:26 -04:00
cc01a04efc
remove debug, don't pass element through event handler anymore on layout ddm
2020-05-19 16:57:45 -04:00
270ab36ff4
load zmMontageLayout ddm explicitly instead of passing event element
2020-05-19 16:56:58 -04:00
3c2e26ac32
Merge branch 'release-1.34'
2020-05-15 16:02:29 -04:00
4dc693022e
Failure to parse output shouldn't be fatal. Just skp to the next instead. Use json_encode instead of serialize
2020-05-15 16:02:19 -04:00
6bb2c09a72
Merge branch 'release-1.34'
2020-05-15 11:41:34 -04:00
424a4ed0b1
add onclick to div.zoom
2020-05-15 11:34:23 -04:00
0dd426d64c
handle range being set to an empty value. Fixes zoom out on timeline. Fix on-click to data-on-click
2020-05-15 11:33:10 -04:00
94b29c6c7a
replace inline javascript in timeline zoom
2020-05-15 10:44:48 -04:00
992ac144a9
Fix ONVIF_User => ONVIF_Username
2020-05-13 16:04:26 -04:00
880b456d93
Rrename MetaConfig to ONVIF
2020-05-13 15:30:56 -04:00
edd718afd2
xtell and ytell are data-xtell and data-ytell fixes #2932
2020-05-13 08:02:49 -04:00
807efde523
xtell and ytell are data-xtell and data-ytell fixes #2932
2020-05-13 08:01:04 -04:00
6e90f10a1d
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-05-13 07:28:14 -04:00
c83621822f
Rename Config* to ONVIF_*
2020-05-12 15:46:07 -04:00
89939efc9b
Fixup my updates to the MetaConfig tab of monitor view
2020-05-12 11:15:29 -04:00
75082064fd
Merge branch 'master' of github.com:zoneminder/ZoneMinder into onvif_updated_to_upstream
2020-05-09 16:40:17 -04:00
732bb5416f
Merge branch 'master' into onvif_updated
2020-05-09 16:26:29 -04:00
408da1be27
Merge branch 'release-1.34'
2020-05-08 18:46:19 -04:00
8195223a86
merge some php
2020-05-08 17:54:51 -04:00
f1d794c11b
spacing and escape sql fields
2020-05-07 13:57:37 -04:00
d71de221ae
If auth is turned on, add a UserId dropdown to filters
2020-05-07 11:00:50 -04:00
4ff341a0f5
Merge branch 'master' into zma_to_thread
2020-05-02 18:03:42 -04:00
28a3691b9c
Merge branch 'release-1.34'
2020-05-01 19:46:38 -04:00
c99db3a03f
Remove some hard coded sizes, spacing and typos. Convert inputs to number inputs as appropriate
2020-05-01 18:47:10 -04:00
0085e3d34f
Don't warn about image for WebSite Monitors
2020-05-01 18:15:19 -04:00
1bd340d602
spacing in watch.php
2020-05-01 13:30:00 -04:00
2da88be307
Use auth_relay instead of auth_hash if AUTH_RELAY==plain or none.
2020-05-01 13:04:16 -04:00
4c9f67eb5a
Fix no redirect on login with palemoon browser
2020-05-01 13:03:56 -04:00
289045500b
Don't use event as a variable name unless we are talking about window evnt. Change controlCmd to take the event and get the button from event.target
2020-05-01 13:03:35 -04:00
daa08e8740
Always just default to scale from monitor
2020-05-01 13:03:17 -04:00
8d8d37c648
fix eslint
2020-05-01 09:57:46 -04:00
4466bd9b16
Always just default to scale from monitor
2020-04-29 16:35:20 -04:00
74ab2e2e12
Don't use event as a variable name unless we are talking about window evnt. Change controlCmd to take the event and get the button from event.target
2020-04-29 16:35:04 -04:00
eebd0a274d
Fix no redirect on login with palemoon browser
2020-04-29 16:34:27 -04:00
8b0f88a707
Use auth_relay instead of auth_hash if AUTH_RELAY==plain or none.
2020-04-29 16:34:07 -04:00
775b0d1ccd
fix XSS in monitor Name
2020-04-23 18:16:38 -04:00
bc9137bd93
defend against XSS in Monitor Name
2020-04-23 17:56:05 -04:00
0f91797d85
defend against XSS in Monitor Name
2020-04-23 17:53:54 -04:00
189d4a6f02
add Emailed status to events list
2020-04-23 17:52:18 -04:00
d90177fb74
handle a 0 value for scale
2020-04-23 16:41:00 -04:00
56a43741c5
Handle a zero value for scale
2020-04-23 16:37:26 -04:00
bf99daf494
Merge branch 'rate_dropdown'
2020-04-23 16:36:34 -04:00
5503458874
correct label_size array and add translations
2020-04-23 16:32:19 -04:00
010b230804
Fix value of auto in width dropdown. Allow a 0 value for scale.
2020-04-23 16:30:39 -04:00
8ef70f9080
defend against XSS in Monitor Name
2020-04-23 16:28:19 -04:00
25cd13f8ad
When sending eventCmdReq, pass eventCmdParms since it might have been updated.
2020-04-23 16:25:35 -04:00
da79f761ad
add monitorStreamReplayBuffer to javascript vars. Use it to determine whether to update fast forward and reverse buttons
2020-04-23 16:17:27 -04:00
908e892d48
Merge branch 'fix_auth_timeouts'
2020-04-23 16:15:30 -04:00
81d329af2f
spacing, eslint
2020-04-23 16:12:04 -04:00
5bf068791b
Merge branch 'rate_dropdown' into release-1.34
2020-04-23 16:11:59 -04:00
91e78410a9
Stop the montagereview update while we reload the page
2020-04-23 16:08:36 -04:00
9a3f699644
Use a little less ram by passing by reference
2020-04-23 16:07:59 -04:00
d3f2dd4d6a
fix
2020-04-23 16:07:23 -04:00
7d0421a02c
defend against XSS in Monitor Name
2020-04-23 16:06:44 -04:00
93a37671c2
Merge branch 'release-1.34'
2020-04-23 16:01:52 -04:00
8e2c76df61
minor code cleanup, adding monitor click event in a previous for loop instead of iterating again
2020-04-23 15:59:12 -04:00
63aaf76f0d
handle a 0 value for scale as the scale to fit value
2020-04-23 15:57:42 -04:00
6a9a8f1d5f
check length of returned tr array to prevent errors in js log
2020-04-23 15:55:46 -04:00
12252f1f37
defend against XSS in Monitor Name
2020-04-23 15:54:12 -04:00
7347ef4030
Handle a zero value for scale
2020-04-23 15:52:47 -04:00
b7fd4e26a5
defend against XSS in Monitor Name
2020-04-23 15:51:29 -04:00
bab609426d
spacing in views/event.php
2020-04-23 15:47:10 -04:00
4e9f0b3463
defend against XSS in Monitor Name
2020-04-23 15:46:05 -04:00
b6c1a328a8
Fix XSS from monitor Name, group Name, storage Name, server Name
2020-04-23 15:45:02 -04:00
8d2ce34149
include id in monitors dropdown so that it is searchable
2020-04-23 15:44:27 -04:00
91b1d7bbeb
alter setButtonState to take either an id or an element so that we can log the missing element
2020-04-23 15:43:36 -04:00
a6f5ae2601
fix cyclePlay button not working. Move SetButtonState into skin.js
2020-04-23 15:42:30 -04:00
96774bd038
fix inline javascript in ptz buttons
2020-04-23 15:39:31 -04:00
e770be2e13
Merge branch 'release-1.34'
2020-04-23 10:26:16 -04:00
eab08783e9
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
2020-04-23 10:10:08 -04:00
264ba6525b
Remove debug
2020-04-21 12:19:18 -04:00
b384d233ae
add async and defer to recaptcha load
2020-04-21 09:20:33 -04:00
3e8de7dd6c
Move the script include for recaptcha into the view instead of the xhtmlHeaders function. Fixes #2918
2020-04-21 08:30:42 -04:00
2194ed8b59
spacing in views/event.php
2020-04-17 09:46:10 -04:00
f1d61cefaa
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-04-13 10:45:37 -04:00
74e5cc3066
eslint
2020-04-10 14:22:44 -04:00
6d4d925f1e
Fix XSS from monitor Name, group Name, storage Name, server Name
2020-04-10 12:42:41 -04:00
fb70acdf6c
fix XSS in monitor Name
2020-04-10 11:32:01 -04:00
365f0240ad
fix inline javascript in ptz buttons
2020-04-10 11:30:30 -04:00
4f8016cc74
spacing in watch.php
2020-04-10 11:16:11 -04:00
85d779a624
defend against XSS in Monitor Name
2020-04-10 11:10:13 -04:00
4fe649c776
defend against XSS in Monitor Name
2020-04-10 11:10:09 -04:00
105be40ce3
fix
2020-04-10 11:09:46 -04:00
c8128de673
defend against XSS in Monitor Name
2020-04-10 11:06:39 -04:00
e9430d48a7
defend against XSS in Monitor Name
2020-04-10 11:06:20 -04:00
aad0b9362c
defend against XSS in Monitor Name
2020-04-10 11:05:48 -04:00
7473b0572a
defend against XSS in Monitor Name
2020-04-10 11:05:19 -04:00
4f4e6a85f9
defend against XSS in Monitor Name
2020-04-10 11:05:12 -04:00
40d386fe6c
Handle Zones without monitor
2020-04-09 20:41:34 -04:00
5c17de8e18
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-04-07 10:08:15 -04:00
40ceb359ae
populate filter object with request filter if it isn't loaded from db
2020-04-07 10:08:04 -04:00
33048e38b7
Use Filter object in events view. Include the ability to specify filter by Id
2020-04-07 10:05:02 -04:00
ea8fe7b9a9
check length of returned tr array to prevent errors in js log
2020-04-06 11:59:27 -04:00
d0fe1b60df
Merge branch 'release-1.34'
2020-04-04 16:58:53 -04:00
024431808e
fix onchange to data-on-change-this in width,height,scale, layout dropdowns
2020-04-04 16:57:24 -04:00
571ff260cc
Merge branch 'release-1.34'
2020-04-04 16:35:09 -04:00
e2cb8a656d
change exportEvent to expertEvents
2020-04-04 11:53:07 -04:00
402c38725b
Limit version check popups to once per hour
2020-04-04 11:52:40 -04:00
6feffe2aa9
whitespace
2020-04-04 11:51:39 -04:00
61e6627fce
fix fail to update version reminder due to submit button both submitting and formSubmitting as well as view not being set to version
2020-04-04 11:48:42 -04:00
1cc60f0857
fix action on cycle play button
2020-04-02 16:06:27 -04:00
87069b99b6
Fix inline-script errors on groups page referenced in #2890
2020-04-02 14:13:28 -04:00
ebac665d4d
Must use namespace ZM
2020-03-31 08:54:47 -04:00
4dcba55ab6
Include Storage.php and Server.php
2020-03-31 08:53:32 -04:00
2fe0096b21
correct label_size array and add translations
2020-03-30 18:34:43 -04:00
ff061bd48e
Fixup VNC input options. Remove some hard coded sizes, spacing and typos. Convert inputs to number inputs as appropriate
2020-03-30 10:09:53 -04:00
a781cc2c87
WIP scaling
2020-03-27 14:32:50 -04:00
ae80b3b859
Start implementing VNC
2020-03-27 14:32:50 -04:00
4eed0a9c29
Fix selecting layout after save by using value in session. When applying layout, if height is auto, set the img height to auto.
2020-03-27 14:30:41 -04:00
1ab294e291
Fix selecting layout after save by using value in session. When applying layout, if height is auto, set the img height to auto.
2020-03-27 12:43:21 -04:00
4ce944da23
Merge branch 'release-1.34'
2020-03-26 15:38:35 -04:00
b354641df3
fix syntax errors in triggers in monitor view
2020-03-26 13:57:19 -04:00
2bd805c1f1
minor code cleanup, adding monitor click event in a previous for loop instead of iterating again
2020-03-24 16:16:32 -04:00
5a20ef959f
Merge branch 'release-1.34'
2020-03-20 11:07:46 -04:00
ecaaae90f3
fix streamImg loading when using applet. Also don't alter actParms as it is not a global.
2020-03-20 11:06:01 -04:00
f8fa0340fc
fix eslint
2020-03-14 09:27:07 -04:00
9a3127da06
Merge branch 'rate_dropdown'
2020-03-10 18:47:19 -04:00
59bd658a96
replace vjsPause with pauseCLicked. Fix behaviour with rate dropdown and reverse/pause etc.
2020-03-10 18:46:20 -04:00
84d719f2dd
Merge branch 'release-1.34' into rate_dropdown
2020-03-10 16:06:11 -04:00
e8553babfa
remove extra spaces, fix eslint
2020-03-09 14:43:54 -04:00
3d993eef80
Fix triggers code
2020-03-09 14:39:57 -04:00
f056f787c5
Merge branch 'release-1.34'
2020-03-08 17:24:06 -04:00
e56976c800
Triggers cannot be null, it is '' instead
2020-03-08 17:23:48 -04:00
b482993d33
Merge branch 'release-1.34'
2020-03-06 15:04:48 -05:00
f003daa791
Merge branch 'add_enabled_to_storage'
2020-03-05 15:48:43 -05:00
55f63e8e9d
Merge branch 'fix_auth_timeouts'
2020-03-04 11:22:08 -05:00
a9e3d0691f
quotes, fix status ajax call using old auth_hash
2020-03-04 11:17:48 -05:00
ac00ca0ad8
Only list enabled Storage Areas
2020-03-04 10:46:59 -05:00
077b8888f9
Use Storage object and add Enabled
2020-03-04 10:46:32 -05:00
3a24f27a7a
include id in monitors dropdown so that it is searchable
2020-03-03 16:59:38 -05:00
a2dd24ae1f
When sending eventCmdReq, pass eventCmdParms since it might have been updated.
2020-03-02 14:38:36 -05:00
00de49a5c1
add monitorStreamReplayBuffer to javascript vars. Use it to determine whether to update fast forward and reverse buttons
2020-03-02 12:43:07 -05:00
967e5ad30f
alter setButtonState to take either an id or an element so that we can log the missing element
2020-03-02 11:52:32 -05:00
76131d1887
Fix timeline. Update parseFilterToTree to add missing operators. Fix logging calls to include ZM namespace. Update code style.
2020-03-01 11:07:31 -05:00
b9acf42929
spacing, eslint
2020-02-29 09:28:04 -05:00
bf9ba39aa2
Merge branch 'release-1.34'
2020-02-25 18:22:55 -05:00
1b70ed2076
Merge branch 'fix_generate_video_page' into release-1.34
2020-02-25 18:22:24 -05:00
0c70c5c2a4
Save value of V4LMultiBuffer and fix it not being checked for the Use Config Value
2020-02-25 18:14:27 -05:00
e82ed3a098
Save value of V4LMultiBuffer and fix it not being checked for the Use Config Value
2020-02-25 18:13:42 -05:00
c08ec996f7
Fix various aspects of the video generating page. Clean up and update code. Remove inline javascript. Fixes #2843
2020-02-25 18:12:25 -05:00
23e4b43aa0
Stop the montagereview update while we reload the page
2020-02-25 16:53:08 -05:00
3adc20b04e
Use a little less ram by passing by reference
2020-02-25 16:52:45 -05:00
4c2fb6bf08
populate a js var minTime and maxTime and use it when setting up the calendar widget to set minTime for end calendar.
2020-02-25 13:40:44 -05:00
5c3b7f109e
fix cyclePlay button not working.
2020-02-25 13:17:45 -05:00
dce4d17b51
fix cyclePlay button not working. Move SetButtonState into skin.js
2020-02-25 13:17:02 -05:00
a7c28be365
change scale to fit value from auto to 0
2020-02-25 12:14:34 -05:00
8c7d2c5e1a
handle a 0 value for scale
2020-02-25 12:14:07 -05:00
e2ff241017
handle a 0 value for scale as the scale to fit value
2020-02-25 12:13:05 -05:00
71dd292a8d
Revert "Handle a zero value for scale"
...
This reverts commit a5da6d12f3
2020-02-25 11:19:09 -05:00
a5da6d12f3
Handle a zero value for scale
2020-02-25 11:18:28 -05:00
8a83449fba
Handle a zero value for scale
2020-02-25 11:18:13 -05:00
2f89bd28b7
Handle a zero value for scale
2020-02-25 11:18:02 -05:00
37abd41e78
Handle a zero value for scale
2020-02-25 11:17:46 -05:00
429000c13b
Fix value of auto in width dropdown. Allow a 0 value for scale.
2020-02-25 11:14:12 -05:00
cc7de97b6a
Merge branch 'release-1.34'
2020-02-24 14:39:50 -05:00
55c99c5ff3
Include filtered monitors for filter query on totals line of event counts. Fixes #2846
2020-02-24 14:34:21 -05:00
c29f2cb8cf
fix our friend, eslint
2020-02-21 14:22:53 -06:00
ce8c8a755c
fix eslint
2020-02-21 10:29:27 -05:00
dab5c520fe
Merge branch 'master' into add_alarmed_zone_to_filters
2020-02-19 14:20:08 -05:00
3b1458bb88
add Emailed status to events list
2020-02-19 14:17:44 -05:00
789db4e5a6
Fix filter new rows missing their onchange event on attribute dropdown. Fixes #2817
2020-02-18 13:29:06 -05:00
289bde869d
use a better language for unset value
2020-02-11 14:31:48 -05:00
9f9a97f596
fix dropdown with unset option
2020-02-11 14:29:21 -05:00
844ff529e1
add an unset value to ZM_TIMEZONE in Options->System
2020-02-11 13:24:26 -05:00
52dfbc92e9
put back operator filtering in parseRows. Do it for all attrs. Fix Zone name in AlarmedZoneId attr
2020-01-24 11:10:02 -05:00
29a04dc1b9
Merge branch 'improve_filter_emails' into add_alarmed_zone_to_filters
2020-01-24 09:50:53 -05:00
948b3d7e43
Impleent click_AutoEmail to hide/show the Email options
2020-01-22 17:02:16 -05:00
d95857d419
Add EmailTo,EmailSubject,EmailBody fields to filter view
2020-01-22 14:05:08 -05:00
9d41334e8f
Merge branch 'master' into add_alarmed_zone_to_filters
2020-01-22 13:45:37 -05:00
dbdb13efd7
Instead of passing query string in form post variables, store it in session so that it survives redirects. Fixes #2811
2020-01-20 11:02:43 -05:00
ead52f30b1
Bug fix: Allows for inital/base install without the option MultiPort config value assigned
2020-01-20 00:44:20 -08:00
de5bf21d8a
fix eslint
2020-01-17 15:06:46 -06:00
d0003215b1
Merge branch 'master' into rate_dropdown
2020-01-17 12:30:35 -05:00
a398f33e68
fix delTerm button not being enabled because it is a button now, not an input
2020-01-17 09:17:29 -05:00
4f2df830a8
fix inline js
2020-01-17 09:17:05 -05:00
74b3ad6dd9
add options help for HWACCEL options
2020-01-16 14:33:37 -05:00
6a43c2deb5
fix zoom_range to zoomout_range
2020-01-16 14:17:40 -05:00
09f2298838
return empty array instead of nothing in probeNetwork
2020-01-15 19:02:40 -05:00
91acb775eb
Fix Eventount to EventCount
2020-01-13 13:43:14 -05:00
b11815cfa9
Introduce Storage->EventCount to get the # of events per storage without actually loading all events.
2020-01-13 12:53:50 -05:00
6a4b66a792
add 3840x2160 4k UHD to monitor dropdown
...
I think this is fairly common in consumer IP cams now...
2020-01-10 19:44:06 -05:00
f13a7199e1
fix eslint
2020-01-07 21:53:55 -06:00
c64de372a7
when auth_hash changes, update various CmdParms
2020-01-07 17:08:57 -05:00
1c197db619
Merge branch 'master' into rate_dropdown
2020-01-07 14:49:58 -05:00
61bc0ddd0a
add missing t and merge some lines
2020-01-07 11:01:53 -05:00
71581831b5
fix problem with the clone button material icon. Apparently file_copy doesn't work, so use content_copy instead despite it not being listed in the material icons
2020-01-05 17:34:27 -05:00
6ac26ec1aa
quotes
2020-01-05 17:33:53 -05:00
00f8a450de
spaces and quotes
2020-01-05 14:59:25 -05:00
7fdf6165d5
Fix case in var name
2020-01-03 17:08:11 -05:00
0a495395b0
Restore Gain tab
2020-01-03 16:34:46 -05:00
f572c4092a
add checks for Zoom, Focus, White, Iris movement types
2020-01-03 15:58:57 -05:00
0b3776dbf0
change text inputs to number inputs, cleanups
2020-01-03 15:57:29 -05:00
3cfc1a0a6d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-01-02 16:45:39 -05:00
60d45d967f
test for existence of selected checkboxes in post data because if none are selected, the array won't exist
2020-01-02 10:17:07 -05:00
98f7fb63b9
fix eslint errors
2019-12-31 19:24:51 -06:00
714d304528
Change WebColour to a colour selector input and add a random colour icon. Select a random colour on new Monitor creation
2019-12-31 19:10:29 -05:00
1977e48ddd
DefaultScale is a member of the Monitor, not the event
2019-12-26 15:21:27 -05:00
42a724891b
spacing
2019-12-20 16:11:38 -05:00
63d20a1514
Move hidden inputs to top of form
2019-12-20 16:11:24 -05:00
5a45835006
break up long lines
2019-12-20 16:11:10 -05:00
23dde04725
remove timeout on changing runstate.
2019-12-20 16:10:30 -05:00
d87bf5a156
replace the rate display with a dropdown
2019-12-20 11:02:12 -05:00
3c59be9616
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-12-19 09:24:44 -05:00
958a6b8218
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-12-18 19:06:19 -05:00
e39a95d761
Add AlarmedZoned to filters, work on fixing filter behaviour in js. Enable viewing filter results in montagereview
2019-12-18 19:06:10 -05:00
67cc9faa8c
remove contentForm id from form in state view which isn't used and conflicts if it is used anywhere else.
2019-12-18 19:05:06 -05:00
34354f5871
Add Notes field to monitors to store random info in. Bump version to 1.33.16. use htmlSElect for savejpegs. Move storage area under Storage tab.
2019-12-18 12:13:00 -05:00
3b12b67b4a
fix eslint
2019-12-18 10:40:51 -05:00
5b7efb2b33
fix mouseover streaming in chrome when adblocker disabled
2019-12-13 17:48:22 -05:00
0dbc1ef15c
Use multiport when talking monitor stream on montage
2019-12-13 11:51:55 -05:00
0bbbbb302e
add default for Units in new zone
2019-12-13 11:51:07 -05:00
3af6358314
fix & to &
2019-12-02 15:49:49 -05:00
72cb5bd1bb
add missing </select>
2019-12-02 15:49:42 -05:00
09faa0a731
fix & to &
2019-12-02 15:49:32 -05:00
b686649589
fix & instead of &.
2019-12-02 15:34:31 -05:00
8bf74d2f35
fix & instead of &.
2019-12-02 15:34:23 -05:00
24022d157d
use & instead of &. Put inputs out of table where they belong
2019-12-02 15:33:58 -05:00
f7e01aa999
switch to material icon for dot
2019-12-02 14:31:05 -05:00
cf35db120d
change to material icons, fix missing div
2019-12-02 14:21:51 -05:00
8e645e45e1
fix selecting Monitors by passing MonitorId as MonitorId[]
2019-12-02 14:21:25 -05:00
b70b75421b
quotes and spacing
2019-12-02 14:18:27 -05:00
Isaac Connor
Andrew Bauer
Andrew Bauer
Matthew Noorenberghe
Isaac Connor
Romain ODDONE
Romain ODDONE
Isaac Connor
hax0kartik
Garrett Scott
PrplHaz4