Isaac Connor
3b045f3958
when release is a 1.30, then use the old stable ppa
2019-02-22 10:48:42 -05:00
Isaac Connor
4fb43f5c5d
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2019-02-19 12:58:38 -05:00
Isaac Connor
6d1541a4d2
Merge branch 'fix_privacy_view' into storageareas
2019-02-19 12:57:01 -05:00
Isaac Connor
97a888c0db
get rid of js that just does the form submit. Upgrade the button from an input to a button. Use 0 and 1 instead of accept and decline, which allows us to pre-select the current value of ZM_TELEMETRY_DATA. So that if you had previously declined, you won't accidentally accept. This fixes the reported error that choosing decline would cause the setting to not be saved and the privacy popup to happen again.
2019-02-19 12:54:12 -05:00
Isaac Connor
36c7f7cab5
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2019-02-19 12:06:48 -05:00
Isaac Connor
fbdb5bcb62
Merge branch 'master' into storageareas
2019-02-19 12:06:32 -05:00
Isaac Connor
c626b0fb8e
if adding a closing frame, queue it with the rest of the frames so they get written all at once. Queue 20 frames instead of 10
2019-02-19 12:00:17 -05:00
Isaac Connor
eaa7341935
Add missing / in path to auth.php
2019-02-19 10:07:36 -05:00
Isaac Connor
87988185e5
remove data-on-click-this from markEids[] because we have an onclick bind in initPage
2019-02-19 09:58:03 -05:00
Isaac Connor
5029d7214a
Merge branch 'master' into storageareas
2019-02-18 17:00:45 -05:00
Isaac Connor
4cd3a93e96
add missing /
2019-02-18 16:30:03 -05:00
Isaac Connor
f557df9fc9
remove extra affect
2019-02-17 17:34:38 -05:00
Isaac Connor
c6afe906ac
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-02-17 17:33:28 -05:00
Isaac Connor
9996b3e718
Merge branch 'master' into break_videostorage
2019-02-17 12:10:32 -05:00
j-marz
bd7ce6ba13
fixed more more typo in options_logging userguide ( #2526 )
2019-02-17 11:32:10 -05:00
Mitch Capper
b646284da3
don't quote dbEscape values it will quote it already ( #2529 )
2019-02-17 11:31:28 -05:00
Mitch Capper
04c17283ec
need to prefix with _dir_ otherwise relative to initial script ( #2531 )
2019-02-17 11:31:10 -05:00
Isaac Connor
b7a6aed1cd
Merge branch 'master' into storageareas
2019-02-16 11:51:23 -05:00
Isaac Connor
34873d5636
We must leave ZM_HOME_CONTENT unescaped so that we can insert actual html like image tags
2019-02-16 11:50:09 -05:00
Isaac Connor
baba438ce1
use image_count when reporting earlier than fps_report_interval
2019-02-16 11:49:28 -05:00
Isaac Connor
9656032906
spacing
2019-02-15 17:52:51 -05:00
Isaac Connor
96906734b8
add an audio_fifo to handle input audio < 1024 samples per frame
2019-02-15 17:26:30 -05:00
Isaac Connor
4e463c9354
use swr_convert_frame instead of swr_convert
2019-02-14 17:48:58 -05:00
Isaac Connor
281775cc80
try setting out_frame pts from in_frame
2019-02-14 15:54:47 -05:00
Isaac Connor
9e07d5cd17
try setting out_frame pts from in_frame
2019-02-14 15:54:00 -05:00
Isaac Connor
9ac1f883e9
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2019-02-14 15:41:19 -05:00
Isaac Connor
24845e0457
Merge branch 'master' into storageareas
2019-02-14 15:40:52 -05:00
Isaac Connor
62bf7d54f1
close sth's on Fatal to prevent error message
2019-02-14 15:40:42 -05:00
Isaac Connor
d3a8117385
add missing db update script
2019-02-13 20:38:13 -05:00
Isaac Connor
512a6e19de
bump version
2019-02-13 16:55:55 -05:00
Isaac Connor
419e60e8b4
Allow negative DiskSpace values. Technically shouldn't happen but since we don't have foreign keys yet, it can happen
2019-02-13 16:55:40 -05:00
Isaac Connor
64055ad6d0
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2019-02-13 11:55:23 -05:00
Isaac Connor
b25770a2f0
Merge branch 'master' into storageareas
2019-02-13 11:52:31 -05:00
Isaac Connor
d0745da11c
fix path to Control.php
2019-02-13 11:52:16 -05:00
Isaac Connor
a11349bffe
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2019-02-13 11:38:44 -05:00
Isaac Connor
a41e8a8834
Merge branch 'master' into storageareas
2019-02-13 11:38:38 -05:00
Isaac Connor
42011e96e6
Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas
2019-02-13 11:29:12 -05:00
Isaac Connor
57316aac6e
fix missing negation when executing sql... should be scripts/ZoneMinder/lib/ZoneMinder/Database.pmres
2019-02-13 11:29:07 -05:00
Isaac Connor
1aad1f765d
slep for 1 second if there is an error in capturing
2019-02-13 11:28:18 -05:00
Isaac Connor
400d4dc27e
encode the label on the preset so that weird characters and quotes don't break the button
2019-02-13 11:24:09 -05:00
Isaac Connor
dd641793a2
Merge branch 'improve_session' into storageareas
2019-02-13 11:17:30 -05:00
Isaac Connor
91a280e56e
need to include session.php in auth.php
2019-02-13 11:17:15 -05:00
Steve Gilvarry
924d5235d0
Validate zmu Username and Password lengths ( #2484 )
...
* Validate zmu Username and Password lengths
Ensure user provided values are not larger than allowed and error if
they are, therefore further preventing overflow.
* Check username and password functions for zmu and zms
* Check username and password functions for zmu and zms
2019-02-13 10:40:43 -05:00
Isaac Connor
060751602b
fix missing ;
2019-02-13 10:34:09 -05:00
Isaac Connor
d1b3b23c09
Merge branch 'master' into storageareas
2019-02-13 09:42:03 -05:00
Chris NeJame
f7b31c89ef
Fixes #2375 ( #2376 )
...
* updated docs to include instructions on how to find the loaded PHP config file
* Added note about verifying timezone change
* revert docs back to master branch's content
* added installation guide for Ubuntu 18.04
The only difference between Ubuntu 16.04 and 18.04 is the version of
PHP that comes installed, which changes the location of its config file
* reverting debian instructions to master
2019-02-12 17:56:40 -05:00
Isaac Connor
b6a0e704d2
whitespace, remove xhtml cruft
2019-02-12 16:41:08 -05:00
Isaac Connor
7a8668ea99
whitespace
2019-02-12 16:40:48 -05:00
Isaac Connor
0bfaf87d27
Mostly code style and whitespacing. However, I do setup more values in the output frame when doing audio resampling
2019-02-12 16:40:27 -05:00
Isaac Connor
9a0f3801de
fix + instead of .
2019-02-12 16:25:31 -05:00