haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
luciash d' being 2015-11-10 03:05:05 +01:00
parent 7ce05358e1 1bb5188ac8
commit 17b8831a5c
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
css/unsupported_browser.css
View File

@ -97,15 +97,15 @@ a {
}
#chromium_logo
{
width: 77px;
width: 85px;
height: 79px;
background-image: url('/images/chromium.png');
}
#firefox-nightly_logo
#firefox_logo
{
width: 73px;
height: 79px;
background-image: url('/images/firefox-nightly.png');
background-image: url('/images/firefox.png');
}
#opera_logo

4
debian/jitsi-meet.postinst vendored
View File

@ -45,8 +45,8 @@ case "$1" in
# stores the hostname so we will reuse it later, like in purge
db_set jitsi-meet/jvb-hostname $JVB_HOSTNAME
NGINX_INSTALL_CHECK="$(dpkg-query -W -f '${PackageSpec}:${Status}\n' nginx 2>&1 | grep -v "ok installed" || :)"
if [ -z "${NGINX_INSTALL_CHECK}" ]; then
NGINX_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'nginx' 2>/dev/null | awk '{print $3}' || true)"
if [ "$NGINX_INSTALL_CHECK" = "installed" ] || [ "$NGINX_INSTALL_CHECK" = "unpacked" ] ; then
FORCE_NGINX="true"
fi

2
debian/jitsi-meet.postrm vendored
View File

@ -35,6 +35,8 @@ case "$1" in
rm -f /etc/jitsi/meet/$JVB_HOSTNAME-config.js
rm -f /etc/nginx/sites-available/$JVB_HOSTNAME.conf
rm -f /etc/nginx/sites-enabled/$JVB_HOSTNAME.conf
rm -f /etc/jitsi/videobridge/$JVB_HOSTNAME.jks
rm -f /etc/jitsi/videobridge/$JVB_HOSTNAME.p12
fi
;;
upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)

2
unsupported_browser.html
View File

@ -35,7 +35,7 @@
<div class="browser_wrapper">
Firefox
<div class="browser">
<div class="logo" id="firefox"></div>
<div class="logo" id="firefox_logo"></div>
<a href="http://www.getfirefox.com/"><div class="button">DOWNLOAD</div></a>
</div>
</div>