Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added missing fonts to setup.py that are required by the web ui #174

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added missing fonts to setup.py that are required by the web ui #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift click to select a range
ab181d2
Added missing fonts to setup.py that are required by the web ui
casasfernando Oct 24, 2018
b8cbeba
web_api.py: flask.ext.restful pattern is deprecated and flask_restful…
casasfernando Oct 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
5 changes: 2 additions & 3 deletions src/pydio/ui/web_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 18,7 @@
# The latest code can be found at <http://pyd.io/>.

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
Expand Down Expand Up @@ -999,4 998,4 @@ def get(self):
resp[job_id]['lastseq'] = -1
resp[job_id]['remotelastseq'] = -1
return resp
# end of feedback
# end of feedback