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
Isaac Connor
d411ed329b
get rid of mistyped zmaFPS and zmcFPS
2017-11-16 09:14:26 -05:00
Isaac Connor
e23a12b22f
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-11-16 09:13:51 -05:00
Isaac Connor
a95a53d6a6
Merge pull request #49 from Toasty27/patch-1
...
Update zm_create.sql.in
2017-11-16 07:21:50 -05:00
Daniel Hodgson
bfd28dda71
Update zm_create.sql.in
...
Added missing column `AnalysisFPS`
2017-11-15 17:59:07 -08:00
Daniel Hodgson
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
Isaac Connor
97be2bf0a3
fix events js vars, eliminating doing the sql query twice
2017-11-15 13:01:07 -05:00
digital-gnome
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
Isaac Connor
d5962b11ff
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-11-14 02:48:38 -05:00
Isaac Connor
65e7fb0014
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-11-14 02:40:12 -05:00
Isaac Connor
5717a19215
be able to popup watch view even if the monitor is not running
2017-11-13 20:29:01 -05:00
Isaac Connor
99802945fe
be able to popup watch view even if the monitor is not running
2017-11-13 20:28:18 -05:00
Isaac Connor
1632aa7349
fix nvsocket
2017-11-13 14:25:19 -08:00
Isaac Connor
32a27e468d
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-11-13 11:52:13 -08:00
Isaac Connor
bc3f169a80
add event_id as a paramteter
2017-11-13 11:51:54 -08:00
Isaac Connor
878e9e4cde
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-11-13 11:51:01 -08:00
APHW2 MFGENG
d07f36a7ee
Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas
2017-11-13 10:27:27 -08:00
APHW2 MFGENG
f093cfbcef
add Filtering to monitors index
2017-11-13 10:27:24 -08:00
Isaac Connor
ecd86b3fde
cleanup
2017-11-12 15:18:39 -05:00
Isaac Connor
f476c8f2e5
fixes from cppcheck
2017-11-12 13:25:19 -05:00
Isaac Connor
a99c5b54fa
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-11-12 13:16:49 -05:00
Isaac Connor
feca6c3df0
add a copy constructor at the advice of cppcheck
2017-11-12 13:16:18 -05:00
Isaac Connor
71f13a7c9a
optimisations/fixes from cppcheck
2017-11-12 10:27:47 -05:00
digital-gnome
ef6cb42c5f
Cleanup
2017-11-11 14:49:43 -05:00
digital-gnome
1b8ae2bb45
Fix autoscale for ZMS
...
ZMS zoom would display broken jpegs with arbitrary scale. When using scaleToFit set zms scale to nearest regular scale and let the browser handle the rest.
2017-11-11 14:49:43 -05:00
digital-gnome
44c8299faa
Consolidate initPage
2017-11-11 14:49:43 -05:00
digital-gnome
91c3e3573c
ZMS controls for videojs
...
Add ZMS style controls to videojs page. Zoom, fast forward, fast reverse, frame skip, play/pause. Some cleanup of old videojs code
2017-11-11 14:49:43 -05:00
digital-gnome
21949f5426
Cleanup vjsReplay
2017-11-11 14:49:43 -05:00
digital-gnome
f08e75c598
Add remaining buttons to videojs
2017-11-11 14:49:43 -05:00