Merge branch 'develop' into Eole_Graph

Conflicts:
	client/index.html
	client/js/controllers/home/home.js
	client/partials/home/home.html

1 files changed, 0 insertions, 57 deletions

diff --git a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/StringConstraint.php b/server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/StringConstraint.php
deleted file mode 100644
index f57f64c..0000000
--- a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/StringConstraint.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/*
- * This file is part of the JsonSchema package.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace JsonSchema\Constraints;
-
-/**
- * The StringConstraint Constraints, validates an string against a given schema
- *
- * @author Robert Schönthal <seroscho@googlemail.com>
- * @author Bruno Prieto Reis <bruno.p.reis@gmail.com>
- */
-class StringConstraint extends Constraint
-{
-    /**
-     * {@inheritDoc}
-     */
-    public function check($element, $schema = null, $path = null, $i = null)
-    {
-        // Verify maxLength
-        if (isset($schema->maxLength) && $this->strlen($element) > $schema->maxLength) {
-            $this->addError($path, "Must be at most " . $schema->maxLength . " characters long", 'maxLength', array(
-                'maxLength' => $schema->maxLength,
-            ));
-        }
-
-        //verify minLength
-        if (isset($schema->minLength) && $this->strlen($element) < $schema->minLength) {
-            $this->addError($path, "Must be at least " . $schema->minLength . " characters long", 'minLength', array(
-                'minLength' => $schema->minLength,
-            ));
-        }
-
-        // Verify a regex pattern
-        if (isset($schema->pattern) && !preg_match('#' . str_replace('#', '\\#', $schema->pattern) . '#', $element)) {
-            $this->addError($path, "Does not match the regex pattern " . $schema->pattern, 'pattern', array(
-                'pattern' => $schema->pattern,
-            ));
-        }
-
-        $this->checkFormat($element, $schema, $path, $i);
-    }
-
-    private function strlen($string)
-    {
-        if (extension_loaded('mbstring')) {
-            return mb_strlen($string, mb_detect_encoding($string));
-        } else {
-            return strlen($string);
-        }
-    }
-}