Isaac Connor
|
910d4b51c9
|
Escape table names for mysql-8
|
2020-06-04 11:44:59 -04:00 |
|
Isaac Connor
|
20e6a1f53d
|
Use single quotes when escaping password so that $ has no effect. Also escape any single quotes in the password.
|
2020-06-04 11:37:44 -04:00 |
|
Isaac Connor
|
8802447b10
|
Handle no DB_HOST specifed so default to localhost
|
2020-06-04 11:36:10 -04:00 |
|
Isaac Connor
|
f8a11633bb
|
Handle no db_host specified, meaning local unix socket
|
2020-06-04 11:35:48 -04:00 |
|
Isaac Connor
|
ef3fc758cb
|
in getDiskPercent we have calls to Error without the ZM namespace. Fixes #2954
|
2020-06-04 11:34:48 -04:00 |
|
Isaac Connor
|
c4b2aa4a85
|
Handle no DB_HOST specifed so default to localhost
|
2020-06-04 11:34:16 -04:00 |
|
Isaac Connor
|
6869710747
|
Handle no db_host specified, meaning local unix socket
|
2020-06-04 11:28:26 -04:00 |
|
Isaac Connor
|
87078dfc31
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-06-03 17:41:09 -04:00 |
|
Isaac Connor
|
0644358d0a
|
in getDiskPercent we have calls to Error without the ZM namespace. Fixes #2954
|
2020-06-03 17:41:03 -04:00 |
Isaac Connor
|
14f7e01c00
|
Merge pull request #2942 from roddone/fix_monitors_table_responsive
make monitors table (console view) responsive
|
2020-06-03 15:44:38 -04:00 |
|
Isaac Connor
|
ade0d750c8
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-06-03 15:37:32 -04:00 |
|
Isaac Connor
|
6f42cb22d6
|
Use single quotes when escaping password so that $ has no effect. Also escape any single quotes in the password.
|
2020-06-03 15:36:47 -04:00 |
|
Isaac Connor
|
02bf85bb34
|
Merge pull request #2950 from roddone/scale_to_fit_watchview
Fix the scale to fit option that is not persisted on page refresh
|
2020-06-02 12:53:50 -04:00 |
Romain ODDONE
|
a9c52a21ec
|
call to changeScale() on page init when "scale to fit" is selected
|
2020-06-02 17:25:07 +02:00 |
|
Isaac Connor
|
51adf56130
|
Merge pull request #2948 from kstolp/fix-detaint-update-script
Detaint mysql commands in update script
|
2020-06-02 09:02:50 -04:00 |
Kevin Stolp
|
0e6ff1ad09
|
Detaint mysql commands in update script
|
2020-06-01 22:54:29 -07:00 |
|
Isaac Connor
|
a7ef8e3dc8
|
detaint command before performing backup. Fixes #2945
|
2020-05-29 14:53:42 -04:00 |
|
Isaac Connor
|
20870e22fa
|
fix eslint errors
|
2020-05-29 13:28:33 -04:00 |
|
Isaac Connor
|
58a015e20a
|
fix use of printMsg
|
2020-05-29 12:20:39 -04:00 |
|
Isaac Connor
|
bd287d7c7c
|
Fix segfault when timestamp contains an unimplemented character. Fixes #2943
|
2020-05-29 11:45:38 -04:00 |
|
Isaac Connor
|
2637c887f8
|
Fix segfault when timestamp contains an unimplemented character. Fixes #2943
|
2020-05-29 11:44:34 -04:00 |
|
Romain ODDONE
|
8121787ee6
|
make monitors table (console view) responsive
|
2020-05-27 10:08:08 +02:00 |
|
Isaac Connor
|
eb41e4fb39
|
Fix the array for the de-interlacing options
|
2020-05-24 11:09:13 -04:00 |
|
Isaac Connor
|
85e1dcadf4
|
Fix the array for the de-interlacing options
|
2020-05-24 11:07:52 -04:00 |
|
Isaac Connor
|
e72c357fd0
|
Unable to probe should not be fatal
|
2020-05-23 16:13:48 -04:00 |
|
Isaac Connor
|
a9cec3ebbd
|
spacing
|
2020-05-23 16:13:29 -04:00 |
|
Isaac Connor
|
662b9894bd
|
Don't delete send_image because it is static. Fixes #2923
|
2020-05-23 16:12:55 -04:00 |
|
Isaac Connor
|
d7680e1a44
|
Spacing
|
2020-05-23 10:15:48 -04:00 |
|
Isaac Connor
|
46a13237b5
|
fix eslint errors
|
2020-05-22 09:28:15 -04:00 |
|
Isaac Connor
|
23900cbf01
|
fix
|
2020-05-21 13:34:09 -04:00 |
|
Isaac Connor
|
59c08410c1
|
Put the size of SHM in the title of the shm space used element
|
2020-05-21 13:32:33 -04:00 |
|
Isaac Connor
|
2c347d0518
|
Bump version to 1.34.15 for release
|
2020-05-20 10:41:22 -04:00 |
|
Isaac Connor
|
2b60b6b419
|
Add new ONVIF columns present in zm_update-1.35.4.sql
|
2020-05-20 09:50:17 -04:00 |
|
Isaac Connor
|
ce15e1c921
|
remove debug, don't pass element through event handler anymore on layout ddm
|
2020-05-20 09:42:29 -04:00 |
|
Isaac Connor
|
cc04ced406
|
load zmMontageLayout ddm explicitly instead of passing event element
|
2020-05-20 09:42:06 -04:00 |
|
Isaac Connor
|
3faf20516f
|
add changeInterface handler
|
2020-05-19 16:58:45 -04:00 |
|
Isaac Connor
|
074e270e79
|
populate network interfaces list, rescan on change.
|
2020-05-19 16:58:26 -04:00 |
|
Isaac Connor
|
cc01a04efc
|
remove debug, don't pass element through event handler anymore on layout ddm
|
2020-05-19 16:57:45 -04:00 |
|
Isaac Connor
|
270ab36ff4
|
load zmMontageLayout ddm explicitly instead of passing event element
|
2020-05-19 16:56:58 -04:00 |
|
Isaac Connor
|
b99059638a
|
Use plural soap versions
|
2020-05-18 17:57:40 -04:00 |
|
Isaac Connor
|
3c2e26ac32
|
Merge branch 'release-1.34'
|
2020-05-15 16:02:29 -04:00 |
|
Isaac Connor
|
4dc693022e
|
Failure to parse output shouldn't be fatal. Just skp to the next instead. Use json_encode instead of serialize
|
2020-05-15 16:02:19 -04:00 |
|
Isaac Connor
|
ce9e2c8b27
|
Merge branch 'release-1.34'
|
2020-05-15 11:53:09 -04:00 |
|
Isaac Connor
|
9ea1c637f9
|
Remove debug Exiting message
|
2020-05-15 11:48:41 -04:00 |
|
Isaac Connor
|
6bb2c09a72
|
Merge branch 'release-1.34'
|
2020-05-15 11:41:34 -04:00 |
|
Isaac Connor
|
f79a17f302
|
Bump version to 1.34.14 for release
|
2020-05-15 11:35:59 -04:00 |
|
Isaac Connor
|
c4c4c5bcbf
|
fix Crud submodule version
|
2020-05-15 11:34:34 -04:00 |
|
Isaac Connor
|
424a4ed0b1
|
add onclick to div.zoom
|
2020-05-15 11:34:23 -04:00 |
|
Isaac Connor
|
0dd426d64c
|
handle range being set to an empty value. Fixes zoom out on timeline. Fix on-click to data-on-click
|
2020-05-15 11:33:10 -04:00 |
|
Isaac Connor
|
94b29c6c7a
|
replace inline javascript in timeline zoom
|
2020-05-15 10:44:48 -04:00 |