From 4c337aa5c60cd8b48914eba9e007ab7199ad49ff Mon Sep 17 00:00:00 2001 From: jekkos Date: Wed, 10 Aug 2016 15:26:18 +0200 Subject: [PATCH] Try to fix travis docker setup + remove jquery validator override (#788, #616) --- .travis.yml | 2 +- application/views/partial/header_js.php | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3deed8f97..9a2e1824d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ before_install: - sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D - sudo apt-get update - sudo apt-key update - - sudo apt-get -qqy -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install docker-engine=1.11.1-0~precise + - sudo apt-get -qqy --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install docker-engine=1.11.1-0~precise - sudo rm /usr/local/bin/docker-compose - curl -L https://github.com/docker/compose/releases/download/1.7.1/docker-compose-`uname -s`-`uname -m` > docker-compose - chmod +x docker-compose diff --git a/application/views/partial/header_js.php b/application/views/partial/header_js.php index 4332eb2b5..8a6f4186c 100644 --- a/application/views/partial/header_js.php +++ b/application/views/partial/header_js.php @@ -44,8 +44,4 @@ } }); - $.validator.methods.number = function (value, element) { - return this.optional(element) || /^-?(?:\d+|\d{1,3}(?:[\s\.,]\d{3})+)(?:[\.,]\d+)?$/.test(value); - } - - \ No newline at end of file +