Isaac Connor
4fa9237048
Fix eslint
2020-09-16 08:57:44 -04:00
Isaac Connor
a430fe1f7a
correct EndTime to End Date/Time. EndTime and EndDate terms are also effective
2020-09-15 21:19:10 -04:00
Isaac Connor
32f60631b3
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-09-15 18:53:42 -04:00
Isaac Connor
81306928b8
Fix scale width and height dropdown actions on cycle
2020-09-15 18:53:39 -04:00
Andrew Bauer
21d4773da9
fix badly formatted line
2020-09-15 13:08:44 -05:00
Andrew Bauer
da73ecee08
delete commented line
2020-09-15 13:05:05 -05:00
Andrew Bauer
5f361094bb
unpopup frames and alarmframes in export view
2020-09-15 13:01:35 -05:00
Andrew Bauer
40eb60f644
unpopup monitor config from export view
2020-09-15 12:52:13 -05:00
Andrew Bauer
fd7d5317af
create getCSRFinputHTML function
2020-09-15 11:06:16 -05:00
Andrew Bauer
798557604f
remove old pagination var from events.php
2020-09-15 10:58:42 -05:00
Andrew Bauer
845815b566
unpopup call to image view
2020-09-15 10:51:45 -05:00
Andrew Bauer
be150479a1
unpopup Max Score link in events view
2020-09-15 10:37:05 -05:00
Andrew Bauer
df443326ea
unpopup monitor link in events view
2020-09-15 10:31:14 -05:00
Andrew Bauer
b9d95f0833
fix typo
2020-09-15 09:50:53 -05:00
Andrew Bauer
33ef700dda
Cause links in events use eventdetail modal
2020-09-15 09:49:03 -05:00
Andrew Bauer
accfd1191f
update eventdetail modal
2020-09-15 09:20:38 -05:00
Isaac Connor
9e12090348
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-09-15 10:00:24 -04:00
Andrew Bauer
121671327c
call eventdetail modal rather than popup
2020-09-15 08:55:32 -05:00
Andrew Bauer
1d3ce1c916
must define sortQuery as a global in export view
2020-09-15 08:27:44 -05:00
Andrew Bauer
ba900dd9dc
change table type to increase row padding
2020-09-14 14:07:49 -05:00
Andrew Bauer
fb85d6f79c
rough in eventdetail modal
2020-09-14 13:47:09 -05:00
Isaac Connor
691be74304
fix th text-align on tables in options
2020-09-14 14:09:41 -04:00
Isaac Connor
ab8e2d2e6c
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-09-14 14:05:02 -04:00
Isaac Connor
d02a61e715
change will to might
2020-09-14 14:03:55 -04:00
Andrew Bauer
cc7b65e8aa
eslint
2020-09-14 10:31:44 -05:00
Andrew Bauer
d2bc39f65f
replace storage popup with modal
2020-09-14 09:50:04 -05:00
Andrew Bauer
0a0b555c4c
refresh table after archive or unarchive
2020-09-13 11:32:28 -05:00
Andrew Bauer
29710f67ac
fix table refresh after delete
2020-09-13 11:25:31 -05:00
Andrew Bauer
c4c4551436
replace no permission alerts with enoperm()
2020-09-13 11:09:15 -05:00
Andrew Bauer
54e8d1352a
add enoperm js function
2020-09-13 11:04:04 -05:00
Andrew Bauer
096f4a446f
Use Ajax to load delete confirm modal
2020-09-13 10:39:51 -05:00
Andrew Bauer
7e55dd14a2
eslint
2020-09-13 08:52:52 -05:00
Andrew Bauer
951afc669f
eslint
2020-09-13 08:33:47 -05:00
Andrew Bauer
1599bc4c14
load stats on deman via ajax
2020-09-13 07:32:49 -05:00
Andrew Bauer
56aa906dd8
call getStatsTableHTML in frames view
2020-09-12 11:55:24 -05:00
Andrew Bauer
5d914d8b01
convert stats table to a function
2020-09-12 11:53:53 -05:00
Andrew Bauer
f31b3bfc59
add xhtmlFooter to stats view
2020-09-12 11:48:33 -05:00
Andrew Bauer
0ad41fc8d4
rough in error no permisson modal
2020-09-12 08:37:57 -05:00
Andrew Bauer
0c8bb25889
eslint
2020-09-11 16:49:36 -05:00
Andrew Bauer
2ee70442c0
use done() and fail() callbacks for getJSON
2020-09-11 14:30:36 -05:00
Andrew Bauer
26cefda712
deploy optionhelp to option view
2020-09-11 13:23:14 -05:00
Andrew Bauer
d2b2291721
deploy optionhelp to monitor view
2020-09-11 13:10:18 -05:00
Andrew Bauer
4f94c63102
pass OLANG as a function parm
2020-09-11 07:50:03 -05:00
Isaac Connor
3fb62b7904
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-09-10 19:26:23 -04:00
Andrew Bauer
25df968f10
remove erroneous file
2020-09-10 17:29:59 -05:00
Andrew Bauer
da46ab0882
eslint nanny strikes again
2020-09-10 17:11:31 -05:00
Andrew Bauer
cd09ec8fef
rough in Modal Ajax framework
2020-09-10 16:56:58 -05:00
Matthew Noorenberghe
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
Isaac Connor
2e5a897355
Merge pull request #3038 from mnoorenberghe/fix_function_save
...
Fix saving function changes
2020-09-10 11:52:38 -04:00
Isaac Connor
e37c5ac385
Use FrameId instead of FramesId
2020-09-10 11:10:19 -04:00
Isaac Connor
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
Isaac Connor
1f837c1718
Hide eventId not FrameId
2020-09-10 11:04:18 -04:00
Matthew Noorenberghe
f046b565c6
Fix saving function changes
...
Wait for the request to complete before reloading.
2020-09-10 11:01:44 -04:00
Isaac Connor
013e007141
run parseRows on init so that datetime fields get their popups etc
2020-09-09 15:40:44 -04:00
Isaac Connor
b34c6dcfc2
correct log, code docs
2020-09-07 13:29:36 -04:00
Isaac Connor
74dc8af76f
add global
2020-09-07 13:29:21 -04:00
Isaac Connor
fc06b440ad
remove debug
2020-09-07 13:28:55 -04:00
Isaac Connor
1659bb2116
Add id to scale dropdown
2020-09-06 12:12:26 -04:00
Isaac Connor
034bee9bb2
fix errors due to selects no longer having an id by default
2020-09-05 17:33:17 -04:00
Isaac Connor
23505159da
put scale code together with itself. Get rid of unneeded generateConnKey
2020-09-05 12:23:00 -04:00
Isaac Connor
d1dc3d6864
remove Error debug
2020-09-05 09:45:44 -04:00
Isaac Connor
b3b6445d60
Fix application of scales to montage streams
2020-09-05 09:15:33 -04:00
Isaac Connor
bf895f8f12
Make Zones a link to view/edit all zones
2020-09-05 09:15:09 -04:00
Isaac Connor
778fdb9ab0
fix lack of id's on width,height,scale dropdowns making their selection break
2020-09-05 08:56:00 -04:00
Isaac Connor
7e6fbe1ab4
Fix ControlTypes dropdown.
2020-09-05 08:46:18 -04:00
Matthew Noorenberghe
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
Matthew Noorenberghe
77cca7efac
eslint --fix
2020-09-04 10:02:43 -04:00
Isaac Connor
46790bf401
Add monitor json data
2020-09-03 18:25:00 -04:00
Isaac Connor
1f810c8947
Populate the function modal from the javascript monitors array before viewing.
2020-09-03 18:24:45 -04:00
Isaac Connor
1e4d80ee7b
Make the function modal monitor-agnostic . It will get populated before being made visisble
2020-09-03 18:24:09 -04:00
Isaac Connor
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
Isaac Connor
d4d0a971d1
get rid of errant fo
2020-09-03 10:19:59 -04:00
Isaac Connor
dd5e342196
use xhtmlFooter
2020-09-02 18:17:12 -04:00
Isaac Connor
b0eacba0ee
use xhtmlFooter
2020-09-02 18:14:45 -04:00
Isaac Connor
22a40edd71
spacing
2020-09-02 18:12:35 -04:00
Isaac Connor
6abad06db2
increase width of frames view
2020-09-02 18:12:26 -04:00
Isaac Connor
18671b7c19
use xhtmlFooter instead of html since it now contains all the javascript
2020-09-02 17:57:32 -04:00
Isaac Connor
69bee20ef5
use xhtmlFooter instead of html since it now contains all the javascript
2020-09-02 17:56:30 -04:00
Isaac Connor
5b53289fee
fix html structure
2020-09-02 17:55:34 -04:00
Isaac Connor
7623733840
use xhtmlFooter and fix spacing
2020-09-02 17:55:23 -04:00
Isaac Connor
aa4e9600eb
Update to use MonitorStream
2020-09-02 17:36:01 -04:00
Isaac Connor
e25708ce99
use getBodyTopHTML and xhtmlFooter
2020-09-02 17:35:46 -04:00
Isaac Connor
fa780c5020
use xhtmlFooter instead of html since it now contains all the javascript
2020-09-02 17:35:24 -04:00
Isaac Connor
f38692795e
use xhtmlFooter instead of html since it now contains all the javascript
2020-09-02 17:35:13 -04:00
Isaac Connor
cf1f408e96
Don't need pauseString and playStream anymore
2020-09-02 17:34:09 -04:00
Isaac Connor
c6bc6704b3
use xhtmlFooter instead of html since it now contains all the javascript
2020-09-02 17:33:56 -04:00
Isaac Connor
bc710bc826
use xhtmlFooter instead of html since it now contains all the javascript
2020-09-02 17:33:09 -04:00
Isaac Connor
a6ad57b393
fix html validation errors
2020-09-02 17:32:24 -04:00
Isaac Connor
c2760ef768
add needed js stuff for streaming
2020-09-02 17:28:08 -04:00
Isaac Connor
d243d798ff
add needed js stuff for streaming
2020-09-02 17:27:59 -04:00
Isaac Connor
5b0123e710
Not necessary to specify type=text/css
2020-09-02 17:27:31 -04:00
Isaac Connor
0d07f93cd7
fix layout of svg
2020-09-02 16:37:39 -04:00
Isaac Connor
0cd35518c3
Fix id on nav
2020-09-02 14:47:07 -04:00
Isaac Connor
ab116a1a6f
use xhtmlFooter as it now contains the javascript instead of xhtmlHeader
2020-09-02 14:47:00 -04:00
Isaac Connor
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
Isaac Connor
7b4569392c
use xhtmlFooter as it now contains the javascript instead of xhtmlHeader
2020-09-02 14:46:08 -04:00
Isaac Connor
3d3966b1ea
use xhtmlFooter as it now contains the javascript instead of xhtmlHeader
2020-09-02 14:45:40 -04:00
Isaac Connor
5aef5e2312
populate monitorData for MonitorStream use
2020-09-02 14:45:10 -04:00
Isaac Connor
02d056b277
Fix left column positioning
2020-09-02 14:44:52 -04:00
Isaac Connor
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
Isaac Connor
4f90f37f0e
add back request queue
2020-09-02 14:42:47 -04:00
Isaac Connor
9d84b8bd83
remove datetimepickers from static html. They get added later by javascript
2020-09-02 14:42:23 -04:00
Isaac Connor
e32d3ba05a
Move javascript includes to xhtmlFooter so they don't delay content loading
2020-09-02 14:38:38 -04:00
Isaac Connor
5d11644664
Fix various sizes and paddings to make zone editing work perfectly
2020-09-02 14:38:13 -04:00
Isaac Connor
5544057a8d
Merge branch 'master' into improve_zone_editing
2020-08-31 18:47:24 -04:00
Isaac Connor
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
Isaac Connor
5a9cbdaa3f
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-08-31 16:43:41 -04:00
Isaac Connor
e120e21b11
fix off-by 1 in limiting results
2020-08-31 10:37:35 -04:00
Isaac Connor
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
Isaac Connor
0b493cd85a
add svg circles for the points
2020-08-31 10:15:14 -04:00
Isaac Connor
3d5ad4902a
zones can now list multiple monitors
2020-08-31 10:14:53 -04:00
Isaac Connor
3f4f28f322
Move monitor class into js/MonitorStream for use elsewhere
2020-08-31 10:13:58 -04:00
Isaac Connor
fa18887f5c
zones can now list multiple monitors so populate a listof monitors with json data
2020-08-31 10:13:30 -04:00
Isaac Connor
f00f9ead79
Move monitor class into js/MonitorStream for use elsewhere
2020-08-31 10:12:47 -04:00
Isaac Connor
f5e659f395
Change #zones into .zones because we may list zones for multiple monitors now
2020-08-31 10:10:50 -04:00
Isaac Connor
af8d7fc3fa
Style svg circle point
2020-08-31 10:10:21 -04:00
Isaac Connor
3e09840995
Merge branch 'master' into improve_zone_editing
2020-08-28 17:43:07 -04:00
Andrew Bauer
990b5bd9dc
monitor view - convert links to buttons
2020-08-28 15:22:57 -05:00
Andrew Bauer
9c56cd223f
move header right to shift pill list up
2020-08-28 13:32:46 -05:00
Andrew Bauer
47732e2469
right align monitor item names
2020-08-28 13:18:01 -05:00
Andrew Bauer
a919be7b2d
replace tabs with vert pills
2020-08-28 13:09:49 -05:00
Andrew Bauer
d69b3e7f43
make cancel go back to console
2020-08-28 10:56:09 -05:00
Isaac Connor
04b3f5d294
Merge branch 'master' into improve_zone_editing
2020-08-28 09:43:48 -04:00
Andrew Bauer
2b6090d8c6
console.js - change all createPopup to window.location.assign
2020-08-28 07:58:42 -05:00
Andrew Bauer
a288a54fbe
make form id unique on logout view
2020-08-28 07:42:33 -05:00
Andrew Bauer
1e78307735
add navigation buttons to monitor view
2020-08-27 16:30:49 -05:00
Isaac Connor
f294d099c9
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-27 17:16:18 -04:00
Isaac Connor
3d9557c5a4
Implement limit on returned events. Free ram in cache if post_condition fails
2020-08-27 17:16:10 -04:00
Andrew Bauer
1f5f964ae3
add navbar to monitor view
2020-08-27 15:53:24 -05:00
Andrew Bauer
948836ed96
enable jump-to feature on frames
2020-08-27 14:58:21 -05:00
Isaac Connor
e9cef72d9f
Use ViewWdith/ViewHeight to get rotated dimensions when calculating thumbnail size
2020-08-27 12:44:56 -04:00
Isaac Connor
1ad084c052
Remove parse
2020-08-27 12:14:17 -04:00
Isaac Connor
69be26213a
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-08-27 11:55:26 -04:00
Isaac Connor
dc15663030
Fix scales after applying layout
2020-08-27 10:55:14 -04:00
Isaac Connor
ccaea26928
Fix logic on MonitorFlip Cookie value
2020-08-27 10:54:54 -04:00
Isaac Connor
6173890a45
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-27 10:34:00 -04:00
Isaac Connor
702ea365c2
Remove cruft and fix the filter bar toggle
2020-08-27 10:33:52 -04:00
Isaac Connor
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
Isaac Connor
62eddfdf2b
reorganize code a bit for better logical grouping
2020-08-27 10:31:27 -04:00
Isaac Connor
c0d543cd47
Add code to handle monitorsfilterbar on montage
2020-08-27 10:31:06 -04:00
Isaac Connor
dd3d315964
A a.flip float right and put a clear:both after the contents of #header so that it has space after content has been toggled
2020-08-27 10:30:27 -04:00
Andrew Bauer
4bacb136c9
enable page-jump-to table extension
2020-08-27 07:46:52 -05:00
Andrew Bauer
e8a2bbf6e0
continue to fix corrupted merge conflict
2020-08-27 07:42:39 -05:00
Andrew Bauer
9b69eb5762
fix corrupted merge conflict
2020-08-27 07:35:05 -05:00
Andrew Bauer
367c060790
remove unwanted patch files
2020-08-26 17:07:58 -05:00
Andrew Bauer
280964f33f
reapply commit d3cc4d5
2020-08-26 17:06:01 -05:00
Andrew Bauer
8ba91db1fb
make logout view a modal
2020-08-26 16:28:11 -05:00
Andrew Bauer
8d202aeef0
eslint
2020-08-26 15:36:38 -05:00
Isaac Connor
ab68bef39a
Merge branch 'master' into filter_pre_post
2020-08-26 15:28:48 -04:00
Isaac Connor
99472242af
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-26 15:16:36 -04:00
Isaac Connor
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
Isaac Connor
74d2ba56db
Persist video volume in a cookie so that subsequent events remember the volume level.
2020-08-26 15:15:10 -04:00
Andrew Bauer
67fe9d0cb4
un-popup the users views
2020-08-26 13:52:10 -05:00
Andrew Bauer
8c4f89c099
requested dark skin changes
2020-08-26 13:31:58 -05:00
Isaac Connor
24d1ba3a00
fix eslint
2020-08-26 13:41:40 -04:00
Andrew Bauer
1c7bddf96e
monitor config no longer a popup
2020-08-26 12:22:19 -05:00
Andrew Bauer
ac7867eab3
make function view a modal
2020-08-26 11:39:48 -05:00
Isaac Connor
06942746d6
Merge branch 'release-1.34'
2020-08-25 12:41:33 -04:00
Isaac Connor
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
Isaac Connor
6587cdd3de
Handle failure to get v4l settings. Fix assignment of values to monitor object.
2020-08-25 12:39:44 -04:00
Isaac Connor
b0f5f3617a
Always set auth_hash and always set auth_relay, using our handy new get_auth_relay function
2020-08-25 12:39:14 -04:00
Isaac Connor
f1fab6361f
fix dimensions of v4l settings popup
2020-08-25 12:38:46 -04:00
Isaac Connor
e3a48c2db4
Handle the case where the layout has invalid json
2020-08-25 12:07:45 -04:00
Isaac Connor
6fbe7457ff
Add missing globals
2020-08-25 11:47:49 -04:00
Isaac Connor
626e892b33
add global
2020-08-25 11:43:55 -04:00
Isaac Connor
3d3dde22c4
Use zm_session_start
2020-08-25 11:31:06 -04:00
Isaac Connor
278be59c86
Use zm_session_start
2020-08-25 11:30:51 -04:00
Isaac Connor
3c29228df5
Use zm_session_start
2020-08-25 11:30:22 -04:00
Isaac Connor
586f9f3e52
Use zm_session_start
2020-08-25 11:27:25 -04:00
Isaac Connor
981439cbd9
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-24 17:42:37 -04:00
Isaac Connor
fe5e005d8e
Calculate scale to pass to getStreamSrc for thumbnail still and stream
2020-08-24 17:42:23 -04:00
Andrew Bauer
0879ecf9a5
update timeline header
2020-08-24 14:33:01 -05:00
Andrew Bauer
8c32511c83
whitespace
2020-08-24 12:05:31 -05:00
Isaac Connor
bce38ae2c6
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-24 12:05:25 -04:00
Isaac Connor
56e2ac5baa
add scale to query params because zms doesn't wupport width&height
2020-08-24 12:05:14 -04:00
Andrew Bauer
e5e2c3b347
fix stats off by 1 frame, don't alert on score 0
2020-08-24 10:57:54 -05:00
Andrew Bauer
c6e3107a50
make donate view a modal
2020-08-24 09:31:21 -05:00
Isaac Connor
67f2e3c1a0
Merge branch 'master' into filter_pre_post
2020-08-24 10:30:01 -04:00
Isaac Connor
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
Isaac Connor
0e9c8a35e6
fix thumbnail height style. Make thumbnail clickable.
2020-08-24 09:32:49 -04:00
Isaac Connor
0f27243007
Merge branch 'master' into filter_pre_post
2020-08-24 09:23:24 -04:00
Andrew Bauer
8ea806e264
eslint
2020-08-23 18:40:58 -05:00
Andrew Bauer
699b20b961
whitespace
2020-08-23 17:54:57 -05:00
Andrew Bauer
65181c84ee
update frame top toolbar
2020-08-23 17:53:47 -05:00
Andrew Bauer
773557ee8a
set view to stats rather than popup
2020-08-23 13:25:09 -05:00
Andrew Bauer
86f0d41d8e
autoinit changeScale in frame view
2020-08-23 13:17:03 -05:00
Andrew Bauer
63fc59568f
pad frames cells to account for detail view
2020-08-23 13:12:54 -05:00
Andrew Bauer
4b144dea74
whitespace
2020-08-23 13:02:35 -05:00
Andrew Bauer
f06bfe7cbb
use bootstrap-table on stats view
2020-08-23 12:23:58 -05:00
Andrew Bauer
69ba9e6d0e
eslint
2020-08-23 12:14:09 -05:00
Isaac Connor
2a7ea52330
Merge branch 'release-1.34'
2020-08-23 11:51:54 -04:00
Andrew Bauer
4cbac47d6d
add navbar to stats view
2020-08-22 21:09:58 -05:00
Andrew Bauer
de1d1c2ac6
change close link to back link
2020-08-22 14:43:53 -05:00
Andrew Bauer
ad67f74ba4
add formatting to stats table
2020-08-22 14:12:11 -05:00
Andrew Bauer
afc3d2c548
fix horizontal scroll issues events
2020-08-22 13:00:53 -05:00
Andrew Bauer
e69e767878
fix horizontal scroll nonsense
2020-08-22 12:56:31 -05:00
Andrew Bauer
61f89e3306
rough in frames detail view
2020-08-22 12:45:19 -05:00
Andrew Bauer
5d09ae91ab
move div tag into $imgHTML
2020-08-22 07:14:47 -05:00
Andrew Bauer
8ea7b783b5
generate thumbnails when monitor is connected
2020-08-21 21:18:55 -05:00
Andrew Bauer
c8e40eb5b3
don't generate tumbnails when not running
2020-08-21 21:14:16 -05:00
Andrew Bauer
39d538d5cf
add missig }
2020-08-21 20:57:05 -05:00
Andrew Bauer
73a01855f8
rough in thumbnail animation
2020-08-21 20:44:20 -05:00
Andrew Bauer
79fa257a4a
rough in tumbnail animation to web console
2020-08-21 20:43:36 -05:00
Isaac Connor
ac0976324f
Fix case of filterQuery. Fixes #3017
2020-08-21 11:22:47 -04:00
Andrew Bauer
9357017a39
add export fx to tables
2020-08-21 07:11:57 -05:00
Isaac Connor
519bfae1da
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-08-20 17:12:41 -04:00
Andrew Bauer
bec77c9ce3
change pointer when over frames table
2020-08-20 10:39:55 -05:00
Andrew Bauer
de4d144cd4
fix scale dropdown in frame view
2020-08-20 10:16:28 -05:00
Andrew Bauer
72d95275c3
add navbar for frame view
2020-08-20 09:19:04 -05:00
Andrew Bauer
247ace7fa2
process clicks per cell in frames
2020-08-20 09:13:11 -05:00
Andrew Bauer
7175fa3d86
no padding on frames outermost div
2020-08-20 08:19:53 -05:00
Andrew Bauer
c9de30d427
click any row to load frame
2020-08-19 17:54:39 -05:00
Andrew Bauer
b2a632a3f8
reinit thumbnail ani on click events
2020-08-19 16:16:27 -05:00
Andrew Bauer
8f70ae192d
enable thumbnail zoom on frames view
2020-08-19 15:42:35 -05:00
Andrew Bauer
a903a885b6
whitepsace
2020-08-19 14:07:00 -05:00
Isaac Connor
c2d6b8f493
revert code that passed the div hightlightOn/Off. Better to pass index. Fixes js errors.
2020-08-19 14:39:15 -04:00
Isaac Connor
d0c21995cd
Fixes to function converting from pixels to percent. Adjust to 100 if > 100.
2020-08-19 14:14:32 -04:00
Isaac Connor
efec1e7d4f
remove debug
2020-08-19 14:13:48 -04:00
Isaac Connor
177df46113
Apply min=0 to filterX and Y so that we don't get negative values
2020-08-19 14:11:16 -04:00
Isaac Connor
d366d41297
Update parseFilter to Filter::parse
2020-08-19 14:07:51 -04:00
Andrew Bauer
842efc1574
remove <a> tags from col headers
2020-08-19 12:31:13 -05:00
Andrew Bauer
74b0ad2cb3
get rid of horizontal scrollbar in frames
2020-08-19 12:20:57 -05:00
Andrew Bauer
f317bf1722
fix copy/paste typo
2020-08-19 12:07:31 -05:00
Andrew Bauer
e38a532b78
rough new frames view
2020-08-19 12:04:08 -05:00
Andrew Bauer
ad9b9d91cc
disable the back button when new page
2020-08-18 16:57:03 -05:00
Isaac Connor
b38c5e98a8
Merge branch 'master' into filter_pre_post
2020-08-18 16:33:04 -04:00
Andrew Bauer
3664a9b42c
set the pagination list
2020-08-18 15:12:07 -05:00
Andrew Bauer
1e41bd0823
whitespace
2020-08-18 13:48:18 -05:00
Andrew Bauer
6eb7b6d51c
set the right toolbar btn class to match
2020-08-18 13:13:32 -05:00
Andrew Bauer
df02d84a56
don't go back if not referred
2020-08-18 13:08:17 -05:00
Andrew Bauer
2c9caeb348
whitespace
2020-08-18 12:40:27 -05:00
Isaac Connor
2d5522df14
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-18 13:25:21 -04:00
Isaac Connor
c837a17aea
Add a warning about missing EndTime term on UpdateDiskSpace
2020-08-18 13:25:18 -04:00
Andrew Bauer
bf63500b08
fix thumbnail animation after user event
2020-08-18 12:00:20 -05:00
Isaac Connor
e6d6ee1b67
Merge branch 'filter_warnings'
2020-08-18 11:17:46 -04:00
Isaac Connor
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
Andrew Bauer
1627b1d0d1
privacy view page formatting
2020-08-18 09:08:26 -05:00
Andrew Bauer
287c585d3d
use translated text for delete confirmation
2020-08-18 08:26:45 -05:00
Andrew Bauer
b32bcab91f
add a delete confirmation modal
2020-08-18 08:06:58 -05:00
Isaac Connor
610f73a835
Merge branch 'release-1.34'
2020-08-17 19:30:32 -04:00
Isaac Connor
0a3ad719cd
Merge branch 'master' into filter_pre_post
2020-08-17 18:30:44 -04:00
Andrew Bauer
1dd0b44334
eslint nanny strikes again
2020-08-17 16:59:57 -05:00
Isaac Connor
dc451cbc85
Use filter class
2020-08-17 17:42:22 -04:00
Isaac Connor
e3fe75f21b
fix case on filterQuery
2020-08-17 17:42:03 -04:00
Isaac Connor
e5dd10fc04
use filter class instead of parseFilter
2020-08-17 17:41:50 -04:00
Isaac Connor
0f90b999c0
use filter class instead of parseFilter
2020-08-17 17:41:38 -04:00
Isaac Connor
6649a30bbb
Use querystring instead of query
2020-08-17 17:41:13 -04:00
Andrew Bauer
80b92573b8
set the icons used in bstable toolbar
2020-08-17 16:18:18 -05:00
Isaac Connor
f4594f06d1
Add in pre_condition checks.
2020-08-17 16:58:37 -04:00
Andrew Bauer
3e5bfc445f
fix checkbox column disappearing
2020-08-17 12:10:35 -05:00
Isaac Connor
e452c23c4d
Merge branch 'master' into filter_pre_post
2020-08-17 12:56:43 -04:00
Isaac Connor
e4425d7565
Merge branch 'master' into filter_pre_post
2020-08-17 12:56:20 -04:00
Andrew Bauer
11afad5c92
add pagination on/off toggle
2020-08-17 11:02:25 -05:00
Andrew Bauer
9bc1b6a34e
change icon color on hover
2020-08-17 08:37:03 -05:00
Andrew Bauer
e19d1f507e
fix bootstrap-table-cookie correctly
2020-08-17 08:05:50 -05:00
Andrew Bauer
7fed6f9c29
shift thumbnail animation away from edge
2020-08-16 21:08:07 -05:00
Isaac Connor
1a6154752a
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-16 20:08:49 -04:00
Isaac Connor
a8455d4ecf
Add necessary globals
2020-08-16 20:08:42 -04:00
Isaac Connor
2021f561fa
Import as a global
2020-08-16 20:08:26 -04:00
Andrew Bauer
de0a4a18ee
fix checkbox column
2020-08-16 18:00:11 -05:00
Andrew Bauer
5468c0322e
appease the eslint nanny
2020-08-16 16:30:35 -05:00
Andrew Bauer
0cbf559821
only hide cols if cookie not exist
2020-08-16 16:02:43 -05:00
Andrew Bauer
33ea9de8cf
better spacing archived & emailed tinytext
2020-08-16 15:19:08 -05:00
Andrew Bauer
f27f6e6394
fix archive buttons, remove asterisk from event name
2020-08-16 14:46:56 -05:00
Andrew Bauer
94d666b296
tiny text under event name, add emailed column
2020-08-16 14:41:50 -05:00
Andrew Bauer
ee31761627
cleanup & consolidate events view buttons
2020-08-16 13:44:18 -05:00
Isaac Connor
77c391fcae
Add booleanvalues for operators support
2020-08-16 13:07:42 -04:00
Isaac Connor
77f9f4bffb
Add ExistsInFileSystem support in Filters. This also includes limiting operators to IS/IS NOT
2020-08-16 13:07:21 -04:00
Isaac Connor
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
Isaac Connor
d3cc4d589f
Remove the parseFilter etc calls from getNavBarHTML code which was used to populate the filter link with the currently viewed events list. I think we can do this better with saving it to the sesssion or similar.
2020-08-16 13:04:42 -04:00
Andrew Bauer
9be63f1d99
reorganize and init eventTable
2020-08-16 11:34:37 -05:00
Andrew Bauer
93475bef7e
eslint nanny
2020-08-15 16:08:53 -05:00
Andrew Bauer
252bf7995a
eslint nannt
2020-08-15 15:54:58 -05:00
Andrew Bauer
1c558b66e7
add font-awesome stylesheet
2020-08-15 15:44:54 -05:00
Andrew Bauer
45fde13535
rough in new events view
2020-08-15 15:27:58 -05:00
Isaac Connor
c87886f5a5
Fix v4l2 channel and palette dropdowns allowing the saving of local monitors.
2020-08-15 12:31:30 -04:00
Isaac Connor
dbb2535a6b
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-08-14 13:08:04 -04:00
Andrew Bauer
7225281771
enlarge event thumbs on hover
2020-08-13 12:50:59 -05:00
Andrew Bauer
b45c4fac1f
tighten up event column spacing
2020-08-13 12:33:13 -05:00
Isaac Connor
6550876a92
fix css so that the background colour of the dropdown divs is set
2020-08-13 12:40:11 -04:00
Isaac Connor
c674cb7b55
Move the dropdown id's to the a element where they should be. Remove duplicated id on storage_dropdown.
2020-08-13 12:39:51 -04:00
Isaac Connor
047d69ace7
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-13 11:28:00 -04:00
Andrew Bauer
c4ee4fb307
split start & end times into sep cols & wrap
2020-08-13 09:24:42 -05:00
Andrew Bauer
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
Isaac Connor
6cbc54ef87
When storage area has been deleted, say so
2020-08-11 14:11:48 -04:00
Isaac Connor
5f0da93c6e
turn off debug
2020-08-11 13:47:48 -04:00
Isaac Connor
303cec92f6
Add globals, fixing timeline view
2020-08-11 13:47:37 -04:00
Isaac Connor
0a7df075ae
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-11 11:41:15 -04:00
Isaac Connor
d42424d6d8
Merge branch 'release-1.34'
2020-08-11 11:41:11 -04:00
Isaac Connor
355428e93e
direct settings view to the monitor that is actually recording the stream
2020-08-10 21:32:23 -04:00
Isaac Connor
e8bf2aa386
Update settings view. Were assigning to a function. More work to be done.
2020-08-10 21:20:23 -04:00
Andrew Bauer
4a31ebe045
Update options.php
2020-08-10 15:48:20 -05:00
Andrew Bauer
b5553c968b
expand options to full width
2020-08-10 15:41:25 -05:00
Andrew Bauer
4097693b38
appease the eslint nanny
2020-08-10 13:38:53 -05:00
Andrew Bauer
3fa97f2bc1
reogranize state.php
2020-08-10 13:35:12 -05:00
Isaac Connor
bafffdb486
Test for configuration of ZM_PATH_SHUTDOWN and provide useul error message
2020-08-10 12:26:37 -04:00
Isaac Connor
5ee086bbfe
Test for configuration of ZM_PATH_SHUTDOWN and provide useul error message
2020-08-10 12:25:44 -04:00
Isaac Connor
e64e786c5b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-09 22:20:08 -04:00
Isaac Connor
f04e1a0ba7
Apply min=0 to filterX and Y so that we don't get negative values
2020-08-09 22:20:06 -04:00
Isaac Connor
ec707acdd1
Fixes to function converting from pixels to percent. Adjust to 100 if > 100.
2020-08-09 22:19:43 -04:00
Andrew Bauer
42fe024681
Update skin.js
2020-08-09 17:43:39 -05:00
Andrew Bauer
9a03a2c7d4
Update skin.js
2020-08-09 17:43:07 -05:00
Andrew Bauer
15005a2f17
fix typo
2020-08-09 14:25:11 -05:00
Andrew Bauer
d0e7443a3c
rough in update reminder dropdown
2020-08-09 14:18:44 -05:00
Andrew Bauer
b22f12dadb
rough in new zmversion widget
2020-08-09 12:20:11 -05:00
Andrew Bauer
a6ae4aee01
eslint nanny
2020-08-08 12:26:42 -05:00
Andrew Bauer
fd4b9ba4f4
move jquery in functions.php to skin.js
2020-08-08 12:06:57 -05:00
Andrew Bauer
b626e0de1c
eslint nanny strikes again
2020-08-08 11:19:29 -05:00
Isaac Connor
a001c93321
fix zone editing globals and inputs being too big
2020-08-08 11:41:24 -04:00
Andrew Bauer
96bd6397c6
eslint nanny
2020-08-08 10:38:58 -05:00
Isaac Connor
8533ce7018
fix CSP on polygons
2020-08-08 11:38:54 -04:00
Isaac Connor
82357a0675
reapply click function to bandwidth dropdown entries after getNavBar
2020-08-08 11:17:26 -04:00
Andrew Bauer
3792043707
implement bw widget as dropdown
2020-08-08 10:07:26 -05:00
Isaac Connor
5fb56c9f57
Merge branch 'master' into zma_to_thread
2020-08-07 17:52:43 -04:00
Isaac Connor
fc5fabf1c5
fix zone editing globals and inputs being too big
2020-08-06 12:24:51 -04:00
Isaac Connor
a19990f4d7
Merge branch 'release-1.34'
2020-08-06 11:57:35 -04:00
Isaac Connor
ef2ad12846
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-05 20:00:45 -04:00
Isaac Connor
ddeef6f031
Fix globals and a Fatal without ZM\ prefix
2020-08-05 20:00:39 -04:00
Isaac Connor
76e0d155d3
declare globals
2020-08-05 19:15:01 -04:00
Isaac Connor
90671cd4e5
Add missing globals
2020-08-04 18:07:01 -04:00
Isaac Connor
97096d87f9
Add mx-2 classes to be consistent
2020-08-04 18:06:49 -04:00
Isaac Connor
5b8ff10a34
style the storage dropdown better using css. rename it from dropdown01 to dropdown_storage. Put the text-warning class on the a content in the dropdown instead of the dropdown nav-item so that it takes effect. Rename Stor to Storage
2020-08-04 17:53:39 -04:00
Isaac Connor
1ab828c110
Add globals
2020-08-04 17:35:52 -04:00
Isaac Connor
dd627d9234
Update cycle monitorlist sidebar to bootstrap4
2020-08-04 17:35:41 -04:00
Isaac Connor
ba4d6dff64
Add globals definitions
2020-08-04 17:05:58 -04:00
Isaac Connor
9a06d6cab6
Fix some spacing
2020-08-04 17:05:44 -04:00
Isaac Connor
79c9671ef2
Use & instead of & in urls
2020-08-04 17:05:33 -04:00
Isaac Connor
c0f21ab55d
Fix globals
2020-08-04 16:36:24 -04:00
Isaac Connor
82542c569c
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-04 10:47:41 -04:00
Isaac Connor
6e9559df53
Put xhtmlHeaders in an ob_start ob_get_clean section so that calls to open session in view js php files don't cause a problem. Basically delay output. Fixes problems with logging in redirect. Also need to global cspNonce since we use it.
2020-08-04 10:47:37 -04:00
Andrew Bauer
a575b16278
set a target to about menu items
2020-08-03 15:45:27 -05:00
Andrew Bauer
9d88f8ee73
implement zm about menu
2020-08-03 15:22:46 -05:00
Andrew Bauer
ab9a135759
fix inability to stop zm from the web console
2020-08-03 12:10:34 -05:00
Isaac Connor
283d8557e6
remove the extra(globals). There are a LOT of globals. WE don't seem to actually use any in this function.
2020-08-03 12:50:36 -04:00
Andrew Bauer
a3e6fe5522
make the eslint nanny happy
2020-08-03 11:47:31 -05:00
Andrew Bauer
ce810320a2
bump right margin on storage widget
2020-08-03 11:02:30 -05:00
Andrew Bauer
8a711245f6
fix previous corrupted commit
2020-08-03 10:49:45 -05:00
Andrew Bauer
c1f37192b9
implement storage widget as dropdown
2020-08-03 10:43:24 -05:00
Isaac Connor
ece625e376
Remove the code that cleans the log on each page request. it was moved to zm_stats.pl. Accessing the log is kinda heavy, so should be done in background tasks, not interactively
2020-08-03 11:16:01 -04:00
Isaac Connor
eb1d94345f
remove crud
2020-08-03 11:05:58 -04:00
Isaac Connor
a2958fe288
Spacing, and don't output mootools for postlogin. Don't use mootools in postlogin
2020-08-03 10:57:08 -04:00
Isaac Connor
325178a556
convert log filters to responsive bootstrap divs.
2020-08-02 20:25:24 -04:00
Isaac Connor
6f9947b583
Switch to jquery in login.js. We no longer include mootool for login view.
2020-08-02 19:12:07 -04:00
Andrew Bauer
3351a4de56
fix eslint
2020-08-02 15:33:10 -05:00
Andrew Bauer
0ecb1621ce
add colorized log icon to widget bar
2020-08-02 14:49:19 -05:00
Andrew Bauer
a937e14899
put the optional banner in its own navbar
2020-08-02 13:48:15 -05:00
Andrew Bauer
d6999f5628
iterate through keys in data
2020-08-02 13:33:25 -05:00
Andrew Bauer
2b29a7983a
clean up navbar background refresh
2020-08-02 13:01:20 -05:00
Andrew Bauer
b746cf6a56
add id and output html string rather than echo
...
This sets up all the items on the navbar as reconfigurable, via javascript replaceWith
2020-08-02 11:31:36 -05:00
Isaac Connor
037b696be0
Fix duplicate class attributes on navbar links
2020-08-02 12:05:52 -04:00
Isaac Connor
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
Andrew Bauer
e768beaef2
fix whitespace
2020-08-01 16:20:51 -05:00
Andrew Bauer
ad3b5a5aa3
call ob_start and ob_get_clean correctly
2020-08-01 16:16:23 -05:00
Andrew Bauer
b746901ee7
close the dropmenu on any click
2020-08-01 10:57:13 -05:00
Andrew Bauer
4851f1f940
remove errant text
2020-08-01 09:50:25 -05:00
Andrew Bauer
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
Isaac Connor
b46d3b81d6
Update user view to use User class
2020-08-01 10:27:54 -04:00
Andrew Bauer
8b3917d707
reapply navbar reload logic
2020-08-01 09:07:21 -05:00
Andrew Bauer
b6c0274b2c
implement collapsed navbar
2020-07-31 16:03:37 -05:00
Andrew Bauer
cd96994a56
update getZMVersionHTML
2020-07-31 07:31:40 -05:00
Isaac Connor
366ce5b3eb
Add 100% width to LabelFormat
2020-07-30 19:36:27 -04:00
Andrew Bauer
2699fa0313
force menubar to the top of the navbar
2020-07-30 16:56:38 -05:00
Andrew Bauer
8bb30bb6d4
add framework for new navbar selection
2020-07-30 16:44:58 -05:00
Andrew Bauer
561c44ece2
add runtimeStatus function
2020-07-30 16:14:41 -05:00
Isaac Connor
c2ac7ed4a9
spacing and escape sql fields
2020-07-30 17:07:43 -04:00
Isaac Connor
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
Andrew Bauer
23596b142d
fix how we finish up getNavBarHTML
2020-07-30 11:55:54 -05:00
Isaac Connor
6a4ce29bce
eslint fixes
2020-07-30 12:15:05 -04:00
Andrew Bauer
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
Andrew Bauer
6b303b67d0
continued adjustment of options view fields
2020-07-30 09:03:03 -05:00
Andrew Bauer
484051a191
adjust column widths on options
2020-07-30 08:23:25 -05:00
Isaac Connor
aa3b48e7c0
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-29 18:59:50 -04:00
Isaac Connor
b42eb44a79
handle when [fid] = 0; Fixes #2994
2020-07-29 18:51:11 -04:00
Isaac Connor
8e37efaa7a
handle when [fid] = 0; Fixes #2994
2020-07-29 18:50:14 -04:00
Andrew Bauer
4bf7093ff1
align account circle with status button
2020-07-29 15:47:46 -05:00
Isaac Connor
0139d06fcd
Fix data-on-input-this using onchange instead of oninput
2020-07-29 16:41:27 -04:00
Isaac Connor
1508b82754
Fix data-on-input-this using onchange instead of oninput
2020-07-29 16:40:57 -04:00
Andrew Bauer
1119923c38
Update functions.php
2020-07-29 15:26:07 -05:00
Andrew Bauer
695da2221f
Update functions.php
2020-07-29 15:20:44 -05:00
Andrew Bauer
4c242ef973
what a difference a single space makes
2020-07-29 15:09:47 -05:00
Andrew Bauer
9f1901e413
fix typo
2020-07-29 14:42:06 -05:00
Andrew Bauer
d285f2f998
adjust class name
2020-07-29 14:38:00 -05:00
Andrew Bauer
ded0dbc4ae
shrink the vert nav items further
2020-07-29 14:00:44 -05:00
Andrew Bauer
32bbeb556f
set the vert navbar bg color in base.css
2020-07-29 13:51:36 -05:00
Andrew Bauer
907063e385
use smaller font in form control item
2020-07-29 13:25:40 -05:00
Andrew Bauer
fd5adc6623
remove blockquote from options.php
...
It makes the vertical navbar font unnaturally large
2020-07-29 12:49:32 -05:00
Andrew Bauer
a6005f0b0d
fix clor of options nav-pill active
2020-07-28 13:09:54 -05:00
Andrew Bauer
52d88e15fd
let options span the full column
2020-07-28 12:45:25 -05:00
Andrew Bauer
cf9eb405ee
don't wrap the rows on small screens
2020-07-28 12:43:51 -05:00
Andrew Bauer
853a5728f8
align navbar logo and run status vertically
2020-07-28 12:20:18 -05:00
Andrew Bauer
aa8662f311
fix copy/paste typo
2020-07-28 10:37:10 -05:00
Andrew Bauer
b88f0c3991
display user:port@ip when controladdress is empty
2020-07-28 10:08:24 -05:00
Andrew Bauer
45f88ee04a
float web console statusBreakdown left then down
2020-07-28 08:59:28 -05:00
Andrew Bauer
85dec6194d
when maxmimize, rebuild jqeury chosen fields
2020-07-28 08:38:06 -05:00
Andrew Bauer
47b35e97fb
implement minimize chevron for filterbar
2020-07-27 16:14:15 -05:00
Isaac Connor
767f5ebb03
navbar closes the form, and doesn't need to be in the form.
2020-07-27 12:40:46 -04:00
Isaac Connor
5d883d696b
give a better error message when submitThisForm fails
2020-07-27 12:40:25 -04:00
Isaac Connor
ca07602414
fix html structure when not logged in. Move version class down to where we use it. add parenthesis to quiet php deprecation errors
2020-07-27 12:15:37 -04:00
Andrew Bauer
cec5d7ea06
w-100 class not needed
2020-07-27 10:22:23 -05:00
Andrew Bauer
ffa3415318
when collapsed, force the menu button to the right
2020-07-27 10:13:02 -05:00
Andrew Bauer
bc19ae604a
fix alignment of top navbar
2020-07-27 09:18:02 -05:00
Isaac Connor
1e76679820
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-26 22:33:34 -04:00
Isaac Connor
5f9c62f266
spacing and slightly improve nav item code in options
2020-07-26 22:33:29 -04:00
Isaac Connor
003abfea29
Update class so that Submit button is hidden under new bootstrap
2020-07-26 22:32:36 -04:00
Andrew Bauer
941c074a8e
add carriage returns to generated html for readability
2020-07-26 10:50:32 -05:00
Andrew Bauer
6486f59383
fix colorization of navbar widgets
2020-07-26 10:41:05 -05:00
Andrew Bauer
eaed5abcd3
add missing bootstrap.bundle.js.map
2020-07-25 16:56:17 -05:00
Isaac Connor
3ec7952c31
apply cache_busting to bootstrap, overlay anda reset
2020-07-25 15:05:12 -04:00
Isaac Connor
4af343e833
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-25 14:28:32 -04:00
Isaac Connor
e3b339e72e
add missing globals
2020-07-25 14:28:26 -04:00
Andrew Bauer
c48fa83c6d
upgrade to bootstrap 4.5
2020-07-25 13:18:09 -05:00
Andrew Bauer
bda7e1a2b7
minor cleanup of getNavBarHTML
2020-07-23 12:52:21 -05:00
Andrew Bauer
e9323f96a5
additional cleanup of getNavBarHTML
2020-07-23 10:52:12 -05:00
Isaac Connor
1416bc547e
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-22 17:37:52 -04:00
Isaac Connor
e746f0babe
Use 0 instead of the word auto for scale
2020-07-22 17:28:41 -04:00
Andrew Bauer
062ae675c8
partial cleanup of getNavBarHTML
2020-07-22 13:12:59 -05:00
Isaac Connor
869860bb26
Merge branch 'master' into zma_to_thread
2020-07-21 17:49:39 -04:00
Isaac Connor
7575afc8d5
Merge branch 'master' into zma_to_thread
2020-07-21 17:38:32 -04:00
Isaac Connor
495cd56b8b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-21 14:39:51 -04:00
Isaac Connor
64e4363302
update code populating DeviceChannel, DeviceFormat, CapturePalette
2020-07-21 13:40:04 -04:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
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
Isaac Connor
f22f3e9262
use a scaled svg and replace inline js
2020-07-13 14:51:07 -04:00
Romain ODDONE
785ab58a80
make events table (events view) responsive
2020-07-13 11:33:26 +02:00
Andrew Bauer
cfd57a851f
fix eslint
2020-07-08 20:53:12 -05:00
Isaac Connor
880219bb0f
Merge branch 'release-1.34'
2020-07-07 18:58:32 -04:00
Isaac Connor
6469300af5
fix some csp violations
...
y
2020-07-07 18:57:11 -04:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
2db65d3821
Merge branch 'release-1.34'
2020-07-04 09:09:24 -04:00
Isaac Connor
8a35ae2daf
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
2020-07-04 09:04:38 -04:00
Isaac Connor
d6d70ab06d
Put a list of cameras to cycle through on the left
2020-07-04 09:04:26 -04:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
fd10f545bd
if width/height don't evaluate to an integer, set to auto.
2020-07-04 08:58:09 -04:00
Isaac Connor
cc0624eb3f
Don't allow viewing of monitor setting if monitor permissions are set to View
2020-07-03 19:19:13 -04:00
Isaac Connor
1860ad188b
Don't allow viewing of zones or zone if Monitor permissions are view
2020-07-03 19:18:36 -04:00
Isaac Connor
343d8d832e
handle scale values of '' and 'auto'
2020-07-03 19:18:05 -04:00
Isaac Connor
2026788e7a
Turn close link into a button
2020-07-03 19:17:26 -04:00
Isaac Connor
66b155008c
Fix scale defaulting to monitor default Scale
2020-07-03 19:17:11 -04:00
Isaac Connor
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
Isaac Connor
697f117ecd
Make width of content 100% instead of 96%.
2020-07-02 17:22:34 -04:00
Isaac Connor
346fe63ef0
Add styles for inputs on monitor view
2020-06-30 19:19:17 -04:00
Isaac Connor
4d8d926c89
minor code updates. Use user_row instead of generic row variable name.
2020-06-23 22:19:46 -04:00
Isaac Connor
e778ea0918
Update saving Users. Don't allow restrictions on admin user. Fix CSP violations.
2020-06-23 22:19:04 -04:00
Isaac Connor
93b0552ed7
Update saving Users. Don't allow restrictions on admin user. Fix CSP violations.
2020-06-23 22:18:45 -04:00
Isaac Connor
e68bf13a6b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-06-17 12:50:42 -04:00
Isaac Connor
d3c474fc8b
use translate on Show/Hide Zones
2020-06-17 12:50:36 -04:00
Romain ODDONE
dcb77cdaea
apply stream scale in zoom coordinates
2020-06-17 14:46:10 +02:00
Isaac Connor
aba403e3f2
Correct handling of Transport in onvif results
2020-06-16 16:48:17 -04:00
Isaac Connor
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
Isaac Connor
0905655377
Merge branch 'master' into add_user_to_filters
2020-06-05 17:08:14 -04:00
Isaac Connor
30f90dbae4
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-06-05 13:04:22 -04:00
Isaac Connor
f71926c736
Merge branch 'release-1.34'
2020-06-05 10:09:07 -04:00
Isaac Connor
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
Isaac Connor
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
Romain ODDONE
a9c52a21ec
call to changeScale() on page init when "scale to fit" is selected
2020-06-02 17:25:07 +02:00
Isaac Connor
20870e22fa
fix eslint errors
2020-05-29 13:28:33 -04:00
Romain ODDONE
8121787ee6
make monitors table (console view) responsive
2020-05-27 10:08:08 +02:00
Isaac Connor
eb41e4fb39
Fix the array for the de-interlacing options
2020-05-24 11:09:13 -04:00
Isaac Connor
85e1dcadf4
Fix the array for the de-interlacing options
2020-05-24 11:07:52 -04:00
Isaac Connor
e72c357fd0
Unable to probe should not be fatal
2020-05-23 16:13:48 -04:00
Isaac Connor
a9cec3ebbd
spacing
2020-05-23 16:13:29 -04:00
Isaac Connor
46a13237b5
fix eslint errors
2020-05-22 09:28:15 -04:00
Isaac Connor
23900cbf01
fix
2020-05-21 13:34:09 -04:00
Isaac Connor
59c08410c1
Put the size of SHM in the title of the shm space used element
2020-05-21 13:32:33 -04:00
Isaac Connor
ce15e1c921
remove debug, don't pass element through event handler anymore on layout ddm
2020-05-20 09:42:29 -04:00
Isaac Connor
cc04ced406
load zmMontageLayout ddm explicitly instead of passing event element
2020-05-20 09:42:06 -04:00
Isaac Connor
3faf20516f
add changeInterface handler
2020-05-19 16:58:45 -04:00
Isaac Connor
074e270e79
populate network interfaces list, rescan on change.
2020-05-19 16:58:26 -04:00
Isaac Connor
cc01a04efc
remove debug, don't pass element through event handler anymore on layout ddm
2020-05-19 16:57:45 -04:00
Isaac Connor
270ab36ff4
load zmMontageLayout ddm explicitly instead of passing event element
2020-05-19 16:56:58 -04:00
Isaac Connor
3c2e26ac32
Merge branch 'release-1.34'
2020-05-15 16:02:29 -04:00
Isaac Connor
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
Isaac Connor
6bb2c09a72
Merge branch 'release-1.34'
2020-05-15 11:41:34 -04:00
Isaac Connor
424a4ed0b1
add onclick to div.zoom
2020-05-15 11:34:23 -04:00
Isaac Connor
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
Isaac Connor
94b29c6c7a
replace inline javascript in timeline zoom
2020-05-15 10:44:48 -04:00
Isaac Connor
992ac144a9
Fix ONVIF_User => ONVIF_Username
2020-05-13 16:04:26 -04:00
Isaac Connor
880b456d93
Rrename MetaConfig to ONVIF
2020-05-13 15:30:56 -04:00
Isaac Connor
edd718afd2
xtell and ytell are data-xtell and data-ytell fixes #2932
2020-05-13 08:02:49 -04:00
Isaac Connor
807efde523
xtell and ytell are data-xtell and data-ytell fixes #2932
2020-05-13 08:01:04 -04:00
Isaac Connor
6e90f10a1d
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-05-13 07:28:14 -04:00
Isaac Connor
c83621822f
Rename Config* to ONVIF_*
2020-05-12 15:46:07 -04:00
Isaac Connor
89939efc9b
Fixup my updates to the MetaConfig tab of monitor view
2020-05-12 11:15:29 -04:00
Isaac Connor
75082064fd
Merge branch 'master' of github.com:zoneminder/ZoneMinder into onvif_updated_to_upstream
2020-05-09 16:40:17 -04:00
Isaac Connor
732bb5416f
Merge branch 'master' into onvif_updated
2020-05-09 16:26:29 -04:00
Isaac Connor
408da1be27
Merge branch 'release-1.34'
2020-05-08 18:46:19 -04:00
Isaac Connor
8195223a86
merge some php
2020-05-08 17:54:51 -04:00
Isaac Connor
f1d794c11b
spacing and escape sql fields
2020-05-07 13:57:37 -04:00
Isaac Connor
d71de221ae
If auth is turned on, add a UserId dropdown to filters
2020-05-07 11:00:50 -04:00
Isaac Connor
4ff341a0f5
Merge branch 'master' into zma_to_thread
2020-05-02 18:03:42 -04:00
Isaac Connor
28a3691b9c
Merge branch 'release-1.34'
2020-05-01 19:46:38 -04:00
Isaac Connor
c99db3a03f
Remove some hard coded sizes, spacing and typos. Convert inputs to number inputs as appropriate
2020-05-01 18:47:10 -04:00
Isaac Connor
0085e3d34f
Don't warn about image for WebSite Monitors
2020-05-01 18:15:19 -04:00
Isaac Connor
1bd340d602
spacing in watch.php
2020-05-01 13:30:00 -04:00
Isaac Connor
6dbc917215
Don't include mootools on login view. It isn't needed and apparently breaks google recaptcha
2020-05-01 13:24:47 -04:00
Isaac Connor
e960e638b3
Remove extra value='s from PTZ buttons. Fix remaining on-click-this on numbered presets
2020-05-01 13:07:29 -04:00
Isaac Connor
bd7475a450
use on-click instead of on-click-this. We can get the button from event.target. The palemoon browser doesn't have a global event object so this wasn't working
2020-05-01 13:06:15 -04:00
Isaac Connor
e29c426f04
Pass event object to data-on-click events
2020-05-01 13:04:55 -04:00
Isaac Connor
89245e0d46
Add auth relay information when auth_relay is something other than hashed.
2020-05-01 13:04:37 -04:00
Isaac Connor
2da88be307
Use auth_relay instead of auth_hash if AUTH_RELAY==plain or none.
2020-05-01 13:04:16 -04:00
Isaac Connor
4c9f67eb5a
Fix no redirect on login with palemoon browser
2020-05-01 13:03:56 -04:00
Isaac Connor
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
Isaac Connor
daa08e8740
Always just default to scale from monitor
2020-05-01 13:03:17 -04:00
Isaac Connor
830929a85f
Remove extra value='s from PTZ buttons. Fix remaining on-click-this on numbered presets
2020-05-01 12:53:47 -04:00
Isaac Connor
0ed6cb7875
Remove extra value='s from PTZ buttons. Fix remaining on-click-this on numbered presets
2020-05-01 10:06:41 -04:00
Isaac Connor
8d8d37c648
fix eslint
2020-05-01 09:57:46 -04:00
Dvanderploeg
1d618136c0
Merge branch 'master' into camera_control_preset_correction
2020-04-30 22:10:54 -06:00
David van der Ploeg
a952984e1c
Removed value causing preset not to work
...
The first value field would not permit the presetGoto
command to be added as a value. The value would then use
the number as the command. Removing it allows the presets to
call the correct command.
2020-04-30 22:05:48 -06:00
Isaac Connor
4466bd9b16
Always just default to scale from monitor
2020-04-29 16:35:20 -04:00
Isaac Connor
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
Isaac Connor
eebd0a274d
Fix no redirect on login with palemoon browser
2020-04-29 16:34:27 -04:00
Isaac Connor
8b0f88a707
Use auth_relay instead of auth_hash if AUTH_RELAY==plain or none.
2020-04-29 16:34:07 -04:00
Isaac Connor
9ec89f20d3
Add auth relay information when auth_relay is something other than hashed.
2020-04-29 16:33:41 -04:00
Isaac Connor
5e88181380
Pass event object to data-on-click events
2020-04-29 16:32:55 -04:00
Isaac Connor
e78b718168
use on-click instead of on-click-this. We can get the button from event.target. The palemoon browser doesn't have a global event object so this wasn't working
2020-04-29 16:32:26 -04:00
David van der Ploeg
83b4b6b4db
Corrected zoom out button call
...
The zoom out button wasn't calling the correct function
of "data-on-click-this" causing the request to be ignored.
2020-04-27 21:14:58 -06:00
Isaac Connor
cf3785aebf
Don't include mootools on login view. It isn't needed and apparently breaks google recaptcha
2020-04-24 12:23:48 -04:00
Isaac Connor
775b0d1ccd
fix XSS in monitor Name
2020-04-23 18:16:38 -04:00
Isaac Connor
bc9137bd93
defend against XSS in Monitor Name
2020-04-23 17:56:05 -04:00
Isaac Connor
0f91797d85
defend against XSS in Monitor Name
2020-04-23 17:53:54 -04:00
Isaac Connor
189d4a6f02
add Emailed status to events list
2020-04-23 17:52:18 -04:00
Isaac Connor
8be08d942a
Scale must be an integer value so use '0' instead of auto
2020-04-23 17:40:42 -04:00
Isaac Connor
d90177fb74
handle a 0 value for scale
2020-04-23 16:41:00 -04:00
Isaac Connor
56a43741c5
Handle a zero value for scale
2020-04-23 16:37:26 -04:00
Isaac Connor
bf99daf494
Merge branch 'rate_dropdown'
2020-04-23 16:36:34 -04:00
Isaac Connor
5503458874
correct label_size array and add translations
2020-04-23 16:32:19 -04:00
Isaac Connor
010b230804
Fix value of auto in width dropdown. Allow a 0 value for scale.
2020-04-23 16:30:39 -04:00
Isaac Connor
8ef70f9080
defend against XSS in Monitor Name
2020-04-23 16:28:19 -04:00
Isaac Connor
25cd13f8ad
When sending eventCmdReq, pass eventCmdParms since it might have been updated.
2020-04-23 16:25:35 -04:00
Isaac Connor
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
Isaac Connor
908e892d48
Merge branch 'fix_auth_timeouts'
2020-04-23 16:15:30 -04:00
Isaac Connor
81d329af2f
spacing, eslint
2020-04-23 16:12:04 -04:00
Isaac Connor
5bf068791b
Merge branch 'rate_dropdown' into release-1.34
2020-04-23 16:11:59 -04:00
Isaac Connor
91e78410a9
Stop the montagereview update while we reload the page
2020-04-23 16:08:36 -04:00
Isaac Connor
9a3f699644
Use a little less ram by passing by reference
2020-04-23 16:07:59 -04:00
Isaac Connor
d3f2dd4d6a
fix
2020-04-23 16:07:23 -04:00
Isaac Connor
7d0421a02c
defend against XSS in Monitor Name
2020-04-23 16:06:44 -04:00
Isaac Connor
93a37671c2
Merge branch 'release-1.34'
2020-04-23 16:01:52 -04:00
Isaac Connor
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
Isaac Connor
63aaf76f0d
handle a 0 value for scale as the scale to fit value
2020-04-23 15:57:42 -04:00
Isaac Connor
6a9a8f1d5f
check length of returned tr array to prevent errors in js log
2020-04-23 15:55:46 -04:00
Isaac Connor
12252f1f37
defend against XSS in Monitor Name
2020-04-23 15:54:12 -04:00
Isaac Connor
7347ef4030
Handle a zero value for scale
2020-04-23 15:52:47 -04:00
Isaac Connor
b7fd4e26a5
defend against XSS in Monitor Name
2020-04-23 15:51:29 -04:00
Isaac Connor
bab609426d
spacing in views/event.php
2020-04-23 15:47:10 -04:00
Isaac Connor
4e9f0b3463
defend against XSS in Monitor Name
2020-04-23 15:46:05 -04:00
Isaac Connor
b6c1a328a8
Fix XSS from monitor Name, group Name, storage Name, server Name
2020-04-23 15:45:02 -04:00
Isaac Connor
8d2ce34149
include id in monitors dropdown so that it is searchable
2020-04-23 15:44:27 -04:00
Isaac Connor
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
Isaac Connor
a6f5ae2601
fix cyclePlay button not working. Move SetButtonState into skin.js
2020-04-23 15:42:30 -04:00
Isaac Connor
96774bd038
fix inline javascript in ptz buttons
2020-04-23 15:39:31 -04:00
Isaac Connor
042086b565
Extend width of ControlDevice and Address to full width
2020-04-23 15:38:40 -04:00
Isaac Connor
e770be2e13
Merge branch 'release-1.34'
2020-04-23 10:26:16 -04:00
Isaac Connor
055c20c3cc
fix eslint
2020-04-23 10:23:46 -04:00
Isaac Connor
eab08783e9
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
2020-04-23 10:10:08 -04:00
Isaac Connor
264ba6525b
Remove debug
2020-04-21 12:19:18 -04:00
Isaac Connor
b384d233ae
add async and defer to recaptcha load
2020-04-21 09:20:33 -04:00
Isaac Connor
543628d0ee
cleanup, and add missing </ul> in the navbar when not logged in which seems to be causing the recaptcha render to fail
2020-04-21 09:20:04 -04:00
Isaac Connor
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
Isaac Connor
ac017a5c72
Add support for strftimes' %r when converting to moment.js formatting
2020-04-18 17:51:34 -04:00
Isaac Connor
3700b9fcbe
fix eslint
2020-04-17 11:04:07 -04:00
Isaac Connor
2194ed8b59
spacing in views/event.php
2020-04-17 09:46:10 -04:00
Isaac Connor
b74d8d7487
Add support for strftimes' %r when converting to moment.js formatting
2020-04-17 09:44:07 -04:00
Isaac Connor
f1d61cefaa
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-04-13 10:45:37 -04:00
Isaac Connor
74e5cc3066
eslint
2020-04-10 14:22:44 -04:00
Isaac Connor
6d4d925f1e
Fix XSS from monitor Name, group Name, storage Name, server Name
2020-04-10 12:42:41 -04:00
Isaac Connor
fb70acdf6c
fix XSS in monitor Name
2020-04-10 11:32:01 -04:00
Isaac Connor
365f0240ad
fix inline javascript in ptz buttons
2020-04-10 11:30:30 -04:00
Isaac Connor
4f8016cc74
spacing in watch.php
2020-04-10 11:16:11 -04:00
Isaac Connor
85d779a624
defend against XSS in Monitor Name
2020-04-10 11:10:13 -04:00
Isaac Connor
4fe649c776
defend against XSS in Monitor Name
2020-04-10 11:10:09 -04:00
Isaac Connor
105be40ce3
fix
2020-04-10 11:09:46 -04:00
Isaac Connor
c8128de673
defend against XSS in Monitor Name
2020-04-10 11:06:39 -04:00
Isaac Connor
e9430d48a7
defend against XSS in Monitor Name
2020-04-10 11:06:20 -04:00
Isaac Connor
aad0b9362c
defend against XSS in Monitor Name
2020-04-10 11:05:48 -04:00
Isaac Connor
7473b0572a
defend against XSS in Monitor Name
2020-04-10 11:05:19 -04:00
Isaac Connor
4f4e6a85f9
defend against XSS in Monitor Name
2020-04-10 11:05:12 -04:00
Isaac Connor
40d386fe6c
Handle Zones without monitor
2020-04-09 20:41:34 -04:00
Isaac Connor
5c17de8e18
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-04-07 10:08:15 -04:00
Isaac Connor
40ceb359ae
populate filter object with request filter if it isn't loaded from db
2020-04-07 10:08:04 -04:00
Isaac Connor
33048e38b7
Use Filter object in events view. Include the ability to specify filter by Id
2020-04-07 10:05:02 -04:00
Isaac Connor
ea8fe7b9a9
check length of returned tr array to prevent errors in js log
2020-04-06 11:59:27 -04:00
Isaac Connor
d0fe1b60df
Merge branch 'release-1.34'
2020-04-04 16:58:53 -04:00
Isaac Connor
024431808e
fix onchange to data-on-change-this in width,height,scale, layout dropdowns
2020-04-04 16:57:24 -04:00
Isaac Connor
571ff260cc
Merge branch 'release-1.34'
2020-04-04 16:35:09 -04:00
Isaac Connor
e2cb8a656d
change exportEvent to expertEvents
2020-04-04 11:53:07 -04:00
Isaac Connor
402c38725b
Limit version check popups to once per hour
2020-04-04 11:52:40 -04:00
Isaac Connor
6feffe2aa9
whitespace
2020-04-04 11:51:39 -04:00
Isaac Connor
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
Isaac Connor
2441ae2924
Improve event export a little bit. Add links to eventFrames and eventDetail html.
2020-04-03 15:34:20 -04:00
Isaac Connor
4547332fad
Move more styles into export.css. Remove content from dark/export.css and classic/export.css as it is duplicated.
2020-04-03 15:32:22 -04:00
Isaac Connor
ef9fbac90c
Add Noscript warnings. Whitespace, improve some logic
2020-04-02 18:14:14 -04:00
Isaac Connor
1cc60f0857
fix action on cycle play button
2020-04-02 16:06:27 -04:00
Isaac Connor
87069b99b6
Fix inline-script errors on groups page referenced in #2890
2020-04-02 14:13:28 -04:00
Isaac Connor
ebac665d4d
Must use namespace ZM
2020-03-31 08:54:47 -04:00
Isaac Connor
4dcba55ab6
Include Storage.php and Server.php
2020-03-31 08:53:32 -04:00
Isaac Connor
2fe0096b21
correct label_size array and add translations
2020-03-30 18:34:43 -04:00
Isaac Connor
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
hax0kartik
a781cc2c87
WIP scaling
2020-03-27 14:32:50 -04:00
hax0kartik
ae80b3b859
Start implementing VNC
2020-03-27 14:32:50 -04:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
4ce944da23
Merge branch 'release-1.34'
2020-03-26 15:38:35 -04:00
Isaac Connor
b354641df3
fix syntax errors in triggers in monitor view
2020-03-26 13:57:19 -04:00
Isaac Connor
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
Isaac Connor
5a20ef959f
Merge branch 'release-1.34'
2020-03-20 11:07:46 -04:00
Isaac Connor
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
Isaac Connor
f8fa0340fc
fix eslint
2020-03-14 09:27:07 -04:00
Isaac Connor
9a3127da06
Merge branch 'rate_dropdown'
2020-03-10 18:47:19 -04:00
Isaac Connor
59bd658a96
replace vjsPause with pauseCLicked. Fix behaviour with rate dropdown and reverse/pause etc.
2020-03-10 18:46:20 -04:00
Isaac Connor
84d719f2dd
Merge branch 'release-1.34' into rate_dropdown
2020-03-10 16:06:11 -04:00
Isaac Connor
e8553babfa
remove extra spaces, fix eslint
2020-03-09 14:43:54 -04:00
Isaac Connor
3d993eef80
Fix triggers code
2020-03-09 14:39:57 -04:00
Isaac Connor
f056f787c5
Merge branch 'release-1.34'
2020-03-08 17:24:06 -04:00
Isaac Connor
e56976c800
Triggers cannot be null, it is '' instead
2020-03-08 17:23:48 -04:00
Isaac Connor
b482993d33
Merge branch 'release-1.34'
2020-03-06 15:04:48 -05:00
Isaac Connor
f003daa791
Merge branch 'add_enabled_to_storage'
2020-03-05 15:48:43 -05:00
Isaac Connor
55f63e8e9d
Merge branch 'fix_auth_timeouts'
2020-03-04 11:22:08 -05:00
Isaac Connor
a9e3d0691f
quotes, fix status ajax call using old auth_hash
2020-03-04 11:17:48 -05:00
Isaac Connor
9f696186a8
Increase height of storage popup for Enabled
2020-03-04 10:48:02 -05:00
Isaac Connor
ac00ca0ad8
Only list enabled Storage Areas
2020-03-04 10:46:59 -05:00
Isaac Connor
077b8888f9
Use Storage object and add Enabled
2020-03-04 10:46:32 -05:00
Isaac Connor
3a24f27a7a
include id in monitors dropdown so that it is searchable
2020-03-03 16:59:38 -05:00
Isaac Connor
bd59ae8856
Move the Basic Auth login code from skin.php to includes/auth.php
2020-03-02 15:00:31 -05:00
Isaac Connor
c1e13221f7
Move the Basic Auth login code from skin.php to includes/auth.php
2020-03-02 14:59:36 -05:00
Isaac Connor
a2dd24ae1f
When sending eventCmdReq, pass eventCmdParms since it might have been updated.
2020-03-02 14:38:36 -05:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
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
Isaac Connor
b9acf42929
spacing, eslint
2020-02-29 09:28:04 -05:00
Isaac Connor
bf9ba39aa2
Merge branch 'release-1.34'
2020-02-25 18:22:55 -05:00
Isaac Connor
1b70ed2076
Merge branch 'fix_generate_video_page' into release-1.34
2020-02-25 18:22:24 -05:00
Isaac Connor
0c70c5c2a4
Save value of V4LMultiBuffer and fix it not being checked for the Use Config Value
2020-02-25 18:14:27 -05:00
Isaac Connor
e82ed3a098
Save value of V4LMultiBuffer and fix it not being checked for the Use Config Value
2020-02-25 18:13:42 -05:00
Isaac Connor
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
Isaac Connor
23e4b43aa0
Stop the montagereview update while we reload the page
2020-02-25 16:53:08 -05:00
Isaac Connor
3adc20b04e
Use a little less ram by passing by reference
2020-02-25 16:52:45 -05:00
Isaac Connor
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
Isaac Connor
5c3b7f109e
fix cyclePlay button not working.
2020-02-25 13:17:45 -05:00
Isaac Connor
dce4d17b51
fix cyclePlay button not working. Move SetButtonState into skin.js
2020-02-25 13:17:02 -05:00
Isaac Connor
a7c28be365
change scale to fit value from auto to 0
2020-02-25 12:14:34 -05:00
Isaac Connor
8c7d2c5e1a
handle a 0 value for scale
2020-02-25 12:14:07 -05:00
Isaac Connor
e2ff241017
handle a 0 value for scale as the scale to fit value
2020-02-25 12:13:05 -05:00
Isaac Connor
71dd292a8d
Revert "Handle a zero value for scale"
...
This reverts commit a5da6d12f3
.
2020-02-25 11:19:09 -05:00
Isaac Connor
a5da6d12f3
Handle a zero value for scale
2020-02-25 11:18:28 -05:00
Isaac Connor
8a83449fba
Handle a zero value for scale
2020-02-25 11:18:13 -05:00
Isaac Connor
2f89bd28b7
Handle a zero value for scale
2020-02-25 11:18:02 -05:00
Isaac Connor
37abd41e78
Handle a zero value for scale
2020-02-25 11:17:46 -05:00
Isaac Connor
429000c13b
Fix value of auto in width dropdown. Allow a 0 value for scale.
2020-02-25 11:14:12 -05:00
Isaac Connor
638e333702
Scale must be an integer value so use '0' instead of auto
2020-02-25 11:13:20 -05:00
Isaac Connor
cc7de97b6a
Merge branch 'release-1.34'
2020-02-24 14:39:50 -05:00
Isaac Connor
173d58d8b3
Merge pull request #2852 from connortechnology/Event_list_is_not_filtered_when_Group_is_selected_on_Console
...
Event list is not filtered when group is selected on console
2020-02-24 14:37:42 -05:00
Isaac Connor
55c99c5ff3
Include filtered monitors for filter query on totals line of event counts. Fixes #2846
2020-02-24 14:34:21 -05:00
Isaac Connor
b389f9660d
Merge branch 'fix_class_PTZ_presets_almost_invisible'
2020-02-24 13:17:09 -05:00
Isaac Connor
d0a8d241d2
Don't include controls.css twice if css is base. Don't use special styles for ptz buttons, so that they look like all the other buttons. Fixes #2849
2020-02-24 13:13:54 -05:00
Isaac Connor
d7f8f201be
Fix zoneminder.com url getting undefined being added to it
2020-02-22 10:51:26 -05:00
Isaac Connor
e640fc0c26
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-02-22 10:50:07 -05:00
Isaac Connor
63a3f2e453
Fix zoneminder.com url getting undefined being added to it
2020-02-22 10:50:00 -05:00
Andrew Bauer
c29f2cb8cf
fix our friend, eslint
2020-02-21 14:22:53 -06:00
Isaac Connor
ce8c8a755c
fix eslint
2020-02-21 10:29:27 -05:00
Isaac Connor
d51fdafbc0
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-02-21 09:37:45 -05:00
Isaac Connor
7645196bdc
Extend width of ControlDevice and Address to full width
2020-02-21 09:30:31 -05:00
Isaac Connor
dab5c520fe
Merge branch 'master' into add_alarmed_zone_to_filters
2020-02-19 14:20:08 -05:00
Isaac Connor
3b1458bb88
add Emailed status to events list
2020-02-19 14:17:44 -05:00
Isaac Connor
789db4e5a6
Fix filter new rows missing their onchange event on attribute dropdown. Fixes #2817
2020-02-18 13:29:06 -05:00
zlodag
a8615c1c85
fixed bug in control functions where left arrow panStep was inverted
2020-02-16 11:41:14 +13:00
Isaac Connor
289bde869d
use a better language for unset value
2020-02-11 14:31:48 -05:00
Isaac Connor
9f9a97f596
fix dropdown with unset option
2020-02-11 14:29:21 -05:00
Isaac Connor
844ff529e1
add an unset value to ZM_TIMEZONE in Options->System
2020-02-11 13:24:26 -05:00
Isaac Connor
137bdb1f24
Make shm have error or warning class if full
2020-02-10 14:20:46 -05:00
Isaac Connor
42b3bb6a53
increase width of google sitekey and secret key inputs to 100%
2020-02-04 16:40:52 -05:00
Isaac Connor
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
Isaac Connor
29a04dc1b9
Merge branch 'improve_filter_emails' into add_alarmed_zone_to_filters
2020-01-24 09:50:53 -05:00
Isaac Connor
948b3d7e43
Impleent click_AutoEmail to hide/show the Email options
2020-01-22 17:02:16 -05:00
Isaac Connor
d95857d419
Add EmailTo,EmailSubject,EmailBody fields to filter view
2020-01-22 14:05:08 -05:00
Isaac Connor
f4b5f5f399
style the new Email content fields
2020-01-22 14:04:23 -05:00
Isaac Connor
9d41334e8f
Merge branch 'master' into add_alarmed_zone_to_filters
2020-01-22 13:45:37 -05:00
Isaac Connor
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
Garrett Scott
ead52f30b1
Bug fix: Allows for inital/base install without the option MultiPort config value assigned
2020-01-20 00:44:20 -08:00
Isaac Connor
75fa1d693d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-01-18 16:09:44 -05:00
Isaac Connor
6c7f003198
revert bogus change not including skin.js
2020-01-18 16:08:55 -05:00
Andrew Bauer
de5bf21d8a
fix eslint
2020-01-17 15:06:46 -06:00
Isaac Connor
5b8e5eb349
don't output duplicated js when css=base
2020-01-17 14:51:02 -05:00
Isaac Connor
d0003215b1
Merge branch 'master' into rate_dropdown
2020-01-17 12:30:35 -05:00
Isaac Connor
a398f33e68
fix delTerm button not being enabled because it is a button now, not an input
2020-01-17 09:17:29 -05:00
Isaac Connor
4f2df830a8
fix inline js
2020-01-17 09:17:05 -05:00
Isaac Connor
74b3ad6dd9
add options help for HWACCEL options
2020-01-16 14:33:37 -05:00
Isaac Connor
6a43c2deb5
fix zoom_range to zoomout_range
2020-01-16 14:17:40 -05:00
Isaac Connor
09f2298838
return empty array instead of nothing in probeNetwork
2020-01-15 19:02:40 -05:00
Isaac Connor
91acb775eb
Fix Eventount to EventCount
2020-01-13 13:43:14 -05:00
Isaac Connor
b11815cfa9
Introduce Storage->EventCount to get the # of events per storage without actually loading all events.
2020-01-13 12:53:50 -05:00
PrplHaz4
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
Alex Porosanu
28a4bef6ba
fix tar invocation for *BSD platforms
...
"--xform" switch is not supported by tar on BSD platforms i.e. *BSD,
MacOS, etc. As such, use "-s" switch on these platforms, with a
similar regexp.
2020-01-09 22:03:02 +02:00
Andrew Bauer
f13a7199e1
fix eslint
2020-01-07 21:53:55 -06:00
Isaac Connor
c64de372a7
when auth_hash changes, update various CmdParms
2020-01-07 17:08:57 -05:00
Isaac Connor
1c197db619
Merge branch 'master' into rate_dropdown
2020-01-07 14:49:58 -05:00
Isaac Connor
61bc0ddd0a
add missing t and merge some lines
2020-01-07 11:01:53 -05:00
Isaac Connor
2f1b725ee4
quote SQL for mysql8
2020-01-07 11:01:02 -05:00
Isaac Connor
7535769e4b
controlcap needs to be larger
2020-01-05 17:34:40 -05:00
Isaac Connor
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
Isaac Connor
6ac26ec1aa
quotes
2020-01-05 17:33:53 -05:00
Isaac Connor
00f8a450de
spaces and quotes
2020-01-05 14:59:25 -05:00
Isaac Connor
7fdf6165d5
Fix case in var name
2020-01-03 17:08:11 -05:00
Isaac Connor
0a495395b0
Restore Gain tab
2020-01-03 16:34:46 -05:00
Isaac Connor
f572c4092a
add checks for Zoom, Focus, White, Iris movement types
2020-01-03 15:58:57 -05:00
Isaac Connor
158e26bb25
split long lines
2020-01-03 15:58:02 -05:00
Isaac Connor
c4aaa33bea
add widths for number inputs on controlcap view
2020-01-03 15:57:51 -05:00
Isaac Connor
0b3776dbf0
change text inputs to number inputs, cleanups
2020-01-03 15:57:29 -05:00
Isaac Connor
3cfc1a0a6d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-01-02 16:45:39 -05:00
Isaac Connor
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
Andrew Bauer
98f7fb63b9
fix eslint errors
2019-12-31 19:24:51 -06:00
Isaac Connor
6a39893c1d
include i elements in data-on-click
2019-12-31 19:11:14 -05:00
Isaac Connor
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
Isaac Connor
2c76c12664
Fix export to include files when using DEEP scheme. Also make it more efficient
2019-12-30 22:18:55 -05:00
Isaac Connor
845f35fe00
Fix cases of check before creating dirs. Add chmod so they are only readable by web user. Fix MonitorName => Monitor->Name()
2019-12-26 15:57:25 -05:00
Isaac Connor
1977e48ddd
DefaultScale is a member of the Monitor, not the event
2019-12-26 15:21:27 -05:00
Isaac Connor
42a724891b
spacing
2019-12-20 16:11:38 -05:00
Isaac Connor
63d20a1514
Move hidden inputs to top of form
2019-12-20 16:11:24 -05:00
Isaac Connor
5a45835006
break up long lines
2019-12-20 16:11:10 -05:00
Isaac Connor
23dde04725
remove timeout on changing runstate.
2019-12-20 16:10:30 -05:00
Isaac Connor
d87bf5a156
replace the rate display with a dropdown
2019-12-20 11:02:12 -05:00
Isaac Connor
3c59be9616
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-12-19 09:24:44 -05:00
Isaac Connor
958a6b8218
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-12-18 19:06:19 -05:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
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
Isaac Connor
3b12b67b4a
fix eslint
2019-12-18 10:40:51 -05:00
Isaac Connor
689956bba7
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-12-13 17:49:00 -05:00
Isaac Connor
5b7efb2b33
fix mouseover streaming in chrome when adblocker disabled
2019-12-13 17:48:22 -05:00
Isaac Connor
18ed90d147
remove second hit to db to load storage areas with no serverid
2019-12-13 17:47:51 -05:00
Isaac Connor
0dbc1ef15c
Use multiport when talking monitor stream on montage
2019-12-13 11:51:55 -05:00
Isaac Connor
0bbbbb302e
add default for Units in new zone
2019-12-13 11:51:07 -05:00
Isaac Connor
ed417a49b4
increase logspopup width to eliminate scrollbars
2019-12-08 11:21:38 -05:00
Isaac Connor
3af6358314
fix & to &
2019-12-02 15:49:49 -05:00
Isaac Connor
72cb5bd1bb
add missing </select>
2019-12-02 15:49:42 -05:00
Isaac Connor
09faa0a731
fix & to &
2019-12-02 15:49:32 -05:00
Isaac Connor
b686649589
fix & instead of &.
2019-12-02 15:34:31 -05:00
Isaac Connor
8bf74d2f35
fix & instead of &.
2019-12-02 15:34:23 -05:00
Isaac Connor
24022d157d
use & instead of &. Put inputs out of table where they belong
2019-12-02 15:33:58 -05:00
Isaac Connor
9f49e4f367
make Mark column text-align left so that checkboxes line up
2019-12-02 15:07:35 -05:00
Isaac Connor
f7e01aa999
switch to material icon for dot
2019-12-02 14:31:05 -05:00
Isaac Connor
cf35db120d
change to material icons, fix missing div
2019-12-02 14:21:51 -05:00
Isaac Connor
8e645e45e1
fix selecting Monitors by passing MonitorId as MonitorId[]
2019-12-02 14:21:25 -05:00
Isaac Connor
b70b75421b
quotes and spacing
2019-12-02 14:18:27 -05:00
Isaac Connor
9d0a416311
remove debugging code
2019-12-02 13:41:42 -05:00
Isaac Connor
c9a324b7b3
improve the configureExportButton to look at specific inputs instead of just counting checkboxes
2019-12-02 13:40:02 -05:00
Isaac Connor
09a6e06132
change layout from a table to something more bootstrappy. Use the new html_radio function generate the radio buttons for Format and Compression. Remove the data-on-click from the export button because we added setting up the click event in the javascript already
2019-12-02 13:38:23 -05:00
Isaac Connor
2713565c84
using bootstrap layout instead of a table, so text-align: right
2019-12-02 13:34:53 -05:00
Isaac Connor
80d0d037b5
add a style for inline form not supported by bootstrap 3
2019-12-02 13:34:11 -05:00
Isaac Connor
d39193cb6b
convert flip to material icons
2019-12-02 12:33:13 -05:00
Isaac Connor
caefcc2f7a
increase size of export popup
2019-12-02 12:17:33 -05:00
Isaac Connor
03d7bcdd11
better debug logging when on-click-this function isn't defined
2019-12-02 12:17:18 -05:00
Isaac Connor
09fcbad666
Merge branch 'master' into zma_to_thread
2019-11-30 14:59:39 -05:00
Isaac Connor
50986ce3b4
Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread
2019-11-30 13:53:05 -05:00
Isaac Connor
7e92900542
Change Orientation Enum to use strings instead of numbers as values. Sync them up with what we use in C code
2019-11-29 13:50:02 -05:00
Isaac Connor
5ebf929598
Add Event counts, event disk usage to storage tab of options. Disable checkbox selection when there are events stored on the storage area.
2019-11-26 14:36:39 -05:00
Isaac Connor
ab9f99bdbb
Fix Width & Height rotation when scaling. Fixes #2760
2019-11-22 12:18:30 -05:00
Isaac Connor
5feeedf7f4
Mostly spacing, but Event doesn't have DefaultScale, that comes from Monitor
2019-11-20 09:31:58 -05:00
Isaac Connor
ac96a19371
Fix filtering monitors by user's MonitorId restriction
2019-11-19 17:21:01 -05:00
Isaac Connor
207e5918c8
fix lint, remove debug
2019-11-19 11:37:45 -05:00
Isaac Connor
56618aac32
Handle buttons not existing
2019-11-10 15:49:39 -05:00
Isaac Connor
5b02bc76f4
Fix donate now functionality. Improve zmWindow to take an optional sub path so that we can target /donate directly
2019-11-05 10:07:42 -05:00
Isaac Connor
54c11bc0d1
define monitor_options as an empty array instead of php implicitly dealing with it
2019-11-01 13:42:01 -04:00
Isaac Connor
a20517a6db
spacing
2019-11-01 13:41:37 -04:00
Isaac Connor
18c13c4bad
Make chosen dropdowns 100% width on monitor edit
2019-11-01 13:40:55 -04:00
Isaac Connor
9a3bee28d2
add logging and handling of oninput and oninput-this
2019-11-01 13:38:09 -04:00
Isaac Connor
3653ad5ce3
update group editing, solving inline javascript problems and removing cruft
2019-11-01 13:37:52 -04:00
Isaac Connor
6ae220f756
improvements to layout on zones and zone. Use ViewWidth and ViewHeight. Replace inline javascript
2019-10-29 18:06:32 -04:00
Isaac Connor
daf71aa492
improvements to layout on zones and zone
2019-10-29 18:06:03 -04:00
Isaac Connor
417123019c
fix crumbs
2019-10-23 09:52:36 -04:00
Isaac Connor
77118d55b2
add 4CIF aspect ratio padding. Fixes #2738
2019-10-23 09:50:49 -04:00
Isaac Connor
13b02284fe
Merge branch 'master' into timezone_as_config
2019-10-18 13:58:22 -04:00
Isaac Connor
a6a61b75b9
update ptz css in classic
2019-10-18 13:52:34 -04:00
Isaac Connor
524a39a224
changeCodec no longer needs to be passed this
2019-10-18 13:40:29 -04:00
Isaac Connor
fdf48c4123
Merge pull request #2726 from externo6/more-filter-options
...
More filter options
2019-10-16 10:15:58 -04:00
Isaac Connor
f25a823bc8
Fix event => zm_event
2019-10-16 08:53:40 -04:00
Isaac Connor
8ee567442e
UPdate replay, scale, codec dropdown onchanges
2019-10-15 15:04:14 -04:00
Isaac Connor
1cf034ec5f
fix inline js on the back/close button
2019-10-08 18:49:29 -04:00
Isaac Connor
d1b086ddc6
fix cases of monitor->CanZoom to control->CanZoom
2019-10-08 18:49:11 -04:00
Isaac Connor
c15e8eebb2
Make PTZ presets fill the entire window width and fix other visual problems with the buttons
2019-10-08 18:48:37 -04:00
Isaac Connor
f3f972359b
increase width of Zoom, White, Iris controls to fit wider button
2019-10-08 18:28:02 -04:00
Isaac Connor
5040d5b075
remove extra (
2019-10-05 16:56:05 -04:00
Isaac Connor
b1496643eb
fix js error in onvif probe
2019-10-03 17:31:10 -04:00
Isaac Connor
5384b9345a
fix errors on centos 7 with the functions view
2019-10-03 17:30:52 -04:00
Isaac Connor
11fe748154
Sort control capabilities by Name instead of Id
2019-10-03 17:30:31 -04:00
Isaac Connor
17611f2e4b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-10-02 19:38:21 -04:00
Isaac Connor
769717b571
Merge pull request #2715 from connortechnology/fix_2620
...
Add delete from logs ajax capability. Make the clear button use it. …
2019-10-02 16:43:08 -04:00
Isaac Connor
95615fee35
fix eslint
2019-10-02 16:42:50 -04:00
Isaac Connor
6b65e9a60c
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-10-02 16:41:20 -04:00
Isaac Connor
7b93a445b8
Finish updating the linked Monitors dropdown
2019-10-02 15:42:56 -04:00
Isaac Connor
e4b5052fb4
Add delete from logs ajax capability. Make the clear button use it. Fixes #2620
2019-10-02 15:39:04 -04:00
Isaac Connor
d02aee64e4
Add setting of timezone to Options/Config instead of php.ini
2019-10-02 09:07:18 -04:00
Isaac Connor
b4d5d92d86
Add some non standard resolutions available on some vivotek cameras
2019-09-30 15:06:32 -04:00
Andrew Bauer
90b02beb94
fix eslint
2019-09-30 09:52:41 -05:00
Isaac Connor
7271151eb0
add some more aspect ratios
2019-09-28 15:16:25 -04:00
Isaac Connor
393f0a369c
Revamp timeline. Make it handle being full browser width. remove onclicks.
2019-09-28 14:23:23 -04:00
Isaac Connor
deef948964
Allow anyone to change their skin
2019-09-28 12:58:17 -04:00
Isaac Connor
ec9e94b99d
Don't add checkboxes if can't edit groups
2019-09-28 12:58:01 -04:00
Isaac Connor
80e3922165
add backWindow function to handle back buttons
2019-09-28 12:57:43 -04:00
externo6
7479d3f1f1
Add LIKE and NOT LIKE to filter options
...
This is useful for filtering notes.
EG filtering detected objects from zmeventnofification;
WHERE notes LIKE %detect%
WHERE notes NOT LIKE %car%
2019-09-28 13:03:16 +01:00
Isaac Connor
ebcacaa660
Use material icons for buttons
2019-09-26 16:26:37 -04:00
Isaac Connor
fdaee75310
Use material icons for buttons. Hide the stop button because it does nothing.
2019-09-26 16:26:18 -04:00
Isaac Connor
e4265bd075
spaces
2019-09-26 16:13:49 -04:00
Isaac Connor
2b017f782b
Fix missing eid= from View All/View Pages links
2019-09-25 10:35:41 -04:00
Isaac Connor
bcb8389923
spaces
2019-09-25 10:16:27 -04:00
Isaac Connor
b936fbac6a
Don't import Monitor.php unless we need to
2019-09-25 10:16:16 -04:00
Isaac Connor
ca40e760f7
get global cspNonce
2019-09-25 10:15:32 -04:00
Isaac Connor
54dec069cd
correct quotes and use a button on loging page
2019-09-25 10:15:12 -04:00
Isaac Connor
1b653e7e79
Add warnings for when SaveJPEGs and VideoWriter are both set to disabled
2019-09-25 10:14:41 -04:00
Isaac Connor
c7d7d45380
Remove :'s, they can be added using css if desired
2019-09-23 11:49:39 -04:00
Isaac Connor
9a94ce6e41
remove debug
2019-09-23 10:22:25 -04:00
Isaac Connor
8d95b2f5f8
Don't select Layout when changing size in montage
2019-09-22 14:22:24 -04:00
Isaac Connor
7b9eaf42b8
Fix selecting group from groups listing under monitor name. Fixes #2711
2019-09-22 12:03:34 -04:00
Isaac Connor
d7810bf9b3
fix eslint
2019-09-20 14:16:37 -04:00
Isaac Connor
6c39fd133d
fix eslint
2019-09-20 10:44:38 -04:00
Isaac Connor
5d0b4942d6
remove debug
2019-09-20 10:37:48 -04:00
Isaac Connor
0d19b0dc85
Use a subselect instead of inner join because the inner join won't return monitors that don't have a group
2019-09-20 10:37:19 -04:00
Isaac Connor
a8cbe7d10d
Turn off debug
2019-09-20 10:36:50 -04:00
Isaac Connor
d4435368bc
fix spacing between presets and home/set
2019-09-19 14:57:48 -04:00
Isaac Connor
b05ecd881e
add onchange to scale
2019-09-19 14:57:21 -04:00
Isaac Connor
2da9edf0ff
add onchange to scale
2019-09-19 14:57:17 -04:00
Isaac Connor
14e625b775
Set width of dimensions
2019-09-19 14:56:55 -04:00
Isaac Connor
b9b52c964e
Upgrade monitor saving and viewing
2019-09-19 14:56:16 -04:00
Isaac Connor
4c206c2e9a
Upgrade Control Object to extend ZM\Object. Add commands function from skin specific control functions
2019-09-19 14:55:17 -04:00
Isaac Connor
d5ee73a9ee
use CaptureResolution instead of CaptureDimensions because it is already in language
2019-09-19 10:50:20 -04:00
Isaac Connor
1bd70319a9
Add a dimensions dropdown to ease entering monitor dimensions
2019-09-19 10:48:25 -04:00
Isaac Connor
b3b7ec660b
Add a test for the built-in layouts. Can't edit them.
2019-09-18 11:19:28 -04:00
Isaac Connor
9e8c17dfaf
Merge branch 'master' into tolland-remove-extra-px
2019-09-18 11:17:50 -04:00
Isaac Connor
0eb1fff5b5
remove unused view=image-ffmpeg
2019-09-18 11:16:49 -04:00
Isaac Connor
f509b4c9d1
spacing
2019-09-18 11:10:40 -04:00
Isaac Connor
ce1823bd29
spacing and fix saving
2019-09-17 12:46:11 -04:00
Isaac Connor
bcaabf4cf2
update buttons
2019-09-17 12:09:36 -04:00
Isaac Connor
f0cfd674c1
Cleanup options skins tab. Setting the values happens in index.php. Use global and
2019-09-17 12:06:54 -04:00
Isaac Connor
d141632256
general clean of onvif probe view. Use buttons instead of inputs and use data-on-change-this instead of inline js. Also rename username and password to Username and Password to not conflict with authentication to ZM ui.
2019-09-11 09:18:03 -04:00
Isaac Connor
bce1a48b66
Fix another Monitorid. Fixes #2699
2019-09-05 10:31:22 -04:00
Isaac Connor
f568e0da30
Fix event->id() to event->Id()
2019-09-04 10:11:16 -04:00
Isaac Connor
16f0ad4f59
Fix Monitorid => MonitorId
2019-09-03 12:55:45 -04:00
Isaac Connor
99a2ddba63
Add listing of Secondary Storage area in events list
2019-08-29 11:27:06 -04:00
Isaac Connor
c6dd3ffbec
tabs to spaces
2019-08-28 09:19:09 -04:00
Isaac Connor
91ef4f5932
x264 encode works on arm now, so let people choose it
2019-08-28 08:51:42 -04:00
Isaac Connor
8043ba8092
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-08-27 16:49:12 -04:00
Paulius Gedrikas
9b3fecd7a0
Fix iOS autocapitalizing username field on login ( #2687 )
...
I propose removing the auto-capitalization from the username field for Safari under iOS by adding autocapitalize="none" to the username form field. Usernames rarely start with a capital letter, so I think this would be a usability improvement for users logging in through iPhones or iPads.
Having to login to ZM under iOS, I've been frustrated at the need to always press on the Caps Lock key on the virtual keyboard to disable the capitalization of the first letter. This is because iOS auto capitalized non-password and non-email HTML form fields. ZM is also case sensitive, so "Admin" will not work if the main user is "admin".
2019-08-27 16:49:03 -04:00
Isaac Connor
dfb65d23bf
Fix eslint warnings
2019-08-27 16:48:42 -04:00
Isaac Connor
41fb11d776
Fix Arched lacking () so not working
2019-08-27 15:19:38 -04:00
Isaac Connor
d7d2c140a0
Use index to server hosting storage where event is saved to talk to zms
2019-08-27 15:19:18 -04:00
Isaac Connor
cd883e23b8
Extend inputs to full width on storage popup
2019-08-26 20:45:20 -04:00
Isaac Connor
f01bedb33e
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-08-26 18:49:12 -04:00