Isaac Connor
|
cd61619bce
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2023-01-03 18:09:26 -05:00 |
|
Isaac Connor
|
390d914b61
|
Use ajax() instead of getJSON with no timeout when deleting events.
|
2023-01-03 13:37:57 -05:00 |
|
Isaac Connor
|
29e7f7de4c
|
Update monitor preset view: Use a submit button instead of input with javascript. Remove no longer needed js code. Sort presets by Name.
|
2023-01-02 17:22:13 -05:00 |
|
Isaac Connor
|
4bcfc2360d
|
Remove stopping the statusCmdTimer, it isn't used.
|
2023-01-02 17:06:35 -05:00 |
|
Isaac Connor
|
d78d30836b
|
Fix saving Server modal. Form was incomplete, action and view were duplicated. Don't need javascript just use the submit button Save.
|
2022-12-22 12:54:54 -05:00 |
|
Isaac Connor
|
a996dbe99a
|
Remove dead code from report_event_audit.js
|
2022-11-29 12:57:00 -05:00 |
|
Isaac Connor
|
17b51355ed
|
Use Y-m-d H:i:s instead of c for date formatting to match what datetimepicker expects. remove unused action input and put view in the get part of form action
|
2022-11-29 12:56:49 -05:00 |
|
Isaac Connor
|
1130790ff6
|
Add styles to table headers to left align them to match the body
|
2022-11-29 12:56:38 -05:00 |
|
Isaac Connor
|
6c8e2b61db
|
Remove debug
|
2022-11-18 14:21:30 -05:00 |
|
Isaac Connor
|
38b5ddd80a
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2022-11-17 13:28:52 -05:00 |
|
Isaac Connor
|
46ddbeba92
|
Must convert strings into integers before doing math as of php 8.2 Fixes Unsupported operand types: string - int
|
2022-11-17 13:28:31 -05:00 |
|
Isaac Connor
|
101aa82776
|
implode the output from zmu to fix php complaint abou array to string conversion
|
2022-11-16 16:16:27 -05:00 |
Michael
|
940bfcdfa6
|
Set web backend db connection to utf8
|
2022-11-16 10:36:14 -05:00 |
|
Isaac Connor
|
03fe7fb627
|
Cleanup the state modal. Fix form post
|
2022-11-16 10:15:31 -05:00 |
|
Isaac Connor
|
16528cadf6
|
Make .form-group styles export page specific because they are affecting modals
|
2022-11-16 10:15:19 -05:00 |
|
Isaac Connor
|
0eacb7d650
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2022-11-15 13:38:43 -05:00 |
|
Isaac Connor
|
244cb69de1
|
Add error message when minTime >= maxTime
|
2022-11-15 12:45:21 -05:00 |
|
Isaac Connor
|
ed330dc280
|
Fix infinite recursion in montagereview
|
2022-11-15 12:15:40 -05:00 |
|
Isaac Connor
|
2ef917801a
|
Turn back on error_reporting, just don't display them
|
2022-11-14 14:24:21 -05:00 |
|
Isaac Connor
|
d1455774f0
|
Don't report errors from mkdir, it normally exists
|
2022-11-14 14:13:21 -05:00 |
|
Isaac Connor
|
94ac27c4b8
|
Try out just using connkey as the semaphore key instead of ftok
|
2022-11-14 14:12:25 -05:00 |
|
Isaac Connor
|
12d6069734
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2022-11-14 12:37:44 -05:00 |
|
Isaac Connor
|
fedd6d0909
|
Allow MonitorName as default sort field as well as Monitor
|
2022-11-14 12:37:25 -05:00 |
|
Isaac Connor
|
83a84d7dd9
|
Better logging of view and action when using GET
|
2022-11-03 21:39:58 -04:00 |
Andrew Bauer
|
55ee6fc727
|
replace php Memcached with Apc on Fedora
|
2022-11-03 09:29:10 -05:00 |
|
Isaac Connor
|
a3a44e2f27
|
Handle empty but defined REQUEST[action]
|
2022-11-02 10:10:38 -04:00 |
|
Isaac Connor
|
3cd0a477fb
|
Make button on Filter Debug modal be Close instead of Cancel
|
2022-11-02 10:10:26 -04:00 |
|
Isaac Connor
|
83a0e295ad
|
Add Cuase, Notes and EndDateTime to columns in events list on watch view
|
2022-11-02 10:10:17 -04:00 |
|
Isaac Connor
|
7938524b14
|
Add Access-Control-Allow-Credentials: true so that we can pass cookies along with xhr requests.
|
2022-11-02 10:09:50 -04:00 |
|
Isaac Connor
|
ed98fec9d3
|
Set xhrFields: widthCredentials: true so that we send cookies with our streaming xhr requests so that we pick up new auth hashes
|
2022-11-02 10:09:36 -04:00 |
|
Isaac Connor
|
f20ef49cf8
|
Remove return type from session class methods. not supported in php5.4 Fixes #3622
|
2022-11-01 13:40:55 -04:00 |
|
Isaac Connor
|
f13e40d2c3
|
Remove deprecated CAMBOZOLA reference
|
2022-10-28 20:04:11 -04:00 |
|
Isaac Connor
|
acdb7681f4
|
Change form to post for delete
|
2022-10-28 20:04:11 -04:00 |
|
Isaac Connor
|
25880e0f38
|
Remove offending comma from default Coords
|
2022-10-28 20:04:11 -04:00 |
|
Isaac Connor
|
997872e1d3
|
Fix missed references to oldW and oldH
|
2022-10-26 14:34:05 -04:00 |
|
Isaac Connor
|
5611e2defc
|
Clean up debug. Clone the entire monitor object into oldMonitor instead of cherry-picking properties. Fixes use of new name when deleting old symlink. Always check for existence of monitor dir and symlink after done saving.
|
2022-10-26 14:33:24 -04:00 |
|
Isaac Connor
|
36788c334b
|
Remove left over references to REQUEST['newMonitor']. Add error reporting to creating monitor directory and symlinking when adding a new monitor
|
2022-10-26 13:55:27 -04:00 |
|
Isaac Connor
|
28ca42eee7
|
When saving monitor, only turn off error reporting for symlink. Don't delete old symlink unless the name has changed.
|
2022-10-26 13:41:31 -04:00 |
|
Isaac Connor
|
c4849712f4
|
Make search input the same size as other toolbar elements
|
2022-10-25 15:17:54 -04:00 |
|
Isaac Connor
|
f18111e280
|
Fix SQL for when passing an empty array to find. Return false instead of trying weird sql.
|
2022-10-20 09:29:08 -04:00 |
|
Isaac Connor
|
e7a9bf26ff
|
remove debug of monitors and Fix Warning when monitor is not visible
|
2022-10-20 09:28:38 -04:00 |
|
Isaac Connor
|
1eb2a65a3d
|
Make inputs on action table 100%
|
2022-10-18 15:46:06 -04:00 |
|
Isaac Connor
|
6af4328c69
|
Fix test for null in Object::find
|
2022-10-18 15:45:55 -04:00 |
|
Isaac Connor
|
5b29e018d0
|
IN () being false could still result in a true result of used in an OR, so instead of just returning, use an always false sql equivalent
|
2022-10-18 15:45:44 -04:00 |
|
Isaac Connor
|
0e88c58e0c
|
return empty array when passing empty as SQLvalue
|
2022-10-18 15:45:34 -04:00 |
|
Isaac Connor
|
feec790d45
|
Turn off deprecation notices so that we work with php8.2
|
2022-10-17 17:43:09 -04:00 |
|
Isaac Connor
|
2fda0af85a
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2022-10-17 17:38:39 -04:00 |
|
Isaac Connor
|
38cbaff409
|
Use REQUEST instead of SESSION to store the post login redirect because we clear the session on login. Fixes #3517
|
2022-10-17 16:40:34 -04:00 |
|
Isaac Connor
|
dda4b53347
|
quotes and spacing
|
2022-10-17 15:14:10 -04:00 |
|
Isaac Connor
|
0c8e419d42
|
Add setting remoteAddr in session after regenerating
|
2022-10-17 15:12:07 -04:00 |
|
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 |