Isaac Connor
|
5498c60391
|
Remove debug
|
2022-10-17 12:39:50 -04:00 |
|
Isaac Connor
|
ef119e3ed4
|
Minor cleanup, remove dead code
|
2022-10-17 12:35:00 -04:00 |
|
Isaac Connor
|
96a2e6f6fb
|
Put view in the form get part for visibility
|
2022-10-17 12:31:26 -04:00 |
|
Isaac Connor
|
4a98138ec4
|
Revert "add remoteaddr to session when regenerating"
This reverts commit d97f94573c.
|
2022-10-17 12:28:03 -04:00 |
|
Isaac Connor
|
d97f94573c
|
add remoteaddr to session when regenerating
|
2022-10-17 12:23:47 -04:00 |
|
Isaac Connor
|
ca58b8fd60
|
Add debug, add validateId function to session handler. Change it to be a a subclass of SessionHandlerInterface so that we don't have to provide createId. Fixes session breakage in php8.2
|
2022-10-17 12:17:22 -04:00 |
|
Isaac Connor
|
c21eb94fad
|
remoteAddr is set when session is opened. So no need to do it in auth. session_clear closes the session so no need to close it first
|
2022-10-17 12:14:16 -04:00 |
|
Isaac Connor
|
8e29c5cd8b
|
Move relevant code out of includes/actions/auth.php into includs/auth.php. Note that Google recaptcha is now incompatible with api. Fixes inability to login using GET method.
|
2022-10-13 16:31:23 -04:00 |
|
Isaac Connor
|
1264908aa3
|
when a config value is overridden via *.conf files, put up a warning/explanation.
|
2022-10-13 09:57:08 -04:00 |
|
Isaac Connor
|
1b311b4102
|
left align option value column
|
2022-10-13 09:56:30 -04:00 |
|
Isaac Connor
|
c7eac3383a
|
Fix form structure, use of get instead of post and duplicated action input
|
2022-10-13 09:08:41 -04:00 |
|
Isaac Connor
|
0071d3da40
|
Fix saving from the function modal. Put action in the post variables and change the action to save instead of function.
|
2022-10-12 21:23:58 -04:00 |
|
Isaac Connor
|
36ed68590d
|
Test for definition of ZM_LOG_INJECT. We don't include the config when not logged in. So it won't be defined
|
2022-10-12 19:36:57 -04:00 |
|
Isaac Connor
|
600894682e
|
Test for matches[operator]. Fixes #3607
|
2022-10-11 15:50:41 -04:00 |
megasaturnv
|
c78edb387a
|
Case insensitive login - Fix spacing ZoneMinder/zoneminder#3516
|
2022-10-11 10:56:10 -04:00 |
|
megasaturnv
|
f9ecb5b1e2
|
Moved case-insensitive username checks to SQL
|
2022-10-11 10:51:58 -04:00 |
|
megasaturnv
|
ac5be4ed35
|
Fix typo
|
2022-10-11 10:51:58 -04:00 |
|
megasaturnv
|
97a731f8b7
|
Renamed ZM_AUTH_CASE_INSENSITIVE_USERNAMES to ZM_CASE_INSENSITIVE_USERNAMES as name was too long ZoneMinder/zoneminder#3516
|
2022-10-11 10:51:58 -04:00 |
|
megasaturnv
|
c9c692bac4
|
Added option ZM_AUTH_CASE_INSENSITIVE_USERNAMES to match mixed case usernames to lower case usernames in database ZoneMinder/zoneminder#3516
|
2022-10-11 10:51:58 -04:00 |
|
Isaac Connor
|
1569816f5e
|
Check for definition of CAMBOZOLA defines. The purpose is just to easy running the 1.36 UI against a 1.37 database.
|
2022-10-11 10:23:10 -04:00 |
|
Isaac Connor
|
7c3daf9723
|
Fix eslint
|
2022-10-11 10:09:08 -04:00 |
|
Isaac Connor
|
4e5278882d
|
use ajax() instead of getJSON so that we can specify no timeout. This prevents log queries from stacking up overloading the db
|
2022-10-11 10:04:55 -04:00 |
|
Isaac Connor
|
00f2b325b0
|
Just use the master version of ajax/log.php
|
2022-10-07 23:53:50 -04:00 |
|
Isaac Connor
|
25d85bddf0
|
Don't attach onclick to save button on stoage modal as it is a submit button
|
2022-10-07 15:57:34 -04:00 |
|
Isaac Connor
|
3f8352c256
|
update storage modal to fix buttons not being in form. Also remove duplicate view field and make button action be save instead of Save. Fixes #3605
|
2022-10-07 15:48:40 -04:00 |
|
Isaac Connor
|
7e78dadb91
|
Use canEdit['System'] and value of new ZM_LOG_INJECT to disable attempting to inject javascript errors into zm logs
|
2022-10-07 11:10:14 -04:00 |
|
Isaac Connor
|
ef91e20532
|
Check value of System:Edit permission and ZM_LOG_INJECT to disable ajax log injection.
|
2022-10-07 11:09:59 -04:00 |
Pliable Pixels
|
5f8ca42d96
|
whoops fixed errant enum values I forgot to delete
|
2022-10-07 10:12:01 -04:00 |
|
Isaac Connor
|
38e45c6c3b
|
Add permissions checking to API/Logs. Fixes unprivileged user being to add/edit/delete/view logs.
|
2022-10-06 16:56:24 -04:00 |
|
Isaac Connor
|
031fc072fb
|
remove jquery-3.5.1
|
2022-10-04 11:41:10 -04:00 |
|
Isaac Connor
|
6895d4f952
|
Update jquery-ui to 1.13.2
|
2022-10-04 11:40:53 -04:00 |
|
Isaac Connor
|
71bcbbd121
|
Update jquery-ui to 1.13.2
|
2022-10-04 11:40:27 -04:00 |
|
Isaac Connor
|
0db076ac55
|
Upgrade jquery to 3.6.1
|
2022-10-04 11:38:55 -04:00 |
|
Isaac Connor
|
358467f426
|
Make form on console use post
|
2022-10-04 11:38:43 -04:00 |
|
Isaac Connor
|
f8102b3cf0
|
save buttion is a submit button now, so doesn't need an onclick. Fix code setting action on delete.
|
2022-10-04 11:38:31 -04:00 |
|
Isaac Connor
|
f704b2ec47
|
Switch to post instead of get in the groups form because we only do actions on post now.
|
2022-10-04 11:38:17 -04:00 |
|
Isaac Connor
|
3aa4310200
|
Only perform actions on post. Doing them on GET allows doing actions from things like img tags which is not good.
|
2022-10-04 11:38:03 -04:00 |
|
Isaac Connor
|
e4a0d758d6
|
Fix group modal. Use post instead of get, properly populate the save submit button
|
2022-10-04 11:37:50 -04:00 |
|
Isaac Connor
|
dbcfc8cb18
|
File must be escaped as well to prevent XSS
|
2022-09-30 09:59:09 -04:00 |
|
Isaac Connor
|
3bf1a1300e
|
Only look for action if there is a view
|
2022-09-29 16:17:10 -04:00 |
|
Isaac Connor
|
f2143dfbba
|
Fix export not working for filter due to limit set to 0.
|
2022-09-29 16:15:20 -04:00 |
|
Isaac Connor
|
d44a1ad175
|
Handle filter[query] not being defined
|
2022-09-29 16:15:11 -04:00 |
|
Pliable Pixels
|
121fab2f6a
|
make OutputCodec work in API
|
2022-09-25 13:29:36 -04:00 |
Isaac Connor
|
0df8b0cc7c
|
Put the view and mid into the get query part of the form submit. Because it's a modal, view is not populated. We are also moving the action to actionsn/watch.php so specify watch view. This all fixes not saving v4l settings.
|
2022-09-25 09:55:03 -04:00 |
|
Isaac Connor
|
a7e45752de
|
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:29:26 -04:00 |
|
Isaac Connor
|
d3c13e7e99
|
In failure state populate imageData array to reduce output php errors
|
2022-09-22 10:16:18 -04:00 |
|
Isaac Connor
|
6dab3a57da
|
We change stats so it has to be let
|
2022-09-22 10:16:18 -04:00 |
|
Isaac Connor
|
1c12320052
|
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-22 10:16:18 -04:00 |
|
Isaac Connor
|
59832dc69f
|
Add spans and titles over the title h2 parts so that on mouseover it tells you what they are
|
2022-09-22 10:16:18 -04:00 |
|
Isaac Connor
|
d09362c6c9
|
More properly fix the alarm status api changing. The previous hack broken doing alarm on/off.
|
2022-09-21 14:35:50 -04:00 |
|
Isaac Connor
|
d52d02c619
|
Use y instead of Y for path generation when using Deep scheme. Fixes #3583
|
2022-09-21 09:08:09 -04:00 |
|
Isaac Connor
|
ddb6741e5f
|
Use zm_setcookie, which will automatically set samesite on the session cookie. Maybe fixes #3517
|
2022-09-16 13:35:30 -04:00 |
VikingGer
|
b3bad6a653
|
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 11:52:14 -04:00 |
|
Isaac Connor
|
16c785f708
|
Fix contents of values on LOCALE_DEFAULT.
|
2022-09-15 17:06:25 +00:00 |
|
Isaac Connor
|
98b7965c9f
|
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 17:06:02 +00:00 |
|
Isaac Connor
|
be50ea893d
|
fix export from event view. There is a global exportEvent Function, so rename ours
|
2022-09-15 16:43:22 +00:00 |
|
Isaac Connor
|
c395a61719
|
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 16:38:39 +00:00 |
|
Isaac Connor
|
aa393c7841
|
Spacing, ignore auth_relay, clean up clickLogout a bit
|
2022-09-14 17:02:05 +00:00 |
|
Isaac Connor
|
c4baddbf2a
|
Add fade to the logout modal which for some reason fixes it not showing after a hide
|
2022-09-14 17:00:59 +00:00 |
|
Isaac Connor
|
726f78e8d1
|
Only init the boostrap events table if we can view Events.
|
2022-09-08 15:12:21 -04:00 |
|
Isaac Connor
|
d2176c83af
|
Restore status value to pre 1.36.16 value by substracting 1. So Unknown == -1, 0 = IDLE etc. Fixes #3584
|
2022-09-08 13:02:02 -04:00 |
|
Isaac Connor
|
2d63dd72e4
|
Fix typo on dateTimeFormater=>dateTimeFormatter. Fixes #3580. Make conversion to integer on Length explicit to remove warning on php8.
|
2022-08-31 10:08:51 -04:00 |
|
Isaac Connor
|
700ed2d9f5
|
cleanup migrateHash. Use better parameter names to avoid conflict with global .
|
2022-08-29 16:02:04 -04:00 |
|
Isaac Connor
|
1f8fc96226
|
Fix typo Pasword => Password
|
2022-08-29 15:49:48 -04:00 |
|
Isaac Connor
|
f45ea8941b
|
When there are less than 3 storage areas, just list them in the header instead of making it a dropdown
|
2022-08-29 14:10:47 -04:00 |
|
Isaac Connor
|
75a0bd99f3
|
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-28 16:19:27 -04:00 |
|
Isaac Connor
|
48d09d5d75
|
Add a back to frames button from view
|
2022-08-28 16:18:27 -04:00 |
|
Isaac Connor
|
baf8ec8df7
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2022-08-28 16:12:25 -04:00 |
|
Isaac Connor
|
832a0cfdfa
|
Make a.btn the same line-height as button.btn
|
2022-08-22 19:27:45 -04:00 |
|
Isaac Connor
|
065c124840
|
If current time is specified, calculate minTime and maxTime from it.
|
2022-08-22 18:46:30 -04:00 |
|
Isaac Connor
|
d8b81664fd
|
Merge branch 'release-1.36' of pseudo:sandbox/ZoneMinder.connortechnology into release-1.36
|
2022-08-22 16:32:13 -04:00 |
|
Isaac Connor
|
a61bcb93f0
|
Add a button to jump this event time in montage review
|
2022-08-22 16:30:37 -04:00 |
|
Isaac Connor
|
6ba1d5c424
|
Update material icons to v1.11.10
|
2022-08-22 16:29:35 -04:00 |
|
Isaac Connor
|
fba929ef4e
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2022-08-12 12:19:38 -04:00 |
|
Isaac Connor
|
7801d8e3b8
|
Don't call format on an empty string and only pass the integer part of it
|
2022-08-10 15:30:36 -04:00 |
|
Isaac Connor
|
7fae301dca
|
Ignore errors decoding log message
|
2022-08-10 10:56:54 -04:00 |
|
Isaac Connor
|
decae3e434
|
Test for existence of monitors[i] before trying to kill it just to reduce javascript errors
|
2022-08-10 10:56:54 -04:00 |
|
Isaac Connor
|
2aff356948
|
Fix deprecation warning due to implicit conversion to integer. Make it explicit.
|
2022-08-10 10:56:54 -04:00 |
|
Isaac Connor
|
7799065f52
|
Fix javascript error on zone edit
|
2022-08-08 11:12:34 -04:00 |
ovargasp
|
e09959f9e3
|
Modify config.php.in
Modifies config.php to use ZM_TIMEZONE if defined by user
|
2022-08-05 10:54:34 -04:00 |
|
Isaac Connor
|
708ace4ab5
|
Setting padding to 0 for ptz buttons
|
2022-08-05 09:08:28 -04:00 |
|
Isaac Connor
|
ae125e31ed
|
Set button padding to 0 for ptz buttons
|
2022-08-04 09:29:04 -04:00 |
|
Isaac Connor
|
22331e02cd
|
Fix ever increasing duration list
|
2022-08-02 14:36:39 -04:00 |
|
Isaac Connor
|
335393ded8
|
Use parseInt to turn '0' into 0
|
2022-07-29 14:02:17 -04:00 |
|
Isaac Connor
|
78ba9cc74f
|
When selecting AlarmedZone, must check for SCore > 0.
|
2022-07-29 14:01:03 -04:00 |
|
Isaac Connor
|
fc52045a52
|
fixup logic inversion on test_post_sql_conditions. condense code.
|
2022-07-29 14:00:19 -04:00 |
|
Isaac Connor
|
9b3be9a392
|
db limits should not be affected by pre-conditions, so include the limit regardless of pre-sql-conditions.
|
2022-07-29 14:00:06 -04:00 |
|
Isaac Connor
|
456549b7b4
|
Fix logic inversion on test_pre_sql_conditions
|
2022-07-29 13:59:56 -04:00 |
|
Isaac Connor
|
feaca5eb2a
|
Don't reload img steam on auth hash change. Just update the global variable.
|
2022-07-24 20:39:41 -04:00 |
|
Isaac Connor
|
b23de8044b
|
Convert missed strftimes to dateTimeFormatter. Fixes #3526
|
2022-07-13 18:49:13 -04:00 |
|
Isaac Connor
|
626320a240
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2022-07-12 14:18:14 -04:00 |
Ingemārs
|
280d18cbd5
|
Update config.php.in
|
2022-07-12 14:17:29 -04:00 |
|
Isaac Connor
|
e52187b85f
|
move dateFormatters to config. This is so that they get setup even if not using index.php. Like cakephp for example.
|
2022-07-12 14:17:15 -04:00 |
ovargasp
|
ea1f1dbc3c
|
translations
|
2022-07-12 13:31:16 -04:00 |
|
ovargasp
|
f652791f15
|
translations...
|
2022-07-12 13:30:07 -04:00 |
|
ovargasp
|
071301ffd9
|
fix translation for labels
|
2022-07-12 13:27:10 -04:00 |
|
Isaac Connor
|
d0a8a65b7b
|
Put back inlcuding en_gb in en_us
|
2022-07-12 10:14:48 -04:00 |
|
Isaac Connor
|
01f963933e
|
Fix eslint
|
2022-07-11 15:11:09 -04:00 |
|
Isaac Connor
|
df5cd98492
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2022-07-11 14:35:35 -04:00 |
|
Isaac Connor
|
c88d243e31
|
Send out a quit command when jumping to prev/next video so that hopefully zms exits.
|
2022-07-11 14:35:24 -04:00 |
|
Isaac Connor
|
7ac3b959de
|
Don't cache_bust bootstrap, because it loads the .map and so you get javascript errors.
|
2022-06-27 17:09:18 -04:00 |
|
Isaac Connor
|
c595b95efa
|
Need a ; before report-uri
|
2022-06-23 16:44:13 -04:00 |
|
Isaac Connor
|
04e4f3b8da
|
Use Content-Security-Policy: for all views instead of Report-Only
|
2022-06-23 16:44:11 -04:00 |
|
Isaac Connor
|
c58e63e927
|
Don't turn '0' into ''
|
2022-06-23 16:40:34 -04:00 |
|
Isaac Connor
|
4012a243ac
|
Center the up/down arrows in console Mark column
|
2022-06-23 16:37:33 -04:00 |
|
Isaac Connor
|
d2d1bad803
|
Add support for lambda functions as post processing. Use the to replace StartDateTimeShort with StartDateTimeFormatted so that dates on viewed events use the specified formatting.
|
2022-06-23 14:29:37 -04:00 |
|
Isaac Connor
|
e5f0781659
|
fix formatter->format
|
2022-06-23 14:27:36 -04:00 |
|
Isaac Connor
|
dac40cff5e
|
Must pass time() to format()
|
2022-06-23 14:27:21 -04:00 |
|
Isaac Connor
|
0e37415c01
|
Remove no longer used datetime format defines
|
2022-06-23 14:22:17 -04:00 |
|
Isaac Connor
|
7d6375532d
|
Remove locale setting and date formatting from the language files. It is now a separate option.
|
2022-06-23 14:22:06 -04:00 |
|
Isaac Connor
|
8a361fa9c6
|
Set locale based on ZM_LOCALE_DEFAULT
|
2022-06-23 14:21:45 -04:00 |
|
Isaac Connor
|
437d6ff54a
|
Add overriding timeFormatter pattern
|
2022-06-23 14:21:34 -04:00 |
|
Isaac Connor
|
b16e055f5a
|
convert from strftime to date
|
2022-06-23 14:21:09 -04:00 |
|
Isaac Connor
|
9ba1975728
|
convert from strftime to date
|
2022-06-23 14:20:59 -04:00 |
|
Isaac Connor
|
4b7f3e1bda
|
replace strftime, but also fix the fact that we weren't passing a format string
|
2022-06-23 14:20:49 -04:00 |
|
Isaac Connor
|
be94a7aa45
|
Use global dateTimeFormatter to replace strftime
|
2022-06-23 14:20:39 -04:00 |
|
Isaac Connor
|
cbb91f2691
|
Use global dateTimeFormatter to replace strftime
|
2022-06-23 14:20:29 -04:00 |
|
Isaac Connor
|
410f8a68d3
|
Add timeFormatter
|
2022-06-23 14:18:32 -04:00 |
|
Isaac Connor
|
5bf2316f26
|
Use dateTimeFOrmatter to format the date/time on session access
|
2022-06-23 14:18:21 -04:00 |
|
Isaac Connor
|
7c5858a696
|
convert from strftime() to date()
|
2022-06-23 14:18:11 -04:00 |
|
Isaac Connor
|
d28dacb31c
|
Populate the hints on ZM_LOCALE_DEFAULT
|
2022-06-23 14:17:56 -04:00 |
|
Isaac Connor
|
22d8de282b
|
Use dateTimeFOrmatter to format the date/time on events. Also turned off error display screwing up the js.
|
2022-06-23 14:16:41 -04:00 |
|
Isaac Connor
|
85693d1f58
|
Due to bulk frames, next prev and last can't be so simply calculated. Load them from the db instead
|
2022-06-23 14:16:30 -04:00 |
|
Isaac Connor
|
12e3e404aa
|
convert from strftime() to date() when filling in the weekdays array
|
2022-06-23 14:16:20 -04:00 |
|
Isaac Connor
|
c483db6b3c
|
Setup global dateFormatter and dateTimeFormatter. Once config is initialized, redo them if a different local was specified, and then apply custom patters if specified.
|
2022-06-23 14:15:13 -04:00 |
|
Isaac Connor
|
97856b96df
|
Use dateTimeFOrmatter to format the date/time on log entries
|
2022-06-23 14:15:03 -04:00 |
|
Isaac Connor
|
278122f1d6
|
update format string to date() format instead of strftime format
|
2022-06-23 14:14:52 -04:00 |
|
Isaac Connor
|
fe23353bc9
|
convert from strftime() to date() when forming sql
|
2022-06-23 14:14:42 -04:00 |
|
Isaac Connor
|
2f680e578e
|
convert from strftime() to date() when forming the event path
|
2022-06-23 14:14:30 -04:00 |
|
Isaac Connor
|
f758b74036
|
Use dateTimeFOrmatter to format the date/time on events
|
2022-06-23 14:14:19 -04:00 |
|
Isaac Connor
|
334a2566ea
|
Use dateTimeFOrmatter to format the date/time on frames
|
2022-06-23 14:13:32 -04:00 |
|
Isaac Connor
|
4634325c01
|
Use dateTimeFOrmatter to format the date/time on logs
|
2022-06-23 14:13:23 -04:00 |
|
Isaac Connor
|
a560d1ea64
|
Test for isset(REQUEST['uid']
|
2022-06-23 14:13:13 -04:00 |
|
Isaac Connor
|
ef8e8c70a4
|
Use a date object to format Length to Duration
|
2022-06-23 14:13:03 -04:00 |
|
Isaac Connor
|
f8e8fa431b
|
Add default global dateFormatter. Default to en_US but after config is loaded we can replace it.
|
2022-06-23 14:12:50 -04:00 |
|
Isaac Connor
|
d370ad3b6b
|
Format the output of getLoad to two decimal places
|
2022-06-23 14:12:38 -04:00 |
|
Isaac Connor
|
2cf3c26e46
|
Use global dateFormatter to format time in ajax events response. Don't format Length as it loses precision. Let javascript side do it. Turn off error_reporting in the output as it breaks the json
|
2022-06-23 14:12:20 -04:00 |
|
Isaac Connor
|
46c01db646
|
handle various functions no longer dealing with null
|
2022-06-23 14:12:06 -04:00 |
|
Isaac Connor
|
d3eb055b19
|
Put back ctype_digit and quoting of the sql to fix loading object in new
|
2022-06-23 14:11:54 -04:00 |
|
Isaac Connor
|
b26ad3ad69
|
Add default value for Storage Path
|
2022-06-23 14:11:43 -04:00 |
|
Isaac Connor
|
48cddab848
|
Add default value for Username
|
2022-06-23 14:11:31 -04:00 |
|
Isaac Connor
|
d09c4ffc93
|
Test for values being trueish as passing null to strcmp is deprecated
|
2022-06-23 14:11:20 -04:00 |
|
Isaac Connor
|
1978bc4659
|
Test for is_array first, get rid of ctype_digit test as passing a null to it is deprecated
|
2022-06-23 14:11:09 -04:00 |
|
Isaac Connor
|
f60bb23f15
|
Use date() instead of strftime() for date formatting now that strftime is deprecated
|
2022-06-23 14:10:58 -04:00 |
|
Isaac Connor
|
6c4ac261c4
|
Escape single quotes in config values. Fixes #3508.
|
2022-06-17 10:54:44 -04:00 |
|
Isaac Connor
|
0c1d101266
|
Handle php versions < 5.6.1 which don't have non-blocking semaphore support
|
2022-06-13 15:54:37 -04:00 |
Nic Boet
|
84bf07080c
|
Fix semaphore_tries on systems without System V
This appears to be impacting systems without php System V semaphore support
have_semaphore is not a boolean
Signed-off-by: Nic Boet <nic@boet.cc>
|
2022-06-07 09:45:21 -04:00 |
|
Isaac Connor
|
27057157da
|
Add a progress ticker, and delete events in chunks of 10. Fixes #3444
|
2022-06-06 13:10:21 -04:00 |
|
Isaac Connor
|
658ec3a7d7
|
Only return error messages, not a bunch of empty arrays
|
2022-06-06 13:10:09 -04:00 |
|
Isaac Connor
|
f0e6be64de
|
load Private as well as Name,Value from Config
|
2022-06-05 12:15:53 -04:00 |
|
Isaac Connor
|
472555ae79
|
Only include config if logged in or auth turned off. Login view doesn't require any config.
|
2022-06-05 12:11:55 -04:00 |
|
Isaac Connor
|
4c84aaa996
|
whitespace
|
2022-06-05 12:08:05 -04:00 |
|
Isaac Connor
|
2160cc6dc9
|
Merge branch 'php8.1'
|
2022-06-02 21:26:01 -04:00 |
|
Isaac Connor
|
db885cac5a
|
fix eslint
|
2022-06-02 16:43:23 -04:00 |
|
Isaac Connor
|
a5f8ea2e82
|
Don't trim select values. In monitor selects are all well defined. Fixes not being able to multi-select groups or linked monitors
|
2022-06-02 16:28:25 -04:00 |
|
Isaac Connor
|
d1bfb78235
|
use a global mode variable to determine if we are editing and disable clicking on image. disabling the onclick doesn't seem to be working. When activating edit mode and saving positions use #monitor instead of #monitorFrame which went away.
|
2022-06-02 13:56:16 -04:00 |
|
Isaac Connor
|
7e5c4d4a76
|
Only set onclick if a new function is given
|
2022-06-02 13:54:48 -04:00 |
|
Isaac Connor
|
6a287708c6
|
use zm_setcookie function with will set required cookie fields so that cookie actually gets set
|
2022-06-02 13:53:39 -04:00 |
|
Isaac Connor
|
e270577f40
|
center stream on cycle
|
2022-05-31 14:19:54 -04:00 |
|
Isaac Connor
|
f044cfa280
|
add a newline
|
2022-05-31 14:19:41 -04:00 |
|
Isaac Connor
|
bc3ab9cf66
|
Use monitorStream scaling
|
2022-05-31 14:19:27 -04:00 |
|
Isaac Connor
|
7def1944b6
|
Always force width and height on img to sane values
|
2022-05-31 14:18:56 -04:00 |
|
Isaac Connor
|
ee559a5bc2
|
fix spacing
|
2022-05-31 13:59:29 -04:00 |
|
Isaac Connor
|
9aa7f70c0f
|
remove connkey from initial zms single jpeg in montage.
|
2022-05-31 13:59:17 -04:00 |
|
Isaac Connor
|
722a0174d7
|
use monitorStream more in watch
|
2022-05-31 13:58:48 -04:00 |
|
Isaac Connor
|
8d7293202d
|
use monitorStream more in cycle
|
2022-05-31 13:58:33 -04:00 |
|
Isaac Connor
|
afbf5ebe60
|
Start stream with single jpeg. Add monitor div around imagefeed
|
2022-05-31 13:58:13 -04:00 |
|
Isaac Connor
|
cb11ce100f
|
Include connKey is debug line
|
2022-05-31 13:57:41 -04:00 |
|
Isaac Connor
|
6479a1ec99
|
Implement semaphore retry. Make not getting the semaphore an error
|
2022-05-31 13:14:30 -04:00 |
|
Isaac Connor
|
da0cf59144
|
fix borders and centering on live view
|
2022-05-31 12:43:20 -04:00 |
|
Isaac Connor
|
a782aea12f
|
Handle ctrl-click for opening in a new window
|
2022-05-31 12:01:01 -04:00 |
|
Isaac Connor
|
858167a779
|
just like in master use .monitor.alert for styling
|
2022-05-31 12:00:38 -04:00 |
|
Isaac Connor
|
a26042ea02
|
Don't change width if it is a percent
|
2022-05-31 12:00:17 -04:00 |
|
Isaac Connor
|
1fc9ddb54b
|
Put live stream in a monitor div so that it lays out right
|
2022-05-31 11:44:04 -04:00 |
|
Isaac Connor
|
bd4195d0c7
|
ZM_OPT_USE_GEOLOCATION is globally included so remove from monitor.js.php. Only test Path if not empty and handle exceptions in parsing it.
|
2022-05-31 11:43:44 -04:00 |
|
Isaac Connor
|
d584431160
|
Fix centering of live view
|
2022-05-31 11:42:44 -04:00 |
|
Isaac Connor
|
c481a812d0
|
Put back click on image in montage to bring live view
|
2022-05-31 11:31:57 -04:00 |
|
Isaac Connor
|
67e148052a
|
set _last_error if insert fails
|
2022-05-31 11:31:24 -04:00 |
|
Isaac Connor
|
5ff68badbc
|
Report more saving errors to ui
|
2022-05-31 11:31:03 -04:00 |
|
Isaac Connor
|
04ebb81072
|
Implement CTRL-click to open event in a new tab/window
|
2022-05-30 14:02:24 -04:00 |
|
Isaac Connor
|
77090f79d5
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2022-05-30 09:53:42 -04:00 |
|
Isaac Connor
|
32aa919c9f
|
Don't update DiskSpace with a 0 value when listing events. This generally happens with missing events and causes too much contention on the Events and summaries tables
|
2022-05-27 10:21:24 -04:00 |
|
Isaac Connor
|
a8c2653453
|
Prevent editing of system config entries through the api
|
2022-05-27 10:20:33 -04:00 |
|
Isaac Connor
|
1198b391ee
|
remove debug
|
2022-05-27 09:30:37 -04:00 |
|
Isaac Connor
|
7256189644
|
assign class=monitor to match other views
|
2022-05-26 16:37:07 -04:00 |
|
Isaac Connor
|
d5f0fe0259
|
remove data-on-click from alarmForce and cancel buttons as we check for canedit in watch.js. Update status fields to include the id to match montage so that monitorstream can access them.
|
2022-05-26 16:36:50 -04:00 |
|
Isaac Connor
|
dc8865659e
|
When clicking cancel on zone edit, go back instead of reload
|
2022-05-26 16:35:58 -04:00 |
|
Isaac Connor
|
6daa75df29
|
Use more of monitorStream. alert if the ajax has a message
|
2022-05-26 16:35:38 -04:00 |
|
Isaac Connor
|
58749f5165
|
Move monitor alarm styles into skin.css as they are used in other views now too
|
2022-05-26 16:34:14 -04:00 |
|
Isaac Connor
|
e7e692ddbf
|
Use global config vale for ZM_WEB_POPUP_ON_ALARM
|
2022-05-26 16:33:38 -04:00 |
|
Isaac Connor
|
e06925d192
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2022-05-26 14:00:13 -04:00 |
|
Isaac Connor
|
994662985f
|
fix missing ] on checkboxx
|
2022-05-26 14:00:03 -04:00 |
tftadmin Appleton
|
46b43b980a
|
Remove janus
|
2022-05-25 15:46:44 -05:00 |
|
Isaac Connor
|
b1ac4981bf
|
Fixup cherry pick escaping multi-line config consts
|
2022-05-25 16:07:39 -04:00 |
|
Isaac Connor
|
d8f666ec2d
|
Update styles so that alarmed images get red border
|
2022-05-25 16:06:59 -04:00 |
|
Isaac Connor
|
eacc7edf15
|
Re-instate setting the class of the monitor div on alarm
|
2022-05-25 16:06:42 -04:00 |
|
Isaac Connor
|
e26c7ed132
|
fix replacement on escape. For some reason needs double bacl slash
|
2022-05-25 15:59:55 -04:00 |
|
Isaac Connor
|
c5e5389843
|
Make config entries const
|
2022-05-25 15:59:09 -04:00 |
|
Isaac Connor
|
968b52239d
|
Add divs needed for MonitorStream. Improve title to include monitor name, start in single mode
|
2022-05-25 15:58:07 -04:00 |
|
Isaac Connor
|
e5b858a3c3
|
Add divs needed for MonitorStream
|
2022-05-25 15:57:47 -04:00 |