Andrew Bauer
|
00cedc92d2
|
fix typo
|
2019-12-28 08:37:16 -06:00 |
|
Andrew Bauer
|
0aa82a74ec
|
remove support for f29 builds
|
2019-12-27 17:13:13 -06:00 |
|
Andrew Bauer
|
276428be59
|
el8 needs php-json
|
2019-12-27 16:39:24 -06:00 |
|
Andrew Bauer
|
77f026a389
|
exclude external-repo.noarch.rpm during deployments
|
2019-12-27 09:12:49 -06:00 |
|
Andrew Bauer
|
28a6e71992
|
deploy raspbian builds to debian target folder
|
2019-12-27 09:04:02 -06:00 |
|
Andrew Bauer
|
3bc1543f9e
|
build rpms on every commit
|
2019-12-26 19:36:33 -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
|
4426546a56
|
Merge pull request #2785 from connortechnology/fix_2784
Add empty array value for terms when there isn't any
|
2019-12-26 11:23:52 -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 |
|
Andrew Bauer
|
5bd353928e
|
update rsync text
|
2019-12-25 09:05:50 -06:00 |
|
Andrew Bauer
|
aa0dc4729b
|
exit immediately if deploy host does not respond
|
2019-12-25 08:45:10 -06:00 |
|
Andrew Bauer
|
73aba586d4
|
move eslint into env matrix + other build tweaks
|
2019-12-25 08:41:53 -06:00 |
|
Andrew Bauer
|
69abf2d314
|
Remove i386 bionic builds
The i386 Bionic container is not ready. This build will be re-enabled when the container is done.
|
2019-12-24 14:26:30 -06:00 |
|
Andrew Bauer
|
0f7fbc8c79
|
use my el-8 container
packpack el-8 container contains a dnf related bug, which causes el8 builds to fail. Switch to a container I built with a workaround.
|
2019-12-24 09:53:56 -06:00 |
|
Andrew Bauer
|
635988f0cc
|
use quotes for correctness
|
2019-12-23 17:13:38 -06:00 |
|
Andrew Bauer
|
f3116589e3
|
replace sshfs with rsync for all deployments
|
2019-12-23 17:08:57 -06:00 |
|
Andrew Bauer
|
8025f8d6eb
|
add support for fedora 31
|
2019-12-23 14:49:25 -06: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
|
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 |