489d3ba6ed
Merge ../ZoneMinder.master into storageareas
2017-11-21 12:23:17 -05:00
13098c92d2
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-11-21 11:54:06 -05:00
9e12830bf5
add a test for devscripts being installed.
2017-11-21 11:53:53 -05:00
d1c7b19724
Merge pull request #52 from digital-gnome/dvrControlsFix
...
Fix bad copy
2017-11-21 10:41:19 -05:00
e14c21fdbe
Fix dark theme archive highlight
...
Another bad copy
2017-11-21 10:37:09 -05:00
5f0d1b4720
Fix bad copy
2017-11-21 10:28:27 -05:00
8d43dbed11
Merge pull request #47 from digital-gnome/LookandFeel
...
Lookand feel
2017-11-20 22:30:09 -05:00
ff7e104f1b
Merge fix
...
This editor is fun!
2017-11-20 20:42:28 -05:00
095d959ed0
Merge branch 'storageareas' into LookandFeel
2017-11-20 20:24:27 -05:00
6a3e4b84b2
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-11-20 20:22:11 -05:00
6eb542f0e2
Merge branch 'storageareas' into LookandFeel
2017-11-20 20:19:27 -05:00
12b47cbfe4
Merge pull request #51 from digital-gnome/storageareasFixes
...
Minor UI fixes
2017-11-20 20:15:32 -05:00
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
dae2a6ae0a
fixup the .postinst file which got some duplicate lines
2017-11-20 11:56:05 -05:00
95c19fa674
Make zmaudit check for a pid file and not running if it exists
2017-11-20 11:55:42 -05:00
b58efe6a36
Fix classic/dark dvr buttons centering
2017-11-20 09:45:14 -05:00
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
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
64816aa005
fixes from cppcheck.
2017-11-18 16:00:10 -05:00
d8af654338
Fix dvrControls on watch view
2017-11-18 14:05:11 -05:00
1abcb19851
add Copy routing
2017-11-18 09:45:54 -05:00
7d77cd75fe
eliminate redundant code and memleak
2017-11-18 09:45:47 -05:00
09a715a99f
prevent a warning
2017-11-18 09:41:37 -05:00
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
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
159c0a7165
moer cppcheck fixes
2017-11-17 07:52:26 -05:00
22ff831859
more cppcheck recommendations
2017-11-16 21:21:56 -05:00
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
0318fb54a6
add missing initializers
2017-11-16 18:23:02 -05:00
617a92e33e
Re-Add streamstatus pause
...
Handles when stream is paused from zms side.
2017-11-16 16:21:17 -05:00
b918a7be10
add support for fedora 27
2017-11-16 13:42:38 -06:00
6d02c88db9
Don't round percentage in bulkframes
...
Gives more accurate frame delta.
2017-11-16 12:48:04 -05:00
1686584908
more cppcheck fixes
2017-11-16 09:19:27 -05:00
a956ffe7b3
add Copy and =operators to satisfy cppcheck
2017-11-16 09:15:04 -05:00
d411ed329b
get rid of mistyped zmaFPS and zmcFPS
2017-11-16 09:14:26 -05:00
e23a12b22f
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-11-16 09:13:51 -05:00
a95a53d6a6
Merge pull request #49 from Toasty27/patch-1
...
Update zm_create.sql.in
2017-11-16 07:21:50 -05:00
bfd28dda71
Update zm_create.sql.in
...
Added missing column `AnalysisFPS`
2017-11-15 17:59:07 -08:00
087a902698
Update zm_create.sql.in
...
The `CaptureFPS` column is missing in the db creation script, causing errors in the Log whenever a monitor is queried.
2017-11-15 17:44:59 -08:00
97be2bf0a3
fix events js vars, eliminating doing the sql query twice
2017-11-15 13:01:07 -05:00
a7b02ea3ba
Fix eventVideo and content div wrapping properly
...
Wrap eventVideo div around both videojs and zms. Consolidate control buttons/status to common set with default values.
2017-11-14 23:04:05 -05:00
d5962b11ff
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-11-14 02:48:38 -05:00
65e7fb0014
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-11-14 02:40:12 -05:00
5717a19215
be able to popup watch view even if the monitor is not running
2017-11-13 20:29:01 -05:00
99802945fe
be able to popup watch view even if the monitor is not running
2017-11-13 20:28:18 -05:00
1632aa7349
fix nvsocket
2017-11-13 14:25:19 -08:00
32a27e468d
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-11-13 11:52:13 -08:00
bc3f169a80
add event_id as a paramteter
2017-11-13 11:51:54 -08:00
878e9e4cde
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-11-13 11:51:01 -08:00
d07f36a7ee
Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas
2017-11-13 10:27:27 -08:00
Isaac Connor
Isaac Connor
digital-gnome
Ognyan Bankov
Andrew Bauer
Daniel Hodgson
Isaac Connor
Isaac Connor
APHW2 MFGENG