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

diff --git a/server/vendor/php-opencloud/common/src/Common/JsonSchema/Schema.php b/server/vendor/php-opencloud/common/src/Common/JsonSchema/Schema.php
deleted file mode 100644
index a1cd380..0000000
--- a/server/vendor/php-opencloud/common/src/Common/JsonSchema/Schema.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-namespace OpenCloud\Common\JsonSchema;
-
-use JsonSchema\Validator;
-
-class Schema
-{
-    private $body;
-    private $validator;
-
-    public function __construct($body, Validator $validator = null)
-    {
-        $this->body = (object) $body;
-        $this->validator = $validator ?: new Validator();
-    }
-
-    public function getPropertyPaths()
-    {
-        $paths = [];
-
-        foreach ($this->body->properties as $propertyName => $property) {
-            $paths[] = sprintf("/%s", $propertyName);
-        }
-
-        return $paths;
-    }
-
-    public function normalizeObject($subject, array $aliases)
-    {
-        $out = new \stdClass;
-
-        foreach ($this->body->properties as $propertyName => $property) {
-            $name = isset($aliases[$propertyName]) ? $aliases[$propertyName] : $propertyName;
-            if (isset($property->readOnly) && $property->readOnly === true) {
-                continue;
-            } elseif (property_exists($subject, $name)) {
-                $out->$propertyName = $subject->$name;
-            } elseif (property_exists($subject, $propertyName)) {
-                $out->$propertyName = $subject->$propertyName;
-            }
-        }
-
-        return $out;
-    }
-
-    public function validate($data)
-    {
-        $this->validator->check($data, $this->body);
-    }
-
-    public function isValid()
-    {
-        return $this->validator->isValid();
-    }
-
-    public function getErrors()
-    {
-        return $this->validator->getErrors();
-    }
-
-    public function getErrorString()
-    {
-        $msg = "Provided values do not validate. Errors:\n";
-
-        foreach ($this->getErrors() as $error) {
-            $msg .= sprintf("[%s] %s\n", $error['property'], $error['message']);
-        }
-
-        return $msg;
-    }
-}