Isaac Connor
|
88ca9816fe
|
handle a profile not being a videoEncoder
|
2019-10-03 17:29:33 -04:00 |
|
Isaac Connor
|
6f5c297265
|
google code style
|
2019-10-03 17:28:57 -04:00 |
|
Isaac Connor
|
c62eff48a7
|
Turn off debugging that prevents results processing
|
2019-10-03 17:28:44 -04:00 |
|
Isaac Connor
|
a7f27dddde
|
quotes and more useful sendCmd debugging.
|
2019-10-03 17:27:46 -04:00 |
|
Isaac Connor
|
714ce0ba60
|
Add coller info to AUTOLOAD error message when PTZ function isn't defined. Provide parent printMsg function.
|
2019-10-03 17:27:16 -04:00 |
|
Isaac Connor
|
17611f2e4b
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-10-02 19:38:21 -04:00 |
Isaac Connor
|
769717b571
|
Merge pull request #2715 from connortechnology/fix_2620
Add delete from logs ajax capability. Make the clear button use it. …
|
2019-10-02 16:43:08 -04:00 |
|
Isaac Connor
|
95615fee35
|
fix eslint
|
2019-10-02 16:42:50 -04:00 |
|
Isaac Connor
|
6b65e9a60c
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-10-02 16:41:20 -04:00 |
|
Isaac Connor
|
7b93a445b8
|
Finish updating the linked Monitors dropdown
|
2019-10-02 15:42:56 -04:00 |
|
Isaac Connor
|
e4b5052fb4
|
Add delete from logs ajax capability. Make the clear button use it. Fixes #2620
|
2019-10-02 15:39:04 -04:00 |
|
Isaac Connor
|
d02aee64e4
|
Add setting of timezone to Options/Config instead of php.ini
|
2019-10-02 09:07:18 -04:00 |
|
Isaac Connor
|
b4d5d92d86
|
Add some non standard resolutions available on some vivotek cameras
|
2019-09-30 15:06:32 -04:00 |
|
Isaac Connor
|
09efbfb4f1
|
Sort groups
|
2019-09-30 15:02:05 -04:00 |
|
Isaac Connor
|
e37870d983
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-09-30 14:43:02 -04:00 |
|
Isaac Connor
|
85b16e89b7
|
Fix groups dropdown
|
2019-09-30 14:42:10 -04:00 |
Andrew Bauer
|
2c22a4727f
|
Update rsync_xfer.sh
|
2019-09-30 10:39:29 -05:00 |
|
Andrew Bauer
|
9ba8f5c7ff
|
Update rsync_xfer.sh
|
2019-09-30 10:31:21 -05:00 |
|
Andrew Bauer
|
90b02beb94
|
fix eslint
|
2019-09-30 09:52:41 -05:00 |
|
Isaac Connor
|
3d6cab8360
|
Must force hash regeneration on login. Old hash may be from different user
|
2019-09-28 17:57:45 -04:00 |
|
Isaac Connor
|
7271151eb0
|
add some more aspect ratios
|
2019-09-28 15:16:25 -04:00 |
|
Isaac Connor
|
0c1635b3b8
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-09-28 14:23:33 -04:00 |
|
Isaac Connor
|
393f0a369c
|
Revamp timeline. Make it handle being full browser width. remove onclicks.
|
2019-09-28 14:23:23 -04:00 |
|
Isaac Connor
|
a2861c1361
|
remove errant (
|
2019-09-28 14:22:40 -04:00 |
|
Isaac Connor
|
ae7644370f
|
quotes
|
2019-09-28 14:14:27 -04:00 |
|
Isaac Connor
|
c24fc6c21f
|
Set Delta to 0 to avoid errors
|
2019-09-28 14:10:11 -04:00 |
|
Isaac Connor
|
deef948964
|
Allow anyone to change their skin
|
2019-09-28 12:58:17 -04:00 |
|
Isaac Connor
|
ec9e94b99d
|
Don't add checkboxes if can't edit groups
|
2019-09-28 12:58:01 -04:00 |
|
Isaac Connor
|
80e3922165
|
add backWindow function to handle back buttons
|
2019-09-28 12:57:43 -04:00 |
|
Isaac Connor
|
30b5612691
|
fix case of sql
|
2019-09-28 12:57:00 -04:00 |
|
Isaac Connor
|
f3f253c083
|
Query was renamed to Query_json
|
2019-09-28 11:55:28 -04:00 |
|
Isaac Connor
|
411807c7b0
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder
|
2019-09-28 10:27:38 -04:00 |
|
Isaac Connor
|
7a3134ae5e
|
Fix restart login in functions. Only start zmc if function is not None and start zma if it isn't None or NoDect. Even if disabled, we still run zma so that we can send it a signal to enable motion detection.
|
2019-09-28 10:26:50 -04:00 |
externo6
|
7479d3f1f1
|
Add LIKE and NOT LIKE to filter options
This is useful for filtering notes.
EG filtering detected objects from zmeventnofification;
WHERE notes LIKE %detect%
WHERE notes NOT LIKE %car%
|
2019-09-28 13:03:16 +01:00 |
|
Isaac Connor
|
8940ca420c
|
Use iconzm docker for disco
|
2019-09-26 17:23:58 -04:00 |
|
Isaac Connor
|
288448a545
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-09-26 16:27:56 -04:00 |
|
Isaac Connor
|
ebcacaa660
|
Use material icons for buttons
|
2019-09-26 16:26:37 -04:00 |
|
Isaac Connor
|
b1bcfe8a9b
|
fix backtrace
|
2019-09-26 16:26:28 -04:00 |
|
Isaac Connor
|
fdaee75310
|
Use material icons for buttons. Hide the stop button because it does nothing.
|
2019-09-26 16:26:18 -04:00 |
|
Isaac Connor
|
e4265bd075
|
spaces
|
2019-09-26 16:13:49 -04:00 |
|
Isaac Connor
|
555f3e9c0d
|
Fix missing semi colon in Content-Security-Policy-Report-Only
|
2019-09-26 13:52:27 -04:00 |
|
Isaac Connor
|
492be7cc33
|
make last_zoom last_scale last_x and last_y members of the StreamBase object instead of static vars so that we can access them in monitorStream
|
2019-09-26 13:51:49 -04:00 |
|
Isaac Connor
|
b787682fa9
|
Fix play from pause when not buffering. When change of zoom, send two paused images so that response is instant. Fix some misplaced line feeds.
|
2019-09-26 13:51:13 -04:00 |
|
Isaac Connor
|
675db328e7
|
enable bionic iconzm docket repo
|
2019-09-25 12:00:32 -04:00 |
|
Isaac Connor
|
1dda79af46
|
remove debug
|
2019-09-25 12:00:00 -04:00 |
|
Isaac Connor
|
61a7c008eb
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-09-25 10:36:52 -04:00 |
|
Isaac Connor
|
84d68f549f
|
enable iconzm docker for stretch
|
2019-09-25 10:36:12 -04:00 |
|
Isaac Connor
|
4deea4c6ab
|
code doc
|
2019-09-25 10:35:57 -04:00 |
|
Isaac Connor
|
2b017f782b
|
Fix missing eid= from View All/View Pages links
|
2019-09-25 10:35:41 -04:00 |
|
Isaac Connor
|
bcb8389923
|
spaces
|
2019-09-25 10:16:27 -04:00 |