]> www.vanbest.org Git - motioneye-debian/commit
projects / motioneye-debian / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 46b9941) | patch
Merge remote-tracking branch 'upstream/dev' into html5-video-playback
authorMrnt <github@maurent.com>
Wed, 14 Mar 2018 01:10:50 +0000 (18:10 -0700)
committerMrnt <github@maurent.com>
Fri, 16 Mar 2018 23:24:51 +0000 (16:24 -0700)
commit2ba8430a84582780b814938e72d6f86871ddba47
treebbb6894b3f8201515b22d53af0d8b155e212c13dtree | snapshot
parent46b99410155e6edff5f166831b797717b9ff8e37commit | diff
Merge remote-tracking branch 'upstream/dev' into html5-video-playback

 - fix conflicts
 - use js video playback from upstream/dev but try to preload video to better support of remote cameras
 - some css tweaks

Missed these two
motioneye/mediafiles.py diff | blob | history
motioneye/static/css/main.css diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.