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, 46 deletions

diff --git a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/EnumConstraint.php b/server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/EnumConstraint.php
deleted file mode 100644
index df413e4..0000000
--- a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Constraints/EnumConstraint.php
+++ /dev/null
@@ -1,46 +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 EnumConstraint Constraints, validates an element against a given set of possibilities
- *
- * @author Robert Schönthal <seroscho@googlemail.com>
- * @author Bruno Prieto Reis <bruno.p.reis@gmail.com>
- */
-class EnumConstraint extends Constraint
-{
-    /**
-     * {@inheritDoc}
-     */
-    public function check($element, $schema = null, $path = null, $i = null)
-    {
-        // Only validate enum if the attribute exists
-        if ($element instanceof UndefinedConstraint && (!isset($schema->required) || !$schema->required)) {
-            return;
-        }
-
-        foreach ($schema->enum as $enum) {
-            $type = gettype($element);
-            if ($type === gettype($enum)) {
-                if ($type == "object") {
-                    if ($element == $enum)
-                        return;
-                } else {
-                    if ($element === $enum)
-                        return;
-
-                }
-            }
-        }
-
-        $this->addError($path, "Does not have a value in the enumeration " . print_r($schema->enum, true), 'enum', array('enum' => $schema->enum,));
-    }
-}