diff options
author | nachoparker <nacho@ownyourbits.com> | 2018-04-09 01:53:58 +0300 |
---|---|---|
committer | nachoparker <nacho@ownyourbits.com> | 2018-04-09 01:54:54 +0300 |
commit | 7aba9c53037011baeab73dd5036b8420bfac5aa1 (patch) | |
tree | 5889dd3d4ad7ab38059896a21afe06f2bd25951a | |
parent | 3e528693155f2c8d629afc6e11d1f18f747e0612 (diff) |
build: clean docker-envv0.53.25
-rw-r--r-- | changelog.md | 2 | ||||
-rw-r--r-- | docker/docker-env.sh | 43 | ||||
-rw-r--r-- | ncp-web/activate/JS.js | 2 |
3 files changed, 2 insertions, 45 deletions
diff --git a/changelog.md b/changelog.md index 6da19392..9044a9fc 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,5 @@ -[v0.53.25](https://github.com/nextcloud/nextcloudpi/commit/7b794dd) (2018-04-08) docker: update armhf version +[v0.53.25](https://github.com/nextcloud/nextcloudpi/commit/bb33a59) (2018-04-09) build: clean docker-env [v0.53.24](https://github.com/nextcloud/nextcloudpi/commit/1c44802) (2018-04-05) ncp-web: faster first load by asynchronous call to is_active() diff --git a/docker/docker-env.sh b/docker/docker-env.sh deleted file mode 100644 index ba70bd60..00000000 --- a/docker/docker-env.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -# Install docker ARM on Raspbian -# -# Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com> -# GPL licensed (see end of file) * Use at your own risk! -# -# Usage: ./installer.sh docker-env.sh <DHCP QEMU image IP> <image> -# - - -install() -{ - curl -sSL get.docker.com | sh - usermod -aG docker pi -} - -configure(){ :; } - -cleanup() -{ - apt-get autoremove - apt-get clean - rm /var/lib/apt/lists/* -r - rm -f /etc/udev/rules.d/90-qemu.rules -} - -# License -# -# This script is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This script is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this script; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place, Suite 330, -# Boston, MA 02111-1307 USA diff --git a/ncp-web/activate/JS.js b/ncp-web/activate/JS.js index 740f71c8..dd00dcec 100644 --- a/ncp-web/activate/JS.js +++ b/ncp-web/activate/JS.js @@ -37,7 +37,7 @@ function launch_nc_passwd() var url = window.location.protocol + '//' + window.location.hostname + ':4443'; if ( !window.open( url, '_blank' ) ) // try to open in a new tab first window.location.replace( url ); - }, 2000 ); + }, 2500 ); } else { $('#error-box').fill( "nc-passwd error" ); } |