Isaac Connor
|
e68bf13a6b
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-06-17 12:50:42 -04:00 |
|
Isaac Connor
|
d3c474fc8b
|
use translate on Show/Hide Zones
|
2020-06-17 12:50:36 -04:00 |
|
Isaac Connor
|
8efe00157d
|
add a User object
|
2020-06-17 12:50:22 -04:00 |
Isaac Connor
|
1a838b1137
|
Merge pull request #2964 from roddone/stream-zoom-accuracy
apply stream scale in zoom coordinates
|
2020-06-17 09:30:52 -04:00 |
Romain ODDONE
|
dcb77cdaea
|
apply stream scale in zoom coordinates
|
2020-06-17 14:46:10 +02:00 |
Isaac Connor
|
aba403e3f2
|
Correct handling of Transport in onvif results
|
2020-06-16 16:48:17 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
ae5116ff9c
|
improve efficiency of outputting device query. The constant strlen's were terrible.
|
2020-06-15 15:29:26 -04:00 |
|
Isaac Connor
|
1b9402239a
|
Add libvncclient0 as an option for jessie
|
2020-06-15 14:59:33 -04:00 |
|
Isaac Connor
|
d984c33b92
|
Replace old message abou ensuring that ZM is stopped with our new one, which only pauses if ZMIS running.
|
2020-06-09 13:36:33 -04:00 |
|
Isaac Connor
|
a2a28d389e
|
Finish exporting and fixing new systemStatus packageControl and daemonControl functions
|
2020-06-09 13:35:52 -04:00 |
|
Isaac Connor
|
5e0f1a03c5
|
Detect if system is running and prompt to stop it before doing the update.
|
2020-06-09 13:19:19 -04:00 |
|
Isaac Connor
|
d4488ac4e1
|
spacing
|
2020-06-09 12:18:29 -04:00 |
|
Isaac Connor
|
58ae7bb342
|
die early if db connection fails
|
2020-06-07 11:57:20 -04:00 |
|
Isaac Connor
|
d59697b9b5
|
fix event->self
|
2020-06-07 11:57:08 -04:00 |
|
Isaac Connor
|
a719565bf3
|
Merge branch 'master' into add_user_to_filters
|
2020-06-05 19:03:23 -04:00 |
|
Isaac Connor
|
198790796d
|
Merge branch 'release-1.34'
plus cleanups in dbConnect
|
2020-06-05 19:02:43 -04:00 |
|
Isaac Connor
|
d0a24ae32b
|
Make all Filters operate on in-progress events
|
2020-06-05 18:01:20 -04:00 |
|
Isaac Connor
|
65d7c9e51d
|
bump version 1.35.5
|
2020-06-05 17:51:06 -04:00 |
|
Isaac Connor
|
caa48e7b80
|
Finish canEdit function
|
2020-06-05 17:50:52 -04:00 |
|
Isaac Connor
|
0905655377
|
Merge branch 'master' into add_user_to_filters
|
2020-06-05 17:08:14 -04:00 |
|
Isaac Connor
|
402ab9ad9f
|
Bump version to 1.34.16 for release
|
2020-06-05 16:38:20 -04:00 |
|
Isaac Connor
|
f71926c736
|
Merge branch 'release-1.34'
|
2020-06-05 10:09:07 -04:00 |
|
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 |