From ab181d2843a9ee42aa0887fd59865ab3e8250c93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Casas=20Sch=C3=B6ssow?= Date: Wed, 24 Oct 2018 23:31:14 +0200 Subject: [PATCH 1/2] Added missing fonts to setup.py that are required by the web ui --- setup.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/setup.py b/setup.py index b35c5cb..11ab3b1 100644 --- a/setup.py +++ b/setup.py @@ -49,6 +49,10 @@ 'ui/res/*.js', 'ui/res/bootstrap/css/*.css', 'ui/res/bootstrap/css/*.css.map', + 'ui/res/bootstrap/fonts/mdi/*.eot', + 'ui/res/bootstrap/fonts/mdi/*.ttf', + 'ui/res/bootstrap/fonts/mdi/*.woff', + 'ui/res/bootstrap/fonts/mdi/*.woff2', 'ui/res/bootstrap/fonts/*.svg', 'ui/res/bootstrap/fonts/roboto-font/*.woff', 'ui/res/bootstrap/fonts/roboto-font/*.woff2', From b8cbeba131f8be7780b0053acca26456e44d0749 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Casas=20Sch=C3=B6ssow?= Date: Wed, 24 Oct 2018 23:38:57 +0200 Subject: [PATCH 2/2] web_api.py: flask.ext.restful pattern is deprecated and flask_restful should be used instead --- src/pydio/ui/web_api.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pydio/ui/web_api.py b/src/pydio/ui/web_api.py index 530afda..fd4dd0f 100644 --- a/src/pydio/ui/web_api.py +++ b/src/pydio/ui/web_api.py @@ -18,8 +18,7 @@ # The latest code can be found at . from flask import Flask, request, redirect, Response -from flask_restful import Api, reqparse -from flask.ext.restful import Resource +from flask_restful import Api, reqparse, Resource import flask from requests.exceptions import SSLError, ProxyError, TooManyRedirects, ChunkedEncodingError, ContentDecodingError, \ InvalidSchema, InvalidURL, Timeout, RequestException @@ -999,4 +998,4 @@ def get(self): resp[job_id]['lastseq'] = -1 resp[job_id]['remotelastseq'] = -1 return resp -# end of feedback \ No newline at end of file +# end of feedback