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
8c4f89c099
requested dark skin changes
2020-08-26 13:31:58 -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
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
f1fab6361f
fix dimensions of v4l settings popup
2020-08-25 12:38:46 -04:00
98dce06d6b
Introduce get_auth_relay to return an auth string to use in urls.
2020-08-25 12:38:31 -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
2d05fbda8d
simplify debug line
2020-08-24 14:36:36 -04:00
3c1651d98f
in getStreamSrc if scale isn't set figure it out from width and height if passed
2020-08-24 14:35:59 -04: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
79fa257a4a
rough in tumbnail animation to web console
2020-08-21 20:43:36 -05:00
ac0976324f
Fix case of filterQuery. Fixes #3017
2020-08-21 11:22:47 -04:00
fe425302ad
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-21 10:46:13 -04:00
63ef15d247
spacing and quotes
2020-08-21 10:46:10 -04:00
80a6608733
Make values in conf.d files override values in db. Also handle the fact that they would already be defined in this case.
2020-08-21 10:36:49 -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
bec77c9ce3
change pointer when over frames table
2020-08-20 10:39:55 -05: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
a92a16f13e
Merge branch 'update_users_controller' into release-1.34
2020-08-17 19:33:31 -04:00
7e679809f2
Merge branch 'update_users_controller'
2020-08-17 19:31:30 -04: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
5078a69c81
move pre and post condition testing into the Filter class so we can use it everywhere
2020-08-17 17:40:58 -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
479768a2a4
implement disk_used_blocks in Storage. Also use Type() instead of ->{Type} to get default value.
2020-08-17 16:57:53 -04:00
72cad5f6d6
Move more code from parseFilter to Filter object.
2020-08-17 16:57:14 -04:00
e9b0c4fbf5
add ->filter to FilterTerm so that we can access other terms in testing pre and post conditions. rename hidden_fields_string to hidden_fields. Add in DiskPercent DiskBlocks, SystemLoad Pre and Post conditions
2020-08-17 16:56:54 -04:00
d2b7aa3e90
Populate Scheme of default Storage Area when event Storage is not valid
2020-08-17 16:55:29 -04:00
ae91e9c58f
add functions to Filter class to build up the sql, hidden_fields and query_string from the list of terms
2020-08-17 16:55:05 -04:00
3e5bfc445f
fix checkbox column disappearing
2020-08-17 12:10:35 -05: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
9bc1b6a34e
change icon color on hover
2020-08-17 08:37:03 -05:00
e19d1f507e
fix bootstrap-table-cookie correctly
2020-08-17 08:05:50 -05:00
7fed6f9c29
shift thumbnail animation away from edge
2020-08-16 21:08:07 -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
2021f561fa
Import as a global
2020-08-16 20:08:26 -04:00
ea4edcbc94
Make a global so tht we can use it in export_functions
2020-08-16 20:08:14 -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
7c72e1fa08
fix cookie issue with bootstrap-table
2020-08-16 15:39:20 -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
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
344f586f19
Add language entry for ExistsInFileSystem
2020-08-16 13:03:18 -04:00
d1126b3007
Move term logic from parseFilter to FilterTerm class
2020-08-16 13:02:34 -04:00
9be63f1d99
reorganize and init eventTable
2020-08-16 11:34:37 -05:00
82a1670d80
Rough in FilterTerm class, stealing code from functions.php and adapting it.
2020-08-15 17:49:59 -04:00
8a170f2841
Remove Debug
2020-08-15 17:49:26 -04:00
93475bef7e
eslint nanny
2020-08-15 16:08:53 -05:00
252bf7995a
eslint nannt
2020-08-15 15:54:58 -05:00
1c558b66e7
add font-awesome stylesheet
2020-08-15 15:44:54 -05:00
50a1ceb48a
add bootstrap-table.min.css
2020-08-15 15:37:02 -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
6550876a92
fix css so that the background colour of the dropdown divs is set
2020-08-13 12:40:11 -04:00
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
4fee59208d
Use str_replace and ltrim instead of preg_replace for efficiency
2020-08-13 12:14:18 -04: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
81296bbe31
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-10 17:31:08 -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
63da7f0074
Fix unsetting scale, width and height when generating url to zms. width and height are normally pixels but maybe someday could be percent.
2020-08-10 14:02:25 -04:00
81b55589db
Fix unsetting scale, width and height when generating url to zms. width and height are normally pixels but maybe someday could be percent.
2020-08-10 13:59:47 -04: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
e64e786c5b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-09 22:20:08 -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
25426d5fdd
Don't add 442 for https and 80 for http. Just cleaner
2020-08-09 22:18:35 -04:00
b4a3ccdfed
only put the hostname in the CSP headers so that we accept as source either http or https or any port. Useful for multiport.
2020-08-09 22:18:07 -04:00
42fe024681
Update skin.js
2020-08-09 17:43:39 -05:00
9a03a2c7d4
Update skin.js
2020-08-09 17:43:07 -05:00
15005a2f17
fix typo
2020-08-09 14:25:11 -05:00
d0e7443a3c
rough in update reminder dropdown
2020-08-09 14:18:44 -05:00
b22f12dadb
rough in new zmversion widget
2020-08-09 12:20:11 -05:00
6c831be61f
remove extra ,
2020-08-08 14:27:37 -04:00
a6ae4aee01
eslint nanny
2020-08-08 12:26:42 -05:00
fd4b9ba4f4
move jquery in functions.php to skin.js
2020-08-08 12:06:57 -05:00
b626e0de1c
eslint nanny strikes again
2020-08-08 11:19:29 -05:00
a001c93321
fix zone editing globals and inputs being too big
2020-08-08 11:41:24 -04:00
96bd6397c6
eslint nanny
2020-08-08 10:38:58 -05:00
8533ce7018
fix CSP on polygons
2020-08-08 11:38:54 -04:00
82357a0675
reapply click function to bandwidth dropdown entries after getNavBar
2020-08-08 11:17:26 -04:00
3792043707
implement bw widget as dropdown
2020-08-08 10:07:26 -05:00
bf7aa3f5c2
this version of set_cookie_params was introduced in 7.3. So put back code for previous versions of php which unfortunately do not support the samesite parameter. Fixes #3009
2020-08-08 09:58:18 -04:00
c0ab8bf90d
Merge branch 'master' into zma_to_thread
2020-08-07 17:53:32 -04:00
5fb56c9f57
Merge branch 'master' into zma_to_thread
2020-08-07 17:52:43 -04:00
da757d075b
Only save the DiskSpace on completed events. Fixes #3007
2020-08-07 09:53:35 -04:00
eff96c5fa3
Only save the DiskSpace on completed events. Fixes #3007
2020-08-07 09:53:15 -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
3242ce6ec9
Handle backticks in matches sort fields. Fixes regression in 1.34.17
2020-08-06 10:37:56 -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
97096d87f9
Add mx-2 classes to be consistent
2020-08-04 18:06:49 -04:00
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
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
e5513bc7a4
Add setting Name and Path
2020-08-04 17:35:16 -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
79c9671ef2
Use & instead of & in urls
2020-08-04 17:05:33 -04:00
c0f21ab55d
Fix globals
2020-08-04 16:36:24 -04:00
d7de4768d7
Fix use of is_callable
2020-08-04 16:36:04 -04:00
82542c569c
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-04 10:47:41 -04:00
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
a575b16278
set a target to about menu items
2020-08-03 15:45:27 -05:00
9d88f8ee73
implement zm about menu
2020-08-03 15:22:46 -05:00
ab9a135759
fix inability to stop zm from the web console
2020-08-03 12:10:34 -05:00
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
a3e6fe5522
make the eslint nanny happy
2020-08-03 11:47:31 -05:00
ce810320a2
bump right margin on storage widget
2020-08-03 11:02:30 -05:00
8a711245f6
fix previous corrupted commit
2020-08-03 10:49:45 -05:00
c1f37192b9
implement storage widget as dropdown
2020-08-03 10:43:24 -05:00
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
eb1d94345f
remove crud
2020-08-03 11:05:58 -04:00
9acbd9d1b2
fix typos prevent array based regexp from working. Fixes saving Storage
2020-08-03 11:05:16 -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
56bf181dc4
set SameSite on session cookie.
2020-08-03 10:55:54 -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
3351a4de56
fix eslint
2020-08-02 15:33:10 -05:00
0ecb1621ce
add colorized log icon to widget bar
2020-08-02 14:49:19 -05:00
a937e14899
put the optional banner in its own navbar
2020-08-02 13:48:15 -05:00
d6999f5628
iterate through keys in data
2020-08-02 13:33:25 -05:00
2b29a7983a
clean up navbar background refresh
2020-08-02 13:01:20 -05:00
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
cfa2d13948
set samesite=Strict in session cookie
2020-08-02 12:06:13 -04:00
037b696be0
Fix duplicate class attributes on navbar links
2020-08-02 12:05:52 -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
e768beaef2
fix whitespace
2020-08-01 16:20:51 -05:00
ad3b5a5aa3
call ob_start and ob_get_clean correctly
2020-08-01 16:16:23 -05:00
81c4bfa7c2
stop Chrome complaining about bootstrap.min.css.map
2020-08-01 12:22:47 -05:00
b746901ee7
close the dropmenu on any click
2020-08-01 10:57:13 -05: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
8b3917d707
reapply navbar reload logic
2020-08-01 09:07:21 -05:00
b6c0274b2c
implement collapsed navbar
2020-07-31 16:03:37 -05:00
cd96994a56
update getZMVersionHTML
2020-07-31 07:31:40 -05:00
366ce5b3eb
Add 100% width to LabelFormat
2020-07-30 19:36:27 -04:00
3df58fc9db
handle array args in daemonStatus
2020-07-30 19:36:05 -04:00
2699fa0313
force menubar to the top of the navbar
2020-07-30 16:56:38 -05:00
8bb30bb6d4
add framework for new navbar selection
2020-07-30 16:44:58 -05:00
561c44ece2
add runtimeStatus function
2020-07-30 16:14:41 -05:00
0a782814a7
Don't start filter if the command was execute
2020-07-30 17:13:30 -04:00
204086a56d
spacing and quotes
2020-07-30 17:12:00 -04:00
c2ac7ed4a9
spacing and escape sql fields
2020-07-30 17:07:43 -04:00
2cfa5fde98
Add missing view tempplates for zone add/edit. Fixes #2986
2020-07-30 16:54:00 -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
23596b142d
fix how we finish up getNavBarHTML
2020-07-30 11:55:54 -05:00
6a4ce29bce
eslint fixes
2020-07-30 12:15:05 -04:00
bf163beedb
Update permissions checking when viewing/editing users. Fixes #2982 . Also add a beforeFind that will remove the Password field from the query so that we don't return passwords
2020-07-30 11:03:24 -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
aa3b48e7c0
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-29 18:59:50 -04:00
5ac4677c02
Add missing view tempplates for zone add/edit. Fixes #2986
2020-07-29 18:59:44 -04: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
4bf7093ff1
align account circle with status button
2020-07-29 15:47:46 -05:00
c4d4a73c2a
json decoding errors shouldnt' be fatal
2020-07-29 16:41:37 -04:00
0139d06fcd
Fix data-on-input-this using onchange instead of oninput
2020-07-29 16:41:27 -04:00
1508b82754
Fix data-on-input-this using onchange instead of oninput
2020-07-29 16:40:57 -04:00
4c5a88a822
json decoding errors shouldnt' be fatal
2020-07-29 16:40:31 -04:00
1119923c38
Update functions.php
2020-07-29 15:26:07 -05:00
695da2221f
Update functions.php
2020-07-29 15:20:44 -05:00
4c242ef973
what a difference a single space makes
2020-07-29 15:09:47 -05:00
9f1901e413
fix typo
2020-07-29 14:42:06 -05:00
d285f2f998
adjust class name
2020-07-29 14:38:00 -05: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
a6005f0b0d
fix clor of options nav-pill active
2020-07-28 13:09:54 -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
853a5728f8
align navbar logo and run status vertically
2020-07-28 12:20:18 -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
85dec6194d
when maxmimize, rebuild jqeury chosen fields
2020-07-28 08:38:06 -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
5d883d696b
give a better error message when submitThisForm fails
2020-07-27 12:40:25 -04:00
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
cec5d7ea06
w-100 class not needed
2020-07-27 10:22:23 -05:00
ffa3415318
when collapsed, force the menu button to the right
2020-07-27 10:13:02 -05:00
bc19ae604a
fix alignment of top navbar
2020-07-27 09:18:02 -05:00
1e76679820
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-26 22:33:34 -04:00
5f9c62f266
spacing and slightly improve nav item code in options
2020-07-26 22:33:29 -04:00
31cbfc35b1
fix use of is_callable so that we fix filter saving
2020-07-26 22:32:55 -04:00
003abfea29
Update class so that Submit button is hidden under new bootstrap
2020-07-26 22:32:36 -04:00
941c074a8e
add carriage returns to generated html for readability
2020-07-26 10:50:32 -05:00
6486f59383
fix colorization of navbar widgets
2020-07-26 10:41:05 -05:00
eaed5abcd3
add missing bootstrap.bundle.js.map
2020-07-25 16:56:17 -05:00
3ec7952c31
apply cache_busting to bootstrap, overlay anda reset
2020-07-25 15:05:12 -04:00
c81e4a3bca
fix
2020-07-25 14:32:30 -04:00
99d7aa0da0
fix
2020-07-25 14:31:57 -04:00
4af343e833
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-25 14:28:32 -04:00
e3b339e72e
add missing globals
2020-07-25 14:28:26 -04:00
e90efa7a7e
spacing
2020-07-25 14:28:08 -04:00
4c8f96b786
Update saving action to use our ORM methods
2020-07-25 14:28:01 -04:00
dda630f522
fix filter_regexp to remove trailing /
2020-07-25 14:27:09 -04:00
522dfecebe
Fix setting values by checking is_callable. Remove debug. Fix filter_regexp
2020-07-25 14:26:49 -04:00
c48fa83c6d
upgrade to bootstrap 4.5
2020-07-25 13:18:09 -05:00
fe9db4cfa2
add filtering to Storage->Path()
2020-07-25 13:51:13 -04:00
a819b73e18
allow filter_regexp to be an array
2020-07-25 13:50:59 -04:00
bda7e1a2b7
minor cleanup of getNavBarHTML
2020-07-23 12:52:21 -05:00
e9323f96a5
additional cleanup of getNavBarHTML
2020-07-23 10:52:12 -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
7fd038d99b
spacing and quotes
2020-07-22 17:28:12 -04:00
062ae675c8
partial cleanup of getNavBarHTML
2020-07-22 13:12:59 -05:00
3641797500
Merge branch 'master' into zma_to_thread
2020-07-22 13:14:40 -04:00
d5dbebefe5
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2020-07-21 19:06:38 -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
a70b329ce3
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2020-07-20 18:40:59 -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
03195a8786
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-20 16:25:59 -04:00
d716d1d686
Merge branch 'release-1.34'
2020-07-20 16:25:41 -04:00
4e2633d22b
Update code to make calls to api on remote servers
2020-07-20 16:25:29 -04:00
e839919b5e
Add foreign key MonitorId validation
2020-07-20 16:25:08 -04:00
955fc00b87
Fix Zone add api. Restart zmc when adding a zone. Use validation. Fixes #2983
2020-07-20 16:24:49 -04:00
bbee6b4f58
Whitespace, delete dead code
2020-07-20 16:23:55 -04:00
cb0e54d3be
consider Monitor->Controllable as well in stopping zmtrack. Don't complain about ControlCommand being told to start/stop
2020-07-20 10:23:26 -04:00
135bbb4190
remove unneeded config loading, just use defines. Spacing, remove commented out dead code
2020-07-19 17:51:28 -04:00
1becd21df0
Update it_it.php
...
Italian translation updates
2020-07-19 00:01:14 +02: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
dcd67a1acf
Remove args with non-sensical values from cgi params as a micro-opt
2020-07-13 14:50:21 -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
209cbe1000
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-07 09:23:46 -04:00
dcab218a2e
remove global config item CREATE_ANALYSIS_IMAGES
2020-07-06 12:22:41 -05: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
697f117ecd
Make width of content 100% instead of 96%.
2020-07-02 17:22:34 -04:00
346fe63ef0
Add styles for inputs on monitor view
2020-06-30 19:19:17 -04:00
c47a348fea
Handle empty string version of scale
2020-06-30 19:18:45 -04:00
b060e0835c
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2020-06-25 16:07:22 -04:00
13130a844e
handle array args in daemonStatus
2020-06-25 16:07:16 -04:00
0a383c02c4
Better debugging of REQUEST/POST vars
2020-06-23 22:20:07 -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
f73cb3bebe
Don't start filter if the command was execute
2020-06-17 13:36:28 -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
8efe00157d
add a User object
2020-06-17 12:50:22 -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
a719565bf3
Merge branch 'master' into add_user_to_filters
2020-06-05 19:03:23 -04:00
198790796d
Merge branch 'release-1.34'
...
plus cleanups in dbConnect
2020-06-05 19:02:43 -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
910d4b51c9
Escape table names for mysql-8
2020-06-04 11:44:59 -04:00
8802447b10
Handle no DB_HOST specifed so default to localhost
2020-06-04 11:36:10 -04:00
ef3fc758cb
in getDiskPercent we have calls to Error without the ZM namespace. Fixes #2954
2020-06-04 11:34:48 -04:00
c4b2aa4a85
Handle no DB_HOST specifed so default to localhost
2020-06-04 11:34:16 -04:00
87078dfc31
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-06-03 17:41:09 -04:00
0644358d0a
in getDiskPercent we have calls to Error without the ZM namespace. Fixes #2954
2020-06-03 17:41:03 -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
d7680e1a44
Spacing
2020-05-23 10:15:48 -04:00
46a13237b5
fix eslint errors
2020-05-22 09:28:15 -04:00
23900cbf01
fix
2020-05-21 13:34:09 -04:00
59c08410c1
Put the size of SHM in the title of the shm space used element
2020-05-21 13:32:33 -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
c4c4c5bcbf
fix Crud submodule version
2020-05-15 11:34: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
88a910793c
Spacing
2020-05-13 08:06:55 -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
69e5feb28b
Add ONVIF* to Monitor object
2020-05-12 15:47:00 -04:00
c83621822f
Rename Config* to ONVIF_*
2020-05-12 15:46:07 -04:00
1f3cf266a2
Merge branch 'master' of github.com:zoneminder/ZoneMinder into onvif_updated_to_upstream
2020-05-12 11:20:49 -04:00
89939efc9b
Fixup my updates to the MetaConfig tab of monitor view
2020-05-12 11:15:29 -04:00
3f50277e1c
Revert effort to escape column names. Not smart enough.
2020-05-12 09:21:05 -04:00
eadff23465
Fix missing )
2020-05-12 09:16:37 -04:00
c5f082e7ac
fix escaping column names
2020-05-12 09:06:57 -04:00
92ba017328
Spacing
2020-05-11 09:19:33 -04:00
582102c2c6
Fix use of backticks for newer mysql
2020-05-11 09:19:16 -04:00
81cd338545
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-05-11 08:34:19 -04:00
d23258cb23
Allow for backticks in sort column
2020-05-11 08:34:07 -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
24c09a8207
Accept 0 as a value for scale meaning scale to fit
2020-05-08 17:55:12 -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
e01538419f
Add FilterUser to language
2020-05-07 10:59:50 -04:00
a9a490126a
Add UserId to Filter object
2020-05-07 10:59:32 -04:00
5a15701873
remove annoying ()
2020-05-05 18:07:28 -04:00
dadcea4884
remove recursive from index
2020-05-05 16:35:14 -04:00
0817ea3bfb
added association method to GroupsController to get Monitor Id/Name of monitors that belong to the group
2020-05-05 16:32:54 -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
683bf3f982
Handle no default set for array defaults. Fixes Warning when saving WebSite type Monitors
2020-05-01 15:32:54 -04:00
9dbeaa2c7b
Add default for Orientation. Fixes saving WebSite type monitors
2020-05-01 15:32:26 -04:00
1bd340d602
spacing in watch.php
2020-05-01 13:30:00 -04:00
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
82188c266e
Fixup Monitor->sendControlCommand. start/stop/quit should be run through zmdc.pl now instead of talking directly to zmcontrol.
2020-05-01 13:23:39 -04:00
45a445ac48
sync up index.php to master, where is a global
2020-05-01 13:21:02 -04:00
ad373a5549
add Zone.php from master
2020-05-01 13:20:42 -04:00
ebfae1f855
turn off debug
2020-05-01 13:17:39 -04:00
e960e638b3
Remove extra value='s from PTZ buttons. Fix remaining on-click-this on numbered presets
2020-05-01 13:07:29 -04:00
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
e29c426f04
Pass event object to data-on-click events
2020-05-01 13:04:55 -04:00
89245e0d46
Add auth relay information when auth_relay is something other than hashed.
2020-05-01 13:04:37 -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
62ddc02d52
quotes to match master
2020-05-01 13:01:34 -04:00
830929a85f
Remove extra value='s from PTZ buttons. Fix remaining on-click-this on numbered presets
2020-05-01 12:53:47 -04:00
0ed6cb7875
Remove extra value='s from PTZ buttons. Fix remaining on-click-this on numbered presets
2020-05-01 10:06:41 -04:00
8d8d37c648
fix eslint
2020-05-01 09:57:46 -04:00
1d618136c0
Merge branch 'master' into camera_control_preset_correction
2020-04-30 22:10:54 -06:00
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
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
9ec89f20d3
Add auth relay information when auth_relay is something other than hashed.
2020-04-29 16:33:41 -04:00
5e88181380
Pass event object to data-on-click events
2020-04-29 16:32:55 -04:00
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
cb44f2c5de
Fixup Monitor->sendControlCommand. start/stop/quit should be run through zmdc.pl now instead of talking directly to zmcontrol.
2020-04-29 16:30:59 -04:00
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
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
496fd6b15a
reorganize to reduce code depth
2020-04-23 18:17:20 -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
8be08d942a
Scale must be an integer value so use '0' instead of auto
2020-04-23 17:40:42 -04:00
9d42d0e2f0
silence warning when no language is set
2020-04-23 17:38:15 -04:00
b3a8ac0b2a
tidy up, be more efficient and warn when language files are not found.
2020-04-23 17:37:46 -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
ced36a5333
remove debug and spacing
2020-04-23 15:40:35 -04:00
96774bd038
fix inline javascript in ptz buttons
2020-04-23 15:39:31 -04:00
042086b565
Extend width of ControlDevice and Address to full width
2020-04-23 15:38:40 -04:00
617b74b8bb
fix botched merge
2020-04-23 15:28:38 -04:00
a7e49bd62a
update chinese translation (～￣▽￣)～
2020-04-23 15:27:06 -04:00
c0b7aad2c8
add passive to addEventListener
2020-04-23 15:23:53 -04:00
17896b656a
cleanup and revert adding Event stack trace
2020-04-23 15:23:11 -04:00
54995ab0d1
handle sort_asc not being set. Handle term['val'] not being set.
2020-04-23 15:18:05 -04:00
f06dc3f171
Update group save action, using Group object methods. Fixes errors on new MariaDB
2020-04-23 15:16:22 -04:00
b05916fc50
Use === when testing for empty value and setting defaults
2020-04-23 15:08:01 -04:00
eb26c5f798
Fix use of array_key_exists instead of property_exists
2020-04-23 15:07:28 -04:00
f5bf474ba6
filter bad characters out of Monitor Name
2020-04-23 14:59:21 -04:00
6f08322f7f
add ability to set a filter_regexp in the defaults for an object to have new values be altered before saving
2020-04-23 11:12:47 -04:00
daff14df9b
Allow users without System::View to read servers.json
2020-04-23 11:10:30 -04:00
9b77f77ac3
better logs
2020-04-23 11:09:39 -04:00
c3a80e7e40
Add MonitorId to event data returned for status request
2020-04-23 11:07:07 -04:00
59f9f37fff
cleanup. Don't output errors that break json response
2020-04-23 11:06:41 -04:00
e770be2e13
Merge branch 'release-1.34'
2020-04-23 10:26:16 -04:00
055c20c3cc
fix eslint
2020-04-23 10:23:46 -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
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
d0e83fcfcb
handle case where g-recaptcha-response is not in the request, due to failure to render the recaptcha
2020-04-21 09:19:29 -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
ac017a5c72
Add support for strftimes' %r when converting to moment.js formatting
2020-04-18 17:51:34 -04:00
3700b9fcbe
fix eslint
2020-04-17 11:04:07 -04:00
2194ed8b59
spacing in views/event.php
2020-04-17 09:46:10 -04:00
7d4e1fe895
Test for opening file before getting it's size. Remove some debug in view_video
2020-04-17 09:45:40 -04:00
b74d8d7487
Add support for strftimes' %r when converting to moment.js formatting
2020-04-17 09:44:07 -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
d99ec696b4
reorganize to reduce code depth
2020-04-10 12:21:53 -04:00
bdfdc2a20c
add ability to set a filter_regexp in the defaults for an object to have new values be altered before saving
2020-04-10 12:17:09 -04:00
81ed022d5a
Add a filter_regexp to Monitor Name
2020-04-10 12:16:32 -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
fe96ba0a2a
cleanup and revert adding Event stack trace
2020-04-10 11:14:46 -04:00
da94985508
add back global servers
2020-04-10 11:14:09 -04:00
2d748091a2
handle sort_asc not being set. Handle term['val'] not being set.
2020-04-10 11:13:30 -04:00
a25c3dfb5c
Add MonitorId to event data returned for status request
2020-04-10 11:11:24 -04:00
45c13176dc
cleanup. Don't output errors that break json response
2020-04-10 11:10:57 -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
dca12d8efa
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-04-09 20:41:44 -04:00
40d386fe6c
Handle Zones without monitor
2020-04-09 20:41:34 -04:00
c3ab03d3c8
update chinese translation (～￣▽￣)～
2020-04-09 15:30:43 +08:00
da8c265945
Update with updatelangs.php
2020-04-09 12:35:02 +08: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
ce4b30cc01
copy parseFilter into Filter::parse
2020-04-07 10:04:24 -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
210d380029
CSP must include all Servers.
2020-04-04 16:57:52 -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
f81cfc0513
add 1 month as an option to the version popup dropdown
2020-04-04 11:46:31 -04:00
2441ae2924
Improve event export a little bit. Add links to eventFrames and eventDetail html.
2020-04-03 15:34:20 -04:00
5d72e3b1b5
ensure no output buffering when downloading an archive.
2020-04-03 15:33:28 -04:00
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
4e58a38317
use ini_set(display_errors,0) instead of turning off errors entirely so that we still log errors, just not output them instead of json.
2020-04-03 15:21:31 -04:00
ef9fbac90c
Add Noscript warnings. Whitespace, improve some logic
2020-04-02 18:14:14 -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
3bfcd8eb33
Check for definition of ZM_TIMEZONE before using it. Fixes #2895
2020-04-02 14:00:36 -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
eec634c1b0
Add Source() support for VNC type
2020-03-30 10:10:06 -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
599960ef05
Update group save action, using Group object methods. Fixes errors on new MariaDB
2020-03-28 10:09:13 -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
c3bcdcff64
Use zm_session_start instead of session_start
2020-03-27 14:30:42 -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
50700031b1
Use zm_session_start instead of session_start
2020-03-27 13:05:12 -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
17fbafd7de
including the language files must come after auth in order to user the user's language setting
2020-03-27 11:41:04 -04:00
4ce944da23
Merge branch 'release-1.34'
2020-03-26 15:38:35 -04:00
3e55795cad
Handle different command line syntax for zmcontrol.pl
2020-03-26 13:57:43 -04:00
b354641df3
fix syntax errors in triggers in monitor view
2020-03-26 13:57:19 -04:00
af36cc3e52
Fix starting and stopping zmcontrol processes across servers.
2020-03-26 13:57:00 -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
b611e2616b
handle scale=auto
2020-03-24 16:15:24 -04:00
e06912a995
Merge branch 'release-1.34'
2020-03-21 15:28:27 -04:00
d3df0defc9
Support missing openssl_random_pseudo_bytes by using alternate functions
2020-03-21 15:28:18 -04:00
5a20ef959f
Merge branch 'release-1.34'
2020-03-20 11:07:46 -04:00
d7ea798c09
add modern stracktrace to log messages
2020-03-20 11:06:32 -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
d54b2e5b21
Merge pull request #2888 from pliablepixels/mp4objdetect
...
Mp4 animations for objdetect
2020-03-15 10:45:52 -04:00
921c4c5bbd
don't return mp4 if objdetect is used
2020-03-14 15:00:33 -04:00
4342506e5b
fix media type allocations
2020-03-14 14:24:39 -04:00
4d5f9f7de0
add back gif, make nomenclature consistent of objdetect_subtypes
2020-03-14 14:18:25 -04:00
f8fa0340fc
fix eslint
2020-03-14 09:27:07 -04:00
9a31d545d4
replace GIF function with MP4
2020-03-14 08:08:52 -04:00
4c984c3617
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-03-10 18:47:33 -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
49f23cb35b
Added options to render objdetect, objdetectanim and objdetectimage
2020-03-10 13:51:55 -04:00
0f741d0e1c
Merge pull request #2880 from pliablepixels/1.34-dev
...
Add ability for image.php to render gif images
2020-03-09 16:30:15 -04:00
38b519c8a6
better error log
2020-03-09 15:58:57 -04:00
6bc8012e04
add support to render gif image that may be created by object detection
2020-03-09 15:56:34 -04:00
561479dd93
Merge branch 'release-1.34'
2020-03-09 14:45:00 -04:00
5fe1452a1a
Merge pull request #2879 from pliablepixels/1.34-dev
...
return frame IDs of snapshot and alarm frames for a specific e…
2020-03-09 14:44:41 -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
a0bd602339
Use === when testing for empty value and setting defaults
2020-03-09 14:39:22 -04:00
a261efe0a7
return relative frameId, also sort score frame by lowest frame to avoid bulk frames incase score is 0
2020-03-09 12:04:40 -04:00
3611d147e6
fix score frameID to return ID not Score
2020-03-09 11:25:07 -04:00
c5e838fa33
return global frame IDs of snapshot and alarm frames for a specific event
2020-03-09 11:09:20 -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
f0791c8118
silence warning when no language is set
2020-03-05 22:13:32 -05:00
f003daa791
Merge branch 'add_enabled_to_storage'
2020-03-05 15:48:43 -05:00
d30480e31e
add passive to addEventListener
2020-03-05 14:10:35 -05:00
53f262a4cb
Merge pull request #2870 from pliablepixels/dev
...
#2866 - fixes incorrect token type comparison
2020-03-04 11:31:16 -05:00
d60e1a783f
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-03-04 11:22:15 -05:00
55f63e8e9d
Merge branch 'fix_auth_timeouts'
2020-03-04 11:22:08 -05:00
4dae0c4609
Merge pull request #2870 from pliablepixels/dev
...
#2866 - fixes incorrect token type comparison
2020-03-04 11:21:48 -05:00
a9e3d0691f
quotes, fix status ajax call using old auth_hash
2020-03-04 11:17:48 -05:00
8eee5cc222
Add global array so that we only do it once.
2020-03-04 11:03:30 -05:00
d24069e3d0
Look for global array so we don't load all Servers multiple times. Add all servers to allowed script-src in CSPHeaders
2020-03-04 11:03:07 -05:00
1381cb194e
#2866 - fixes incorrect token type comparison
2020-03-04 10:50:59 -05:00
9f696186a8
Increase height of storage popup for Enabled
2020-03-04 10:48:02 -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
0b267fbdee
Add Enabled to Storage
2020-03-04 10:46:16 -05:00
3a24f27a7a
include id in monitors dropdown so that it is searchable
2020-03-03 16:59:38 -05:00
fa6ac399be
Fix code in makePopupLink. Return content-type application/json for json response
2020-03-02 17:21:58 -05:00
d29b93216d
Allow users without System::View to read servers.json
2020-03-02 16:39:12 -05:00
85e5ade07a
fix makePopupLink when condition is false
2020-03-02 16:10:56 -05:00
bd59ae8856
Move the Basic Auth login code from skin.php to includes/auth.php
2020-03-02 15:00:31 -05:00
c1e13221f7
Move the Basic Auth login code from skin.php to includes/auth.php
2020-03-02 14:59:36 -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
7c21f065bd
Checking AuthHashGeneratedAt is no good because it gets updated before we check it. Instead check the auth hash in session against the one in and sensd the update if they are different
2020-03-02 12:07:11 -05:00
d0e70fc501
Merge branch 'fix_auth_timeouts' of github.com:connortechnology/ZoneMinder into fix_auth_timeouts
2020-03-02 12:04:45 -05:00
8f113ad030
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-03-02 11:55:08 -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
f0e7b84001
Only load user from session if other auth mechanisms aren't present.
2020-03-02 11:51:07 -05:00
5f16c10e0a
Checking AuthHashGeneratedAt is no good because it gets updated before we check it. Instead check the auth hash in session against the one in and sensd the update if they are different
2020-03-02 11:50:40 -05:00
54c14db863
better logs
2020-03-01 14:02:44 -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
6456d52b97
Merge branch 'fix_user_lang'
2020-02-27 17:43:51 -05:00
d371da7b4f
including the language files must come after auth in order to user the user's language setting
2020-02-27 17:42:02 -05:00
e19332f36a
tidy up, be more efficient and warn when language files are not found.
2020-02-27 17:40:31 -05:00
bab0b2e830
handle a scale value of auto
2020-02-27 11:35:40 -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
a34af39ca7
Fix logging line in generate video function
2020-02-25 18:14:14 -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
4d044a1f14
Fix logging line in generate video function
2020-02-25 18:11:07 -05:00
8fcd5b37ed
API on remote server requires RELAY not be none. Log an error. Fix url being ruined by auth credentials
2020-02-25 17:15:59 -05:00
7787ba1040
Fix adding auth string screwing up url to remote api in zmaControl and zmcControl
2020-02-25 17:15:45 -05:00
54a6dfff66
API on remote server requires RELAY not be none. Log an error. Fix url being ruined by auth credentials
2020-02-25 17:12:48 -05:00
bd097bf8ce
Fix adding auth string screwing up url to remote api in zmaControl and zmcControl
2020-02-25 17:00:16 -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
f719514998
remove debug
2020-02-25 13:39:33 -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
a2c5e4943a
Merge branch 'fix_scale'
2020-02-25 12:18:27 -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
4dda37a6ee
remove extra }
2020-02-25 12:13:12 -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
638e333702
Scale must be an integer value so use '0' instead of auto
2020-02-25 11:13:20 -05:00
d68d115581
Handle scale==0 to do width=100%.
2020-02-25 11:12:49 -05:00
583350ef06
Fix use of array_key_exists instead of property_exists
2020-02-25 11:09:12 -05:00
6cf448c74e
remove debug and spacing
2020-02-25 11:08:23 -05:00
cc7de97b6a
Merge branch 'release-1.34'
2020-02-24 14:39:50 -05:00
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
55c99c5ff3
Include filtered monitors for filter query on totals line of event counts. Fixes #2846
2020-02-24 14:34:21 -05:00
b389f9660d
Merge branch 'fix_class_PTZ_presets_almost_invisible'
2020-02-24 13:17:09 -05:00
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
d7f8f201be
Fix zoneminder.com url getting undefined being added to it
2020-02-22 10:51:26 -05:00
e640fc0c26
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-02-22 10:50:07 -05:00
63a3f2e453
Fix zoneminder.com url getting undefined being added to it
2020-02-22 10:50:00 -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
d51fdafbc0
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-02-21 09:37:45 -05:00
7645196bdc
Extend width of ControlDevice and Address to full width
2020-02-21 09:30:31 -05:00
1a87eb40bd
Fixes #2841 and maintains login through password change
2020-02-19 16:55:38 -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
a8615c1c85
fixed bug in control functions where left arrow panStep was inverted
2020-02-16 11:41:14 +13: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
600dbba8c5
We don't need to set date_default_timezone_get
2020-02-11 13:23:53 -05:00
821355c117
Only set date.timezone if we have a configured value in the Config
2020-02-11 13:21:28 -05:00
137bdb1f24
Make shm have error or warning class if full
2020-02-10 14:20:46 -05:00
389a6b3ec8
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-02-06 13:22:30 -05:00
c465fa55d8
Use ZM_PATH_FFMPEG instead of ffmpeg
2020-02-06 13:22:22 -05:00
1cbc75813c
improve the output of the ajaxError to say what the action was and who the user was
2020-02-06 13:21:57 -05:00
dd0ce50c17
quotes and improve the output of the ajaxError to say what the action was and who the user was
2020-02-06 13:21:30 -05:00
e8a0ed9208
quotes and improve the output of the ajaxError to say what the action was and who the user was
2020-02-06 13:20:35 -05:00
1c2f2657d2
We don't do automatic login when recaptcha is enabled, so add the login calls on successful recaptcha
2020-02-04 16:41:19 -05:00
42b3bb6a53
increase width of google sitekey and secret key inputs to 100%
2020-02-04 16:40:52 -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
df5bf788d9
Filtering by Alarmed Zone now only supports a single value using EXISTS as the operator. We now also support CURDATE() and NOW() as values for Date/StartDate/EndDate
2020-01-24 11:09:27 -05:00
29a04dc1b9
Merge branch 'improve_filter_emails' into add_alarmed_zone_to_filters
2020-01-24 09:50:53 -05:00
adf376e4a6
add Zone.php
2020-01-24 09:45:02 -05:00
6345ecc479
remove debug
2020-01-23 17:04:33 -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
8aa0fe665f
Add EmailTo,EmailSubjecet,EmailBody fields to Filter object
2020-01-22 14:04:42 -05:00
f4b5f5f399
style the new Email content fields
2020-01-22 14:04:23 -05:00
dac76e0328
add language subs for FilterEmailTo, FilterEmailSubject, FilterEmailBody
2020-01-22 13:59:12 -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
75fa1d693d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-01-18 16:09:44 -05:00
a3754709e4
allow filters to not have terms specified. We can't pass an empty array in a url, so we will just have to handle it.
2020-01-18 16:09:33 -05:00
6c7f003198
revert bogus change not including skin.js
2020-01-18 16:08:55 -05:00
de5bf21d8a
fix eslint
2020-01-17 15:06:46 -06:00
5b8e5eb349
don't output duplicated js when css=base
2020-01-17 14:51:02 -05:00
d0003215b1
Merge branch 'master' into rate_dropdown
2020-01-17 12:30:35 -05:00
86a2523498
break up a long line, add some parenthesis to clarify logic
2020-01-17 12:30:26 -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
028e7e8dde
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-01-15 19:03:11 -05:00
09f2298838
return empty array instead of nothing in probeNetwork
2020-01-15 19:02:40 -05:00
8b375de455
Avoid duplicate Monitors in API
2020-01-15 20:31:05 +01:00
02e9096d2b
When saving an existing Filter and we are unchecking Background, need to stop the filter before saving. Remove dead code
2020-01-13 17:32:57 -05:00
e4ba1fd432
fix restarting zmcontrol on remote servers by passing object=filter as well
2020-01-13 17:16:15 -05:00
d7dc7cdc47
Add ServerId to database log entries in php
2020-01-13 16:18:01 -05:00
9036b6db77
fix typo
2020-01-13 16:17:39 -05:00
f3a9e608db
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-01-13 16:11:19 -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
6cd76ee2ff
Clear cache after loading Events so as to free ram.
2020-01-13 12:53:05 -05:00
f7e2359818
Implement a clear_cache function so that we can free up cached objects
2020-01-13 10:57:56 -05:00
398688550b
fixtypo
2020-01-10 20:15:52 -05:00
fabb7180d6
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-01-10 20:13:28 -05:00
0c478c7962
fix Monitor->Server
2020-01-10 20:13:09 -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
2f5caf2bb5
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-01-10 17:21:10 -05:00
5ee0158735
Set defaults for vars == ''
2020-01-10 16:42:41 -05:00
f61f6eaf7d
remove line cutnpasted erroneously
2020-01-10 12:45:47 -05:00
d433590f74
use find_one in stead of new to use Cached Server
2020-01-10 12:45:30 -05:00
ef4ecd40fb
Set defaults before saving Objects
2020-01-10 12:44:59 -05:00
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
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
0571909d05
add remote_IP to log entries on php side
2020-01-07 17:08:29 -05:00
1865df3fe0
remove some debug, add some parenthesis to ensure logic works as intended
2020-01-07 17:08:07 -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
2f1b725ee4
quote SQL for mysql8
2020-01-07 11:01:02 -05:00
7535769e4b
controlcap needs to be larger
2020-01-05 17:34:40 -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
Isaac Connor
Andrew Bauer
Andrew Bauer
Isaac Connor
Andrew Bauer
Andrea Vezzali
Romain ODDONE
Romain ODDONE
Isaac Connor
Pliable Pixels
Dvanderploeg
David van der Ploeg
out
outline
Isaac Connor
hax0kartik
zlodag
Garrett Scott
Javier Gonzalez
PrplHaz4
Alex Porosanu