Isaac Connor
|
e163a3c93a
|
spacing more debug
|
2020-09-25 16:20:19 -04:00 |
|
Isaac Connor
|
f18cd57221
|
spacing more debug
|
2020-09-25 16:19:52 -04:00 |
|
Isaac Connor
|
d21c04e5dc
|
add Debug
|
2020-09-25 16:19:31 -04:00 |
|
Isaac Connor
|
c0ab8bf90d
|
Merge branch 'master' into zma_to_thread
|
2020-08-07 17:53:32 -04:00 |
|
Isaac Connor
|
5fb56c9f57
|
Merge branch 'master' into zma_to_thread
|
2020-08-07 17:52:43 -04:00 |
Andrew Bauer
|
98f315951e
|
Merge pull request #3003 from marillat/patch-1
Don't prefix manpage with zoneminder-
|
2020-08-07 12:34:30 -07:00 |
|
Andrew Bauer
|
ef37d9441d
|
remove i386 builds
|
2020-08-07 14:29:37 -05:00 |
|
Andrew Bauer
|
f43003a98b
|
need epel-rpm-macros on rhel for new cmake macros
|
2020-08-07 13:44:20 -05:00 |
|
Andrew Bauer
|
7d14f2a727
|
Update .travis.yml
|
2020-08-07 10:55:15 -05:00 |
|
Isaac Connor
|
0d8e5aa2be
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-07 09:53:50 -04:00 |
|
Isaac Connor
|
da757d075b
|
Only save the DiskSpace on completed events. Fixes #3007
|
2020-08-07 09:53:35 -04:00 |
dmo
|
ed496e74fc
|
Update CMakeLists.txt
|
2020-08-07 07:54:58 +02:00 |
|
Andrew Bauer
|
10a4929f75
|
disable LTO on redhat builds
|
2020-08-06 14:36:54 -05:00 |
|
Isaac Connor
|
5a34bb4571
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-06 12:25:00 -04:00 |
|
Isaac Connor
|
fc5fabf1c5
|
fix zone editing globals and inputs being too big
|
2020-08-06 12:24:51 -04:00 |
|
Isaac Connor
|
a19990f4d7
|
Merge branch 'release-1.34'
|
2020-08-06 11:57:35 -04:00 |
|
Andrew Bauer
|
fce0dc86c1
|
remove f30 support, add f32
|
2020-08-06 09:51:27 -05:00 |
|
Isaac Connor
|
6b9ffb505d
|
Bump version to 1.34.18 for Rrelease
|
2020-08-06 10:38:39 -04:00 |
|
Isaac Connor
|
3242ce6ec9
|
Handle backticks in matches sort fields. Fixes regression in 1.34.17
|
2020-08-06 10:37:56 -04:00 |
|
Isaac Connor
|
302189a65e
|
Don't use camera->LineSize when allocating shared images. It doesn't work because other processes don't know about it.
|
2020-08-06 10:11:00 -04:00 |
|
Isaac Connor
|
ef2ad12846
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-05 20:00:45 -04:00 |
|
Isaac Connor
|
ddeef6f031
|
Fix globals and a Fatal without ZM\ prefix
|
2020-08-05 20:00:39 -04:00 |
|
Isaac Connor
|
cc9413b44b
|
replace python=sphinx with sphinx-doc in depends for ubuntu 2004
|
2020-08-05 20:00:25 -04:00 |
Isaac Connor
|
4d4fab46d6
|
Spacing, use FFMpegInit instead of deprecated ffmpeg calls
|
2020-08-05 19:17:00 -04:00 |
|
Isaac Connor
|
76e0d155d3
|
declare globals
|
2020-08-05 19:15:01 -04:00 |
|
dmo
|
c102c35c42
|
Don't prefix manpage with zoneminder-
|
2020-08-05 23:56:30 +02:00 |
|
Isaac Connor
|
b6463c6917
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-05 11:33:28 -04:00 |
|
Isaac Connor
|
b867d0c463
|
Fix image copy when line sizes are not the same.
|
2020-08-05 11:33:22 -04:00 |
|
Andrew Bauer
|
3ba8ad579e
|
fix pod2man out-of-source builds
|
2020-08-04 21:18:37 -05:00 |
|
Andrew Bauer
|
92cc03dbe8
|
fix pod2man out-of-source builds
|
2020-08-04 21:07:49 -05:00 |
|
Isaac Connor
|
90671cd4e5
|
Add missing globals
|
2020-08-04 18:07:01 -04:00 |
|
Isaac Connor
|
97096d87f9
|
Add mx-2 classes to be consistent
|
2020-08-04 18:06:49 -04:00 |
|
Isaac Connor
|
5b8ff10a34
|
style the storage dropdown better using css. rename it from dropdown01 to dropdown_storage. Put the text-warning class on the a content in the dropdown instead of the dropdown nav-item so that it takes effect. Rename Stor to Storage
|
2020-08-04 17:53:39 -04:00 |
|
Isaac Connor
|
1ab828c110
|
Add globals
|
2020-08-04 17:35:52 -04:00 |
|
Isaac Connor
|
dd627d9234
|
Update cycle monitorlist sidebar to bootstrap4
|
2020-08-04 17:35:41 -04:00 |
|
Isaac Connor
|
e5513bc7a4
|
Add setting Name and Path
|
2020-08-04 17:35:16 -04:00 |
|
Isaac Connor
|
ba4d6dff64
|
Add globals definitions
|
2020-08-04 17:05:58 -04:00 |
|
Isaac Connor
|
9a06d6cab6
|
Fix some spacing
|
2020-08-04 17:05:44 -04:00 |
|
Isaac Connor
|
79c9671ef2
|
Use & instead of & in urls
|
2020-08-04 17:05:33 -04:00 |
|
Isaac Connor
|
c0f21ab55d
|
Fix globals
|
2020-08-04 16:36:24 -04:00 |
|
Isaac Connor
|
d7de4768d7
|
Fix use of is_callable
|
2020-08-04 16:36:04 -04:00 |
|
Isaac Connor
|
82542c569c
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-04 10:47:41 -04:00 |
|
Isaac Connor
|
6e9559df53
|
Put xhtmlHeaders in an ob_start ob_get_clean section so that calls to open session in view js php files don't cause a problem. Basically delay output. Fixes problems with logging in redirect. Also need to global cspNonce since we use it.
|
2020-08-04 10:47:37 -04:00 |
|
Andrew Bauer
|
9e03827fea
|
rpm specfile - use new cmake macros for f33 compat
|
2020-08-04 09:38:52 -05:00 |
|
Andrew Bauer
|
a575b16278
|
set a target to about menu items
|
2020-08-03 15:45:27 -05:00 |
|
Andrew Bauer
|
8d9410d510
|
spelling
|
2020-08-03 15:38:02 -05:00 |
|
Andrew Bauer
|
9d88f8ee73
|
implement zm about menu
|
2020-08-03 15:22:46 -05:00 |
|
Andrew Bauer
|
ab9a135759
|
fix inability to stop zm from the web console
|
2020-08-03 12:10:34 -05:00 |
|
Isaac Connor
|
283d8557e6
|
remove the extra(globals). There are a LOT of globals. WE don't seem to actually use any in this function.
|
2020-08-03 12:50:36 -04:00 |
|
Andrew Bauer
|
a3e6fe5522
|
make the eslint nanny happy
|
2020-08-03 11:47:31 -05:00 |