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
|
d9cd1dad1a
|
Merge pull request #2774 from connortechnology/fix_2772
dirty fix filtering Monitors by GroupId.
|
2019-12-20 14:58:49 -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
|
a84031f819
|
TEXT fields cannot have default values
|
2019-12-19 09:25:22 -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
|
5e4c3e1edb
|
Merge pull request #2780 from connortechnology/fix_2771
fix #2771.
|
2019-12-15 15:32:42 -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
|
16a73d6d5a
|
don't seek back when not neccesary
|
2019-12-13 18:12:33 -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
|
5fcd6361bc
|
fix segfault reading frames for .mp4 in zms
|
2019-12-13 17:47:18 -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
|
c6813fecd5
|
handle new values for Orientation enum. Spacing, quotes. Handle uppercase HTTP in ControlAddress.
|
2019-12-10 10:14:32 -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
|
2aef547f37
|
add changelog about bump to 1.33.15
|
2019-12-08 11:01:46 -05:00 |
Isaac Connor
|
86fc852621
|
bump version in zoneminder.spec
|
2019-12-08 10:59:50 -05:00 |
Isaac Connor
|
e421866c50
|
Merge pull request #2776 from connortechnology/fixes_for_php7.4
Test for null in user before testing for access in CanEdit et all
|
2019-12-07 12:41:42 -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
|
957d34e9a8
|
Merge pull request #2775 from connortechnology/fixes_for_php7.4
Apply relevant changes to deal with php7,4 deprecations
|
2019-12-07 11:46:41 -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
|
bda4e95c7a
|
Add irc to badges
|
2019-12-06 17:51:06 -05:00 |
Isaac Connor
|
3f8092a430
|
Add funding.yml
|
2019-12-06 17:25:41 -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 |