Isaac Connor
|
2f5caf2bb5
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-01-10 17:21:10 -05:00 |
|
Isaac Connor
|
5ee0158735
|
Set defaults for vars == ''
|
2020-01-10 16:42:41 -05:00 |
|
Isaac Connor
|
f61f6eaf7d
|
remove line cutnpasted erroneously
|
2020-01-10 12:45:47 -05:00 |
|
Isaac Connor
|
d433590f74
|
use find_one in stead of new to use Cached Server
|
2020-01-10 12:45:30 -05:00 |
|
Isaac Connor
|
ef4ecd40fb
|
Set defaults before saving Objects
|
2020-01-10 12:44:59 -05:00 |
Alex Porosanu
|
28a4bef6ba
|
fix tar invocation for *BSD platforms
"--xform" switch is not supported by tar on BSD platforms i.e. *BSD,
MacOS, etc. As such, use "-s" switch on these platforms, with a
similar regexp.
|
2020-01-09 22:03:02 +02:00 |
Andrew Bauer
|
f13a7199e1
|
fix eslint
|
2020-01-07 21:53:55 -06:00 |
|
Isaac Connor
|
c64de372a7
|
when auth_hash changes, update various CmdParms
|
2020-01-07 17:08:57 -05:00 |
|
Isaac Connor
|
0571909d05
|
add remote_IP to log entries on php side
|
2020-01-07 17:08:29 -05:00 |
|
Isaac Connor
|
1865df3fe0
|
remove some debug, add some parenthesis to ensure logic works as intended
|
2020-01-07 17:08:07 -05:00 |
|
Isaac Connor
|
61bc0ddd0a
|
add missing t and merge some lines
|
2020-01-07 11:01:53 -05:00 |
|
Isaac Connor
|
2f1b725ee4
|
quote SQL for mysql8
|
2020-01-07 11:01:02 -05:00 |
|
Isaac Connor
|
7535769e4b
|
controlcap needs to be larger
|
2020-01-05 17:34:40 -05:00 |
|
Isaac Connor
|
71581831b5
|
fix problem with the clone button material icon. Apparently file_copy doesn't work, so use content_copy instead despite it not being listed in the material icons
|
2020-01-05 17:34:27 -05:00 |
|
Isaac Connor
|
6ac26ec1aa
|
quotes
|
2020-01-05 17:33:53 -05:00 |
|
Isaac Connor
|
c3641df531
|
spaces
|
2020-01-05 17:30:06 -05:00 |
|
Isaac Connor
|
00f8a450de
|
spaces and quotes
|
2020-01-05 14:59:25 -05:00 |
|
Isaac Connor
|
7fdf6165d5
|
Fix case in var name
|
2020-01-03 17:08:11 -05:00 |
|
Isaac Connor
|
c8e39e2418
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-01-03 16:35:15 -05:00 |
|
Isaac Connor
|
e951b0af1c
|
add code to set default value for checkboxes
|
2020-01-03 16:35:04 -05:00 |
|
Isaac Connor
|
0a495395b0
|
Restore Gain tab
|
2020-01-03 16:34:46 -05:00 |
|
Isaac Connor
|
f572c4092a
|
add checks for Zoom, Focus, White, Iris movement types
|
2020-01-03 15:58:57 -05:00 |
|
Isaac Connor
|
158e26bb25
|
split long lines
|
2020-01-03 15:58:02 -05:00 |
|
Isaac Connor
|
c4aaa33bea
|
add widths for number inputs on controlcap view
|
2020-01-03 15:57:51 -05:00 |
|
Isaac Connor
|
0b3776dbf0
|
change text inputs to number inputs, cleanups
|
2020-01-03 15:57:29 -05:00 |
Isaac Connor
|
89844f72f4
|
Merge pull request #2790 from pliablepixels/jwt-token-duration
fix JWT access token always being 1 hr
|
2020-01-02 17:22:37 -05:00 |
|
Isaac Connor
|
d42e9beddc
|
Add warnings when the type of movement is not selected
|
2020-01-02 17:03:52 -05:00 |
|
Isaac Connor
|
e9815bf9c7
|
add ZM Namespace to Error calls
|
2020-01-02 16:54:50 -05:00 |
|
Isaac Connor
|
3cfc1a0a6d
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-01-02 16:45:39 -05:00 |
Pliable Pixels
|
399508b211
|
fix JWT access token always being 1 hr
|
2020-01-02 10:25:48 -05:00 |
|
Isaac Connor
|
60d45d967f
|
test for existence of selected checkboxes in post data because if none are selected, the array won't exist
|
2020-01-02 10:17:07 -05:00 |
Andrew Bauer
|
98f7fb63b9
|
fix eslint errors
|
2019-12-31 19:24:51 -06:00 |
|
Isaac Connor
|
6a39893c1d
|
include i elements in data-on-click
|
2019-12-31 19:11:14 -05:00 |
|
Isaac Connor
|
714d304528
|
Change WebColour to a colour selector input and add a random colour icon. Select a random colour on new Monitor creation
|
2019-12-31 19:10:29 -05:00 |
|
Isaac Connor
|
77cfb7c190
|
fix spacing
|
2019-12-31 12:42:49 -05:00 |
|
Isaac Connor
|
2c76c12664
|
Fix export to include files when using DEEP scheme. Also make it more efficient
|
2019-12-30 22:18:55 -05:00 |
|
Andrew Bauer
|
2301103da5
|
use small, non-zero values, for image buffer & pre & post buffers
|
2019-12-28 09:49:42 -06:00 |
|
Isaac Connor
|
845f35fe00
|
Fix cases of check before creating dirs. Add chmod so they are only readable by web user. Fix MonitorName => Monitor->Name()
|
2019-12-26 15:57:25 -05:00 |
|
Isaac Connor
|
66ec110b02
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-12-26 15:21:33 -05:00 |
|
Isaac Connor
|
1977e48ddd
|
DefaultScale is a member of the Monitor, not the event
|
2019-12-26 15:21:27 -05:00 |
|
Isaac Connor
|
9e43e06a55
|
Add empty array value for terms when there isn't any to get rid of warning when loading all events
|
2019-12-26 11:22:42 -05:00 |
|
Isaac Connor
|
76b54a468f
|
use left join instead of inner join when listing monitors
|
2019-12-22 18:43:53 -05:00 |
|
Isaac Connor
|
42a724891b
|
spacing
|
2019-12-20 16:11:38 -05:00 |
|
Isaac Connor
|
63d20a1514
|
Move hidden inputs to top of form
|
2019-12-20 16:11:24 -05:00 |
|
Isaac Connor
|
5a45835006
|
break up long lines
|
2019-12-20 16:11:10 -05:00 |
|
Isaac Connor
|
23dde04725
|
remove timeout on changing runstate.
|
2019-12-20 16:10:30 -05:00 |
|
Isaac Connor
|
fc017893bc
|
Sort the log filtering options. Fixes #2756
|
2019-12-20 16:09:34 -05:00 |
|
Isaac Connor
|
d25a91ad13
|
Make Group containable
|
2019-12-20 14:56:14 -05:00 |
|
Isaac Connor
|
bcda92058e
|
proper way to make cakephp filter by group. Make Group containable, always add the join
|
2019-12-20 14:56:01 -05:00 |
|
Isaac Connor
|
0142c71c85
|
Merge branch 'master' into fix_2772
|
2019-12-20 11:02:27 -05:00 |
|
Isaac Connor
|
3c59be9616
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-12-19 09:24:44 -05:00 |
|
Isaac Connor
|
958a6b8218
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder
|
2019-12-18 19:06:19 -05:00 |
|
Isaac Connor
|
67cc9faa8c
|
remove contentForm id from form in state view which isn't used and conflicts if it is used anywhere else.
|
2019-12-18 19:05:06 -05:00 |
|
Isaac Connor
|
d21fa5c48a
|
Do not set defaults in Object->set(). This allows us to set an empty timestamp.
|
2019-12-18 19:03:37 -05:00 |
|
Isaac Connor
|
34354f5871
|
Add Notes field to monitors to store random info in. Bump version to 1.33.16. use htmlSElect for savejpegs. Move storage area under Storage tab.
|
2019-12-18 12:13:00 -05:00 |
|
Isaac Connor
|
3b12b67b4a
|
fix eslint
|
2019-12-18 10:40:51 -05:00 |
|
Isaac Connor
|
5f006421cc
|
fix #2771. Correct relationship from hasMany to hasAndBelongsToMany for Monitors in Group Modelel. Use save Assiociated in Controller, and add code to handle backwards compatibility by turning MonitorIds into the appropriate Monitor array
|
2019-12-15 15:31:40 -05:00 |
|
Isaac Connor
|
2a4d06f93b
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-12-15 10:35:56 -05:00 |
|
Isaac Connor
|
4d9d4ba957
|
Do not allow deletion of archived events.
|
2019-12-15 10:35:43 -05:00 |
|
Isaac Connor
|
689956bba7
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder
|
2019-12-13 17:49:00 -05:00 |
|
Isaac Connor
|
5b7efb2b33
|
fix mouseover streaming in chrome when adblocker disabled
|
2019-12-13 17:48:22 -05:00 |
|
Isaac Connor
|
18ed90d147
|
remove second hit to db to load storage areas with no serverid
|
2019-12-13 17:47:51 -05:00 |
|
Isaac Connor
|
b24e912050
|
Use ZM\Server::find_one for loading server so that it gets cached. Use a single regexp to determine config line validity instead of two for efficiency
|
2019-12-13 17:46:56 -05:00 |
|
Isaac Connor
|
0dbc1ef15c
|
Use multiport when talking monitor stream on montage
|
2019-12-13 11:51:55 -05:00 |
|
Isaac Connor
|
0bbbbb302e
|
add default for Units in new zone
|
2019-12-13 11:51:07 -05:00 |
|
Isaac Connor
|
d2a23e4822
|
add possing port to Monitor->UrlToIndex
|
2019-12-13 11:50:11 -05:00 |
|
Isaac Connor
|
bedc61a347
|
handle dbFetchNext on null result more gracefully
|
2019-12-13 11:49:55 -05:00 |
|
Isaac Connor
|
ea89ebf150
|
more mysql8 fixes
|
2019-12-08 21:33:29 -05:00 |
|
Isaac Connor
|
3bd0525e64
|
escape column names for mysql8
|
2019-12-08 14:27:07 -05:00 |
|
Isaac Connor
|
ed417a49b4
|
increase logspopup width to eliminate scrollbars
|
2019-12-08 11:21:38 -05:00 |
|
Isaac Connor
|
0de6396a5b
|
Test for null in user before testing for access in CanEdit et all
|
2019-12-07 12:39:28 -05:00 |
|
Isaac Connor
|
4632bbd124
|
Apply relevant changes to deal with php7,4 deprecations
|
2019-12-07 11:45:32 -05:00 |
|
Isaac Connor
|
cc6d40d67e
|
Missing ->
|
2019-12-07 10:38:51 -05:00 |
|
Isaac Connor
|
e123e689ca
|
fix errors when ['id'] does not exist, and move the definition of values up because we use it outside the block it is defined in
|
2019-12-06 14:32:59 -05:00 |
|
Isaac Connor
|
4b786eaad5
|
fix errors when ['id'] does not exist, and move the definition of values up because we use it outside the block it is defined in
|
2019-12-06 14:31:06 -05:00 |
|
Isaac Connor
|
eee3729b85
|
dirty fix filtering Monitors by GroupId. Change occurrences of GroupId to ' ' as that is what the key is in conditions. Please note that other operators like != won't work.
|
2019-12-04 22:23:55 -05:00 |
|
Isaac Connor
|
df9f6103e4
|
fix syntax error
|
2019-12-04 09:00:20 -05:00 |
Isaac Connor
|
78912584e1
|
re-arrange code to hopefully get rid of syntax error reported by some people
|
2019-12-04 07:10:33 -05:00 |
|
Isaac Connor
|
3af6358314
|
fix & to &
|
2019-12-02 15:49:49 -05:00 |
|
Isaac Connor
|
72cb5bd1bb
|
add missing </select>
|
2019-12-02 15:49:42 -05:00 |
|
Isaac Connor
|
09faa0a731
|
fix & to &
|
2019-12-02 15:49:32 -05:00 |
|
Isaac Connor
|
b686649589
|
fix & instead of &.
|
2019-12-02 15:34:31 -05:00 |
|
Isaac Connor
|
8bf74d2f35
|
fix & instead of &.
|
2019-12-02 15:34:23 -05:00 |
|
Isaac Connor
|
24022d157d
|
use & instead of &. Put inputs out of table where they belong
|
2019-12-02 15:33:58 -05:00 |
|
Isaac Connor
|
9f49e4f367
|
make Mark column text-align left so that checkboxes line up
|
2019-12-02 15:07:35 -05:00 |
|
Isaac Connor
|
f7e01aa999
|
switch to material icon for dot
|
2019-12-02 14:31:05 -05:00 |
|
Isaac Connor
|
cf35db120d
|
change to material icons, fix missing div
|
2019-12-02 14:21:51 -05:00 |
|
Isaac Connor
|
8e645e45e1
|
fix selecting Monitors by passing MonitorId as MonitorId[]
|
2019-12-02 14:21:25 -05:00 |
|
Isaac Connor
|
b70b75421b
|
quotes and spacing
|
2019-12-02 14:18:27 -05:00 |
|
Isaac Connor
|
16698b8a82
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-12-02 13:42:07 -05:00 |
|
Isaac Connor
|
9d0a416311
|
remove debugging code
|
2019-12-02 13:41:42 -05:00 |
|
Isaac Connor
|
c9a324b7b3
|
improve the configureExportButton to look at specific inputs instead of just counting checkboxes
|
2019-12-02 13:40:02 -05:00 |
|
Isaac Connor
|
09a6e06132
|
change layout from a table to something more bootstrappy. Use the new html_radio function generate the radio buttons for Format and Compression. Remove the data-on-click from the export button because we added setting up the click event in the javascript already
|
2019-12-02 13:38:23 -05:00 |
|
Isaac Connor
|
2713565c84
|
using bootstrap layout instead of a table, so text-align: right
|
2019-12-02 13:34:53 -05:00 |
|
Isaac Connor
|
80d0d037b5
|
add a style for inline form not supported by bootstrap 3
|
2019-12-02 13:34:11 -05:00 |
|
Isaac Connor
|
d39193cb6b
|
convert flip to material icons
|
2019-12-02 12:33:13 -05:00 |
|
Isaac Connor
|
576dd23907
|
test for existence of filter in query
|
2019-12-02 12:30:15 -05:00 |
|
Isaac Connor
|
355fceccb4
|
test for existence of default
|
2019-12-02 12:30:03 -05:00 |
|
Isaac Connor
|
caefcc2f7a
|
increase size of export popup
|
2019-12-02 12:17:33 -05:00 |
|
Isaac Connor
|
03d7bcdd11
|
better debug logging when on-click-this function isn't defined
|
2019-12-02 12:17:18 -05:00 |