Isaac Connor
9dd0f29e88
Merge branch 'storageareas' into tesla
2017-11-22 11:41:11 -08:00
Isaac Connor
11449b77a9
add debugging. increase concurrency of request queue
2017-11-22 11:46:24 -05:00
Isaac Connor
c284078db6
upgrade mootools to 1.6.0
2017-11-22 11:46:02 -05:00
Isaac Connor
fe42eed1ea
cannot unlink the lock file, it has to stick around.
2017-11-22 11:43:13 -05:00
Isaac Connor
cd1d2e1721
lots more debugging. re-add status update command on failure
2017-11-22 01:18:07 -05:00
Isaac Connor
d35edf29c6
bump version
2017-11-22 00:00:30 -05:00
Isaac Connor
095e1ecadb
remove extra ), add AnalysisFPS and CaptureFPS
2017-11-21 23:58:13 -05:00
Isaac Connor
e2aa278d78
add SaveJPEGs
2017-11-21 23:57:44 -05:00
Isaac Connor
3af52256b8
turn down debug
2017-11-21 23:57:34 -05:00
Isaac Connor
4d758b7ce9
debugging
2017-11-21 23:57:13 -05:00
Isaac Connor
ebe3073c59
only update fps if we have an image capture
2017-11-21 23:57:01 -05:00
Isaac Connor
a1fe0c4de3
store the value of saveJpegs in the event
2017-11-21 23:56:22 -05:00
Isaac Connor
bf6312a8ec
put back zma
2017-11-21 23:56:05 -05:00
Isaac Connor
752990bb0f
improve zms logging
2017-11-21 23:55:53 -05:00
Isaac Connor
e617ffca2d
can't use BASE_URL since it will be empty. Have to construct a full URL when using MIN_STREAMING_PORT
2017-11-21 21:00:27 -05:00
Isaac Connor
8b49a475d4
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-11-21 19:55:48 -05:00
Isaac Connor
489d3ba6ed
Merge ../ZoneMinder.master into storageareas
2017-11-21 12:23:17 -05:00
Isaac Connor
13098c92d2
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-11-21 11:54:06 -05:00
Isaac Connor
9e12830bf5
add a test for devscripts being installed.
2017-11-21 11:53:53 -05:00
Isaac Connor
d1c7b19724
Merge pull request #52 from digital-gnome/dvrControlsFix
...
Fix bad copy
2017-11-21 10:41:19 -05:00
digital-gnome
e14c21fdbe
Fix dark theme archive highlight
...
Another bad copy
2017-11-21 10:37:09 -05:00
digital-gnome
5f0d1b4720
Fix bad copy
2017-11-21 10:28:27 -05:00
Isaac Connor
8d43dbed11
Merge pull request #47 from digital-gnome/LookandFeel
...
Lookand feel
2017-11-20 22:30:09 -05:00
digital-gnome
ff7e104f1b
Merge fix
...
This editor is fun!
2017-11-20 20:42:28 -05:00
digital-gnome
095d959ed0
Merge branch 'storageareas' into LookandFeel
2017-11-20 20:24:27 -05:00
Isaac Connor
6a3e4b84b2
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-11-20 20:22:11 -05:00
Isaac Connor
6eb542f0e2
Merge branch 'storageareas' into LookandFeel
2017-11-20 20:19:27 -05:00
Isaac Connor
12b47cbfe4
Merge pull request #51 from digital-gnome/storageareasFixes
...
Minor UI fixes
2017-11-20 20:15:32 -05:00
digital-gnome
b655689f47
Fix cache_bust
...
Cache busting was preventing changing css due to leaving symlinks behind. Adding the css name to each symlink prevents the need for a forced refresh since mtime is the same on unchanged files but filename does not change between css sets.
2017-11-20 12:27:20 -05:00
Isaac Connor
dae2a6ae0a
fixup the .postinst file which got some duplicate lines
2017-11-20 11:56:05 -05:00
Isaac Connor
95c19fa674
Make zmaudit check for a pid file and not running if it exists
2017-11-20 11:55:42 -05:00
digital-gnome
b58efe6a36
Fix classic/dark dvr buttons centering
2017-11-20 09:45:14 -05:00
digital-gnome
73d6b0e198
Fix sidebar in dark theme
...
Sidebar in dark theme had a scrollbar when main content was shorter than menu content
2017-11-19 09:14:19 -05:00
Ognyan Bankov
ded6b1864a
2006 support floureon 1080p 18x 30x ( #2007 )
...
* perl control script for Fluoreon 1080p
* DB update for Floureon cameras support
2017-11-18 19:02:23 -05:00
Isaac Connor
64816aa005
fixes from cppcheck.
2017-11-18 16:00:10 -05:00
digital-gnome
d8af654338
Fix dvrControls on watch view
2017-11-18 14:05:11 -05:00
Isaac Connor
1abcb19851
add Copy routing
2017-11-18 09:45:54 -05:00
Isaac Connor
7d77cd75fe
eliminate redundant code and memleak
2017-11-18 09:45:47 -05:00
Isaac Connor
09a715a99f
prevent a warning
2017-11-18 09:41:37 -05:00
digital-gnome
c7ecb71810
Fix progressbar on short events
...
Fixes rounding errors at the end of events due to zms only returning integers. Especially noticable on short events.
2017-11-17 22:29:10 -05:00
digital-gnome
84403f18a0
Revert dvrControls to class
...
Since dvrControls only occurs once now we can leave it as id.
2017-11-17 12:46:08 -05:00
Isaac Connor
159c0a7165
moer cppcheck fixes
2017-11-17 07:52:26 -05:00
Isaac Connor
22ff831859
more cppcheck recommendations
2017-11-16 21:21:56 -05:00
digital-gnome
64346a031d
alarmCues to status.php
...
Switched alarm cues from API to ajax/status.php. Less overhead due to only requesting the information it needs and avoids a weird problem with authentication after sitting logged in for hours.
2017-11-16 21:03:03 -05:00
Isaac Connor
0318fb54a6
add missing initializers
2017-11-16 18:23:02 -05:00
digital-gnome
617a92e33e
Re-Add streamstatus pause
...
Handles when stream is paused from zms side.
2017-11-16 16:21:17 -05:00
Andrew Bauer
b918a7be10
add support for fedora 27
2017-11-16 13:42:38 -06:00
digital-gnome
6d02c88db9
Don't round percentage in bulkframes
...
Gives more accurate frame delta.
2017-11-16 12:48:04 -05:00
Isaac Connor
1686584908
more cppcheck fixes
2017-11-16 09:19:27 -05:00
Isaac Connor
a956ffe7b3
add Copy and =operators to satisfy cppcheck
2017-11-16 09:15:04 -05:00