]> www.vanbest.org Git - motioneye-debian/commit
projects / motioneye-debian / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fcabde9 21f8ad5)
Merge remote-tracking branch 'upstream/dev' into html5-video-playback
authorMrnt <github@maurent.com>
Wed, 14 Mar 2018 01:04:54 +0000 (18:04 -0700)
committerMrnt <github@maurent.com>
Wed, 14 Mar 2018 01:04:54 +0000 (18:04 -0700)
commit46b99410155e6edff5f166831b797717b9ff8e37
tree6827474388aab30e19e2c603426b6e7a8872b191tree | snapshot
parentfcabde903627c3cc16c5e22d9281a377579f9047commit | diff
parent21f8ad5fa54f47b46c6357de713d844cd79662abcommit | 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
motioneye/mediafiles.py diff1 | diff2 | blob | history
motioneye/static/css/main.css diff1 | diff2 | blob | history
motioneye/static/js/main.js diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.