54f821ac88
Upgrade jquery to 3.6.1
2022-10-04 10:06:40 -04:00
2139a0cf24
Make form on console use post
2022-10-03 16:15:17 -04:00
6d786e0690
save buttion is a submit button now, so doesn't need an onclick. Fix code setting action on delete.
2022-10-03 15:51:09 -04:00
9b8e48e480
Switch to post instead of get in the groups form because we only do actions on post now.
2022-10-03 15:50:16 -04:00
c0a4c05e84
Only perform actions on post. Doing them on GET allows doing actions from things like img tags which is not good.
2022-10-03 15:49:48 -04:00
96b428edb5
Fix group modal. Use post instead of get, properly populate the save submit button
2022-10-03 15:48:05 -04:00
0ab074eb88
Change colour of indicator to yellow to be more prominent. Add last 24hour events button.
2022-09-30 09:58:24 -04:00
d289eb4860
File must be escaped as well to prevent XSS
2022-09-30 09:57:35 -04:00
2f295a2f55
Make Monitor::Server always return a Server object so we don't have to test for null
2022-09-30 09:57:21 -04:00
caedd94f69
add 24hour button
...
put archive status filter on same line as buttons
2022-09-29 17:16:57 -04:00
3b47f2fc9c
Fix export not working for filter due to limit set to 0.
2022-09-29 14:36:36 -04:00
340ed19c71
Handle filter[query] not being defined
2022-09-29 14:29:36 -04:00
e4fad02b43
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-09-28 18:37:20 -04:00
8d56949800
Deal with structure of json response from API when getting Janus_Pin
2022-09-28 18:36:47 -04:00
9fc0d26d32
If we don't have session, we can still generate an auth hash. We kinda need this for zmu calls from API
2022-09-28 18:35:59 -04:00
460695202f
Add Janus_Pin to monitor API
2022-09-28 18:35:30 -04:00
59db9c2d90
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-09-28 17:42:16 -04:00
f5bdbcf0bd
Use new Server::SendToApi to reduce duplicated code. If Janus Not enabled, then don't both with Janus_Pin. If Server is remote, use API to get Janus_Pin. Implementing the API side is left as an exercise.
2022-09-28 17:41:46 -04:00
2a9576371b
Introduce Server::SendToApi to reduce duplicated code.
2022-09-28 17:40:08 -04:00
fe0e4fcb8f
handle lack of sysvsem support in php better. Turn errors back on, just don't display them. Proceed regardless of semaphore success but log an error.
2022-09-28 14:48:13 -04:00
c7ded07794
Only look for action if there is a view
2022-09-27 10:49:50 -04:00
23ae004724
whoops fixed errant enum values I forgot to delete
2022-09-25 17:46:53 -04:00
6218d065a5
make OutputCodec work in API
2022-09-25 12:41:07 -04:00
0b37df3782
Fix scroll to top on option help modals by not having an href=#. Fix css so that the ? still is blue.
2022-09-23 09:34:29 -04:00
63e4c81d9c
Try out just using connkey as the semaphore key instead of ftok
2022-09-22 16:22:36 -04:00
8a6db4a5e7
convert event->Id() explicitly to a string for strpos.
2022-09-22 16:21:25 -04:00
faa6b8c9e7
Add connkey and semaphore key to logging about failure to get semaphore. Add sem_release before every ajaxError call because ajaxError exits and so we never release the semaphore.
2022-09-22 11:30:59 -04:00
cb6dd816d8
streamSrc is no longer used and is making php complain
2022-09-21 15:46:42 -04:00
5fef98ce6f
Add types to buttons. Make save a submit button, and remove the javascript onclick event.
2022-09-21 15:37:47 -04:00
9338732bd3
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-09-21 14:36:05 -04:00
363c589975
More properly fix the alarm status api changing. The previous hack broken doing alarm on/off.
2022-09-21 14:35:27 -04:00
f68c64ea30
Last and next buttons don't get disabled if the event record thinks it has more frames than are actually in the db.
2022-09-21 13:24:18 -04:00
6d1b341141
Add a.btn-primary.disabled to disabled buttons style so that frame view buttons look right
2022-09-21 13:23:49 -04:00
1072a8aa69
When scaling frame images, apparently a float value for height is no good. So use intval to fix.
2022-09-21 13:23:16 -04:00
9d6d5a242f
fix monitorIds => MonitorIds
2022-09-21 12:32:15 -04:00
78ab6583e7
Fix typo causing broken link to monitor in event stats
2022-09-21 12:32:15 -04:00
c3c897cd76
In failure state populate imageData array to reduce output php errors
2022-09-21 12:32:14 -04:00
86f27d2ac5
Update frame view js to use const etc instead of var. Put back EventId and FrameId in stats being links and fix FrameId not being populated. If no stats available disable the stats button and use the title to explain why.
2022-09-21 12:32:14 -04:00
291c43ec0f
Add spans and titles over the title h2 parts so that on mouseover it tells you what they are
2022-09-21 12:32:14 -04:00
8fb6477820
Case insensitive login - Fix spacing ZoneMinder/zoneminder#3516
2022-09-21 16:47:16 +01:00
abc5ea26d8
Merge branch 'master' into add_janus_rtsp_user
2022-09-18 12:44:25 -04:00
a36a28d4b5
Merge pull request #3591 from VikingGer/patch-4
...
Update MonitorLinkExpression.js
2022-09-17 14:53:31 -04:00
ec16937939
Merge pull request #3592 from VikingGer/patch-5
...
Update event.js
2022-09-17 10:23:24 -04:00
3843b9e14f
Merge pull request #3593 from VikingGer/patch-6
...
Update report.php
2022-09-17 10:22:33 -04:00
ac55a9e0f2
Update reports.js
...
Function name missing? Assumed to be correct according to the rest.
2022-09-17 10:28:10 +02:00
a099a4e3ae
Update report.php
...
Again Eslint errors
2022-09-17 10:19:42 +02:00
851ddb7f06
Update event.js
...
Again Eslint errors
2022-09-17 10:14:00 +02:00
11a4735082
Update MonitorLinkExpression.js
...
Trailing spaces lead to eslint error. Removed them
2022-09-17 10:08:07 +02:00
7d9771e41c
Merge branch 'master' into add_janus_rtsp_user
2022-09-16 18:33:52 -04:00
c43b3d1aef
Update control_functions.php
...
The Reboot button was not shown without activating another one. Probably not intended so I did this micro adjustment
2022-09-16 14:21:15 +02:00
c197644b96
Fix contents of values on LOCALE_DEFAULT.
2022-09-15 14:05:33 -04:00
62b6171934
Only try to set TIMEZONE when loading dateTimeFormatter if it is set. Handle the exception when any of TIMEZONE or LOCALE are invalid.
2022-09-15 14:04:31 -04:00
bf2b6ca145
Specify that only main page content tables should have the first colunm be min-width: 300px. This was affecting the logout dialog table content.
2022-09-15 14:03:22 -04:00
d1cd7d3f91
Merge branch 'master' into add_janus_rtsp_user
2022-09-14 18:34:07 -04:00
a944a1fac7
Fix no video due to height:auto on videojs
2022-09-14 13:31:25 -04:00
bc566ccfdf
Remove debugging
2022-09-14 13:15:02 -04:00
46de7afb0f
Add fade to the logout modal which for some reason fixes it not showing after a hide
2022-09-14 13:09:51 -04:00
715122e93a
Spacing, ignore auth_relay, clean up clickLogout a bit
2022-09-14 13:09:38 -04:00
419a44f8ed
Merge branch 'iiot'
2022-09-13 18:23:44 -04:00
b4fc5abe95
Failure to auth by hash is common, the end result is a redirect to login page. Change the log level to INF
2022-09-13 17:59:53 -04:00
4624a53a90
Show time segments in progress bar. Fix alarm cues.
2022-09-13 17:58:30 -04:00
ea1970418e
don't let position go negative in onclick progressbar
2022-09-12 16:05:53 -04:00
f3e04ca212
shorten and move up the indicator
2022-09-12 16:05:30 -04:00
fd52e73268
Add time ticks to progressbar with a mouseover highlight
2022-09-12 13:44:18 -04:00
e2bd72b6a0
Fix eslint
2022-09-12 13:44:18 -04:00
8fc60fef12
Moved case-insensitive username checks to SQL
2022-09-12 13:44:18 -04:00
143a00cccc
Fix typo
2022-09-12 13:44:18 -04:00
c90e2f7898
Renamed ZM_AUTH_CASE_INSENSITIVE_USERNAMES to ZM_CASE_INSENSITIVE_USERNAMES as name was too long ZoneMinder/zoneminder#3516
2022-09-12 13:44:18 -04:00
e9ab7f2f26
Added option ZM_AUTH_CASE_INSENSITIVE_USERNAMES to match mixed case usernames to lower case usernames in database ZoneMinder/zoneminder#3516
2022-09-12 13:44:18 -04:00
c22007e8ee
Allow viewing a specific video file instead of DefaultVideo
2022-09-12 13:44:18 -04:00
60d01376c5
clean up, give generation options even if viewing. Fix viewing. Add transform option.
2022-09-12 13:44:18 -04:00
d3e3807263
setup video.js on the video tag if it exists
2022-09-12 13:44:18 -04:00
fdbe950640
include video.js for video view as well as event
2022-09-12 13:44:18 -04:00
8676609425
Center video obj
2022-09-12 13:44:18 -04:00
dbcf320808
For mp4, use video tag, with videojs instead of embed
2022-09-12 13:44:18 -04:00
37dac7d3a6
Add transform support and use Event::createVideo
2022-09-12 13:44:18 -04:00
4d2f956827
Move createVideo from functions to Event
2022-09-12 13:44:18 -04:00
f9fddcb6ee
format filesize into human_readable in generate video view
2022-09-12 13:44:18 -04:00
6452f8127a
Convert password fields to hidden fields on submit so that browser doesn't offer to remember passwords
2022-09-12 13:44:18 -04:00
eb9ac11d21
fix updating donation reminder. I would always be a month or more
2022-09-12 13:44:18 -04:00
1fe3d52c96
remove extra spacing, move dropdown option own to where they are used
2022-09-12 13:44:18 -04:00
813434e0f4
Fix saving monitor due to MQTT being empty
2022-09-12 13:44:18 -04:00
e088e88e13
Make monitor rows in event stats a link if user can view monitors. Include path to event.
2022-09-12 13:44:18 -04:00
ce4dd065ff
Use y instead of Y for path generation when using Deep scheme. Fixes #3583
2022-09-12 13:44:18 -04:00
d079439005
Merge branch 'reports' of http://github.com/ConnorTechnology/zoneminder into reports
2022-09-12 19:40:27 +02:00
363c424117
fix every monitor getting the same Janus_Pin
2022-09-12 12:56:46 -04:00
d32fe1cf55
Add Janus_RTSP_User and related UI code
2022-09-12 10:34:26 -04:00
d9c0e1dd8f
Move RTSPServer options to under Viewing
2022-09-09 11:37:19 -04:00
c306722a4e
Adjust styles on ONVIF tab so that Username and Password are shorter and there is room for the reveal password icon
2022-09-09 11:35:50 -04:00
8ba1bbc63c
Set new defaults: Only analysis jpegs, and passthrough on. Label Size => Default. Fix warnings when creating a new MOnitor because Path, User, Pass are unset.
2022-09-09 11:29:32 -04:00
11c2cc1829
Change first entry of Storage Areas to say Unspecified instead of Default.
2022-09-09 09:35:12 -04:00
9276ae7d67
calling trim on null is deprecated
2022-09-08 15:11:53 -04:00
0e2e1903c1
Only init the boostrap events table if we can view Events.
2022-09-08 15:11:39 -04:00
834dc3c986
Restore status value to pre 1.36.16 value by substracting 1. So Unknown == -1, 0 = IDLE etc. Fixes #3584
2022-09-08 13:01:45 -04:00
c35bbc8c30
Adds the Janus_pin to shared_memory, and a -j to zmu to fetch it
2022-09-07 15:49:47 -05:00
7398fd97d7
Fix eslint
2022-09-07 09:35:03 -04:00
8aaa5e52b3
Merge pull request #3582 from megasaturnv/3516-CaseInsensitiveLogin
...
Issue #3516 case insensitive login
2022-09-06 16:39:53 -04:00
bb8b11a2a1
Allow viewing a specific video file instead of DefaultVideo
2022-09-06 15:44:41 -04:00
11bfdebc72
clean up, give generation options even if viewing. Fix viewing. Add transform option.
2022-09-06 15:44:09 -04:00
dbf92147d7
setup video.js on the video tag if it exists
2022-09-06 15:42:49 -04:00
82fb209e7f
include video.js for video view as well as event
2022-09-06 15:42:11 -04:00
f98f5648d9
Center video obj
2022-09-06 15:41:55 -04:00
7059e5a1ea
For mp4, use video tag, with videojs instead of embed
2022-09-06 15:41:42 -04:00
4c40ef8cfb
Add transform support and use Event::createVideo
2022-09-06 13:46:54 -04:00
3079438038
Move createVideo from functions to Event
2022-09-06 13:46:41 -04:00
c4b895045b
format filesize into human_readable in generate video view
2022-09-06 11:41:53 -04:00
e6c8081fb6
Convert password fields to hidden fields on submit so that browser doesn't offer to remember passwords
2022-09-06 11:22:47 -04:00
70073719e4
use ajax() instead of getJSON so that we can specify no timeout. This prevents log queries from stacking up overloading the db
2022-09-06 11:22:47 -04:00
ce2aea9615
fix updating donation reminder. I would always be a month or more
2022-09-06 11:22:47 -04:00
d9babda8ad
remove extra spacing, move dropdown option own to where they are used
2022-09-06 11:22:47 -04:00
1f20b18100
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-09-06 11:22:28 -04:00
d76c425057
Fix saving monitor due to MQTT being empty
2022-09-06 11:22:04 -04:00
6c4fb3e2cd
Moved case-insensitive username checks to SQL
2022-09-05 15:43:53 +01:00
d80026cab1
Fix typo
2022-09-05 15:29:23 +01:00
85278293c2
Make monitor rows in event stats a link if user can view monitors. Include path to event.
2022-09-04 13:54:18 -04:00
b611a4fc08
Use y instead of Y for path generation when using Deep scheme. Fixes #3583
2022-09-04 13:53:19 -04:00
6c0f40f570
Renamed ZM_AUTH_CASE_INSENSITIVE_USERNAMES to ZM_CASE_INSENSITIVE_USERNAMES as name was too long ZoneMinder/zoneminder#3516
2022-09-02 12:03:47 +01:00
63e5b63eec
Added option ZM_AUTH_CASE_INSENSITIVE_USERNAMES to match mixed case usernames to lower case usernames in database ZoneMinder/zoneminder#3516
2022-09-02 11:58:02 +01:00
87e251561d
Hide fieldset borders on filter edit. They look weird because the top one is hidden
2022-09-01 07:09:36 -04:00
0378023a11
Fix colours on hr to match button blue.
2022-09-01 07:09:27 -04:00
4c90bd0ac6
Add a title to the zone polygon
2022-09-01 07:08:39 -04:00
6c8819977e
Cache Group Monitors Ids so we don't query the database multiple times for them.
2022-09-01 07:08:04 -04:00
980e49b547
Don't query for Monitors if there are no Monitors in the Group.
2022-09-01 07:07:55 -04:00
3d1a9c5b2d
Add LIMIT 1 when filtering by AlarmZoneId to speed up
2022-09-01 07:06:46 -04:00
606fb108d5
Fix use of filter instead of this
2022-09-01 07:06:10 -04:00
3115952782
Check for key existing instead of value to fix duplication of the first label dataset
2022-08-31 23:39:33 +02:00
148460630b
use ajax() instead of getJSON so that we can specify no timeout. This prevents log queries from stacking up overloading the db
2022-08-31 23:38:50 +02:00
ee4302f2cf
Hide fieldset borders on filter edit. They look weird because the top one is hidden
2022-08-31 23:37:32 +02:00
45e916573b
Fix colours on hr to match button blue.
2022-08-31 23:09:43 +02:00
4eeb49d09a
Merge branch 'master' into reports
2022-08-31 18:38:08 +02:00
1038e2d069
Cache Group Monitors Ids so we don't query the database multiple times for them.
2022-08-31 18:36:57 +02:00
382b586986
Fix typo on dateTimeFormater=>dateTimeFormatter. Fixes #3580 . Make conversion to integer on Length explicit to remove warning on php8.
2022-08-31 10:08:30 -04:00
683acbbc1d
Clear Manufacturer and Model so that they don't list as changes
2022-08-31 10:05:52 -04:00
b571c81887
Turn off autocomplete on the monitor form so that browsers don't offer to save the values
2022-08-30 17:42:35 -04:00
62a8b72dc4
Fix add monitorlink to not prepend a | onto and empty expr
2022-08-30 20:03:55 +02:00
de30ad97b1
add report.js
2022-08-30 19:40:35 +02:00
e24432ee4d
Merge branch 'master' into reports
2022-08-30 19:40:14 +02:00
442f2a95b3
improve dataset labels
2022-08-30 19:37:38 +02:00
3005ddff49
Still parse even if no tokens
2022-08-30 19:36:43 +02:00
85c59970a6
Add a title to the zone polygon
2022-08-30 19:36:07 +02:00
4668534bf9
Don't query for Monitors if there are no Monitors in the Group.
2022-08-30 19:35:47 +02:00
54f87aa4cf
Add LIMIT 1 when filtering by AlarmZoneId to speed up
2022-08-30 19:34:51 +02:00
d6fea1c740
Don't specify return type as old php doesn't support it. maybe Fixes #3579
2022-08-30 10:40:00 -04:00
f9f53dd0d2
When there are less than 3 storage areas, just list them in the header instead of making it a dropdown
2022-08-29 14:12:45 -04:00
d465966069
Add a back to frames button from view
2022-08-26 14:33:46 -04:00
48377334fe
Gracefully handle when FrameRate is empty
2022-08-26 14:12:51 -04:00
855dd6ac93
Use HTTP_X_FORWARDED_HOST or HTTP_X_FORWARDED_SERVER if present to get correct hostname to use when behind a reverse proxy.
2022-08-26 14:12:25 -04:00
3c2db0d53d
Remove boot strap class styling and re-implement it in css so as to use semantic html
2022-08-26 09:33:41 -04:00
d4c817328c
Drop severity of log looking for @ because auth gets removed from Path
2022-08-26 09:32:23 -04:00
1609051cd2
Add id's so that we can toggle password inputs by id and not use jquery
2022-08-25 20:31:34 -04:00
fa39983b69
Merge branch 'master' into add_mqtt
2022-08-25 18:41:59 -04:00
29750a56e7
Merge branch 'master' into add_mqtt
2022-08-25 18:37:54 -04:00
2a90aaf02b
Merge pull request #3576 from Garkus98/patch-1
...
update Russian
2022-08-25 18:29:34 -04:00
58df355903
Make password fields be passwords fields with a visibility toggle
2022-08-24 20:29:51 -04:00
2ee9c0a9d5
Add toggle_password_visibility function
2022-08-24 20:29:27 -04:00
3dac07fcfa
Make ONVIF_URL be longer so that the flex container has some width
2022-08-24 20:29:08 -04:00
f18c80efa9
update Russian
...
full translate Russian
2022-08-23 18:34:57 +03:00
6ae05d7009
Rework to not use strlen and strlen now complains if you pass it null
2022-08-22 11:46:57 -04:00
1b48f9dc5a
log error if Date.parse fails to figure out why
2022-08-22 11:24:30 -04:00
e7e811df39
Fix eslint
2022-08-22 11:24:05 -04:00
cf29f4b0a4
Selecting any of the monitor filters causes a reload with no mid specified. So don't log an error if no mid was specified.
2022-08-22 10:37:16 -04:00
d51a2eb8a5
Merge pull request #3537 from parvit/issue-695
...
Added configuring of authentication for rstp cameras
2022-08-21 18:08:00 -04:00
5bf1d92956
SCALE_BASE is const now in skin.js.php
2022-08-19 13:33:22 -04:00
c36a8a28fe
Fix eslint
2022-08-19 13:33:22 -04:00
9287d06ced
currentTimeSecs is already calculated, so use it instead of parsing string version
2022-08-19 13:33:22 -04:00
4ee998b350
If current time is specified, calculate minTime and maxTime from it.
2022-08-19 13:33:22 -04:00
f1c92d9729
Implement binary search functions for finding event based on time.
2022-08-19 13:33:22 -04:00
bb810e3d8d
Make a.btn the same line-height as button.btn
2022-08-19 13:33:22 -04:00
28731e549d
Add a button to jump this event time in montage review
2022-08-19 13:33:22 -04:00
0681a199c3
Update material icons to v1.11.10
2022-08-19 13:33:22 -04:00
8b73e3311d
SCALE BASE is already deifned
2022-08-19 13:33:22 -04:00
3feb089740
Clear out width=auto and height=auto to prevent warnings in logs
2022-08-19 13:33:22 -04:00
4ec1187056
Remove SCALE_BASE as it is defined globally already
2022-08-19 13:33:22 -04:00
e42fd15e44
Use const instead of var to flush out duplicates for things that shouldn't change in javascript land
2022-08-19 13:33:22 -04:00
a0008a6a6c
Set auto_relay as well as auth_hash. getNavBar uses it
2022-08-19 13:33:22 -04:00
394e518722
Remove debug
2022-08-19 13:33:22 -04:00
b17ce950a9
Quote and spacing
2022-08-19 13:33:22 -04:00
f202e82b78
Remove no longer used code to protect percentage widths
2022-08-19 13:33:22 -04:00
71024dabb1
Don't setScale after layout, just do setSteamScale because setScale will alter widths and heights
2022-08-19 13:33:22 -04:00
331e3f483a
Handle width=100% and remove code that worked around montage layouts with width=%.
2022-08-19 13:33:22 -04:00
fcccf33cf6
Don't call format on an empty string and only pass the integer part of it
2022-08-19 13:33:22 -04:00
11bfc74cff
Log entire backtrace when invalid value for width
2022-08-19 13:33:22 -04:00
38b37ff39b
Fix deprecation warning due to implicit conversion to integer. Make it explicit.
2022-08-19 13:33:22 -04:00
4514ceddd5
Rework code to be smaller. Don't require SystemView permission to post a log entry. Default to ERR if invalid err code provided instead of PANIC so that the log entry still gets saved
2022-08-19 13:33:22 -04:00
e55dfe4d4c
Fix typo in field name
2022-08-19 13:33:22 -04:00
3c38f5d3f9
Test for existence of monitors[i] before trying to kill it just to reduce javascript errors
2022-08-19 13:33:22 -04:00
4b5db75d90
Properly hide Janus options when Janus is disabled for a given monitor.
2022-08-19 13:33:22 -04:00
71c5339c2b
Adds Janus options Profile-ID Override and Use RTSP Restream to work around camera issues
2022-08-19 13:33:22 -04:00
18152f82a2
Fix eslint
2022-08-19 13:33:22 -04:00
a5e730ff01
Ignore errors decoding log message
2022-08-19 13:33:22 -04:00
336e65761b
Modify config.php.in
...
Modifies config.php to use ZM_TIMEZONE if defined by user
2022-08-19 13:33:22 -04:00
512509af15
Setting padding to 0 for ptz buttons
2022-08-19 13:33:22 -04:00
8b4472b753
Don't use array_keys_first as it doesn't exist in php < 7.3.
2022-08-19 13:33:22 -04:00
0d2be2683d
Set button padding to 0 for ptz buttons
2022-08-19 13:33:22 -04:00
e2ebccc9aa
fix eslint
2022-08-19 13:33:20 -04:00
f8af46b92a
SCALE_BASE is const now in skin.js.php
2022-08-19 08:56:03 -04:00
5563d312dc
Fix eslint
2022-08-18 12:22:14 -04:00
59c2edfb0a
currentTimeSecs is already calculated, so use it instead of parsing string version
2022-08-18 10:38:59 -04:00
27ac7a585c
If current time is specified, calculate minTime and maxTime from it.
2022-08-18 10:37:17 -04:00
ff8d549732
Implement binary search functions for finding event based on time.
2022-08-18 10:36:48 -04:00
94e622def3
Make a.btn the same line-height as button.btn
2022-08-18 10:36:07 -04:00
86a4e967a2
Add a button to jump this event time in montage review
2022-08-18 10:35:47 -04:00
a31e09f234
Update material icons to v1.11.10
2022-08-18 10:25:32 -04:00
9a10568a5d
SCALE BASE is already deifned
2022-08-18 09:54:27 -04:00
442d7b1c89
integrated dynamic client and server update of path, user and password values
2022-08-18 05:05:18 -04:00
4bd7fc8fcf
Clear out width=auto and height=auto to prevent warnings in logs
2022-08-17 15:34:39 -04:00
8eab9bc518
Remove SCALE_BASE as it is defined globally already
2022-08-17 15:01:04 -04:00
1362207a21
Use const instead of var to flush out duplicates for things that shouldn't change in javascript land
2022-08-17 15:00:42 -04:00
84f14a03b0
Set auto_relay as well as auth_hash. getNavBar uses it
2022-08-17 15:00:01 -04:00
9501da8a41
Remove debug
2022-08-15 17:59:25 -04:00
a41cba5c33
Quote and spacing
2022-08-15 17:59:17 -04:00
071147fba7
Remove no longer used code to protect percentage widths
2022-08-15 13:04:50 -04:00
baa45bff4b
Don't setScale after layout, just do setSteamScale because setScale will alter widths and heights
2022-08-15 13:02:55 -04:00
de5b8bd893
Handle width=100% and remove code that worked around montage layouts with width=%.
2022-08-15 13:01:49 -04:00
6c2291bd22
Merge branch 'master' into issue-695
2022-08-14 12:10:34 -04:00
852b67bf21
Don't call format on an empty string and only pass the integer part of it
2022-08-10 17:58:11 -04:00
0078a6f639
Log entire backtrace when invalid value for width
2022-08-10 09:18:39 -04:00
e10c1e8d65
Fix deprecation warning due to implicit conversion to integer. Make it explicit.
2022-08-10 09:18:39 -04:00
c18a5e422a
Rework code to be smaller. Don't require SystemView permission to post a log entry. Default to ERR if invalid err code provided instead of PANIC so that the log entry still gets saved
2022-08-10 09:18:39 -04:00
702df653f9
Fix typo in field name
2022-08-10 03:59:18 -05:00
f5a6a0a5d9
Test for existence of monitors[i] before trying to kill it just to reduce javascript errors
2022-08-09 18:52:35 -04:00
d1222d2fa7
Merge pull request #3572 from jp-bennett/master
...
Adds Janus Restream and Profile Override
2022-08-09 18:15:39 -04:00
2c48d83860
Properly hide Janus options when Janus is disabled for a given monitor.
2022-08-09 15:17:40 -05:00
165ccf5820
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-08-09 15:48:06 -04:00
a83ed1dbf5
Don't use array_keys_first as it doesn't exist in php < 7.3.
2022-08-09 15:01:25 -04:00
e5c871ab7e
Fix eslint
2022-08-09 14:35:24 -04:00
d41792ae00
Adds Janus options Profile-ID Override and Use RTSP Restream to work around camera issues
2022-08-09 00:54:41 -05:00
d1b5451c7e
Ignore errors decoding log message
2022-08-08 13:57:09 -04:00
294fd9b3c7
Always populate add MonitorLink dropdown.
2022-08-08 10:05:15 -04:00
f794077d71
Only add or operator if monitorlinks has content
2022-08-08 10:02:20 -04:00
b01c75ab76
Modify config.php.in
...
Modifies config.php to use ZM_TIMEZONE if defined by user
2022-08-05 06:40:23 -06:00
71325fdd5c
Setting padding to 0 for ptz buttons
2022-08-04 12:13:53 -04:00
6bc0ec6aab
Add Report ORM
2022-08-04 09:35:25 -04:00
84385442d7
Set button padding to 0 for ptz buttons
2022-08-04 09:22:30 -04:00
715694138c
More reports rough in, css and js
2022-08-04 09:12:45 -04:00
ad764ca0bb
rough in major actions for reports
2022-08-04 09:11:24 -04:00
ce1f3a8ac6
Further roughing in of reports listing
2022-08-04 09:11:03 -04:00
d9b077d792
rough in editing and timeline graphing
2022-08-04 09:08:11 -04:00
f6a7698e43
Add Reports menu option
2022-08-04 09:07:46 -04:00
ca1ad2e2e4
Fix use of filter instead of this
2022-08-04 09:07:33 -04:00
23c2546cb6
Record an Amcrest mac vendor but don't implement probe yet
2022-08-03 18:01:47 -04:00
dc52105c8f
Allow to link to ourself
2022-08-03 14:44:44 -04:00
4587d0576d
Remove unused code
2022-08-03 14:30:18 -04:00
6c292dd0e3
Improve adding parenthesis, rename function to snake case
2022-08-03 14:30:18 -04:00
e27e1c0991
Add backtrace to invalid value for width
2022-08-03 14:30:18 -04:00
a00d332ade
Rough in reports views and add Chart.min.js
2022-08-03 14:29:53 -04:00
eb4b097560
fix eslint
2022-08-03 13:52:01 -04:00
19952b25c1
Remove unused code
2022-08-03 13:40:08 -04:00
2e5d7ee167
Improve adding parenthesis, rename function to snake case
2022-08-03 13:38:56 -04:00
f4b8066d00
Add backtrace to invalid value for width
2022-08-03 12:28:39 -04:00
6f146d1af0
Add MonitorLinkExpression.js
2022-08-03 12:14:51 -04:00
45697c7da9
Merge branch 'master' into reports
2022-08-03 11:57:07 -04:00
cf3c194e21
Handle when there are no servers and hence no defined ServerId in newMonitor
2022-08-03 11:55:44 -04:00
b40423d720
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-08-02 20:57:48 -04:00
2fa90cff4d
Use const or let instead of var
2022-08-02 20:47:47 -04:00
79f2d1d20f
If nothing selected, present a message about it. This shouldn't happen, but does
2022-08-02 20:46:33 -04:00
7121665376
cache bust MonitorLinkExpression.js
2022-08-02 10:38:55 -04:00
6934b7090d
remove commented out code, use const for obr and cbr selects
2022-08-02 10:38:35 -04:00
5776a766e1
fixup logic inversion on test_post_sql_conditions. condense code.
2022-07-29 13:59:21 -04:00
e1581b6be6
db limits should not be affected by pre-conditions, so include the limit regardless of pre-sql-conditions.
2022-07-29 13:59:01 -04:00
c937169a6b
Fix logic inversion on test_pre_sql_conditions
2022-07-29 13:50:40 -04:00
12c1011ff9
Use parseInt to turn '0' into 0
2022-07-29 10:44:28 -04:00
d8dea37c88
When selecting AlarmedZone, must check for SCore > 0.
2022-07-28 16:33:38 -04:00
9b12797f75
Merge pull request #3540 from dougnazar/fix_stream_progress
...
Use old event unpack() on 32bit systems.
2022-07-24 21:03:24 -04:00
8788b372fe
Don't reload img steam on auth hash change. Just update the global variable.
2022-07-24 20:39:09 -04:00
d8493a676b
Rough in functions to provide a gui to edit linked monitors. Current status is changing monitor_links and showing editing operators. Next up parenthesis.
2022-07-24 20:38:51 -04:00
2ba7d4d0b5
Rough in a function Events() to return Event objects from a Filter.
2022-07-24 20:37:32 -04:00
262c087800
Use old event unpack() on 32bit systems.
...
PHP unpack() 64bit formats aren't available on 32bit.
2022-07-24 04:28:37 -04:00
00c160da0c
rename Onvif_Alarm_Txt to ONVIF_Alarm_Text
2022-07-23 16:09:26 -04:00
917c3bd7ba
rename Onvif_Alarm_Txt to ONVIF_Alarm_Text
2022-07-23 16:08:42 -04:00
bfeee1ed09
rename Onvif_Alarm_Txt to ONVIF_Alarm_Text
2022-07-23 16:08:27 -04:00
e4a8017b6b
added configuring of authentication for rstp cameras
2022-07-22 07:08:22 -04:00
981769b9db
Allows users to set an specific "Onvif alarm text" for each monitor ( #3535 )
...
* Allows users to set an specific "Onvif alarm text" for each monitor
With this personalization the cameras that use strings different to "MotionAlarm"
such as Dahua, will be able to process their Onvif alarms. To make it easier, the change
sets a default "Alarm Text" value for it to work out of the box and then allows to
modify it according to the particular necessities of each brand. It consists of
a new column on table Monitors, changes on Monitors.h, Monitors.cpp and a change
on UI to manage the value of Alarm Text per camera.
Updated es_la.php language file.
Co-authored-by: ovargasp <ovargasp@hoitmail.com>
2022-07-20 12:51:13 -05:00
2d335f6e12
Don't reload img steam on auth hash change. Just update the global variable.
2022-07-15 06:47:45 -04:00
227b9d0919
Merge pull request #3527 from ovargasp/master
...
es_la V3
2022-07-14 17:51:22 -04:00
00a005e990
Merge pull request #1 from ovargasp/ovargasp-patch-1-(Lang-File-with-OLANG-format)
...
Version 3 of es_la with OLANG format for prompts
2022-07-14 15:37:00 -06:00
e4bd2d351a
Merge branch 'master' into monitorlink_expressions
2022-07-14 14:42:56 -04:00
3d541eee99
Remove comments about locale
2022-07-14 13:19:39 -04:00
e84a1477ff
put back ?>
2022-07-14 13:19:10 -04:00
9ad7ce3823
Remove remaining locale stuff from language files
2022-07-14 13:16:49 -04:00
e38dd4649d
Convert missed strftimes to dateTimeFormatter. Fixes #3526
2022-07-13 18:47:27 -04:00
df49d7a1ee
Send out a quit command when jumping to prev/next video so that hopefully zms exits.
2022-07-13 18:47:27 -04:00
213d57ee03
Update options.php
2022-07-13 12:05:53 -06:00
79183c5107
Add files via upload
2022-07-13 09:39:55 -06:00
4be7cf409a
fix translate label
2022-07-12 18:08:26 -06:00
ebc9920442
Merge branch 'ZoneMinder:master' into master
2022-07-12 18:06:14 -06:00
fa2a02c27f
Add UserId to js side layouts so we can check it
2022-07-12 17:32:32 -04:00
c6cc23d73c
Check for ownership of layout before saving
2022-07-12 17:32:07 -04:00
56828f4d48
Add Id=0 for default user
2022-07-12 17:31:41 -04:00
2988d49454
When saving a layout, check for System[edit] or ownership of the layout.
2022-07-12 17:31:30 -04:00
64ed7370b6
Add UserId field to MontageLayouts
2022-07-12 17:30:54 -04:00
7d3c52cd49
Update es_la.php
2022-07-11 16:39:22 -06:00
bbba518215
Merge pull request #3522 from ovargasp/patch-3
...
more translations changes
2022-07-11 18:36:01 -04:00
00399b340c
Merge pull request #3523 from ovargasp/patch-4
...
translations on modal states...
2022-07-11 18:34:23 -04:00
d9be8def3d
translates prompts using lang file.
2022-07-11 15:49:31 -06:00
8973c72c77
V2
...
This one has all "prompts" from Config Table in it, goes along with change on options.php to translate options view to another language...
2022-07-11 15:46:11 -06:00
c388e25c9f
updated es_la language file (7-2022)
2022-07-11 13:25:53 -06:00
db2a22fcb9
translations
2022-07-11 13:02:33 -06:00
b6a523f265
translations...
2022-07-11 13:00:40 -06:00
ceb9869a86
fix translation for labels
2022-07-11 12:48:40 -06:00
Isaac Connor
Pliable Pixels
megasaturnv
Isaac Connor
VikingGer
Jonathan Bennett
Garkus98
ovargasp
parvit (Vittorio Parrella)
Doug Nazar
ovargasp