Merge branch 'master' into feature/xss

dpgaspar · Feb 1, 2023 · bc2a87d · bc2a87d
2 parents ef3b258 + 1e1c354
commit bc2a87d
Show file tree

Hide file tree

Showing 23 changed files with 42 additions and 2,677 deletions.
diff --git a/flask_appbuilder/api/__init__.py b/flask_appbuilder/api/__init__.py
@@ -110,7 +110,7 @@ def wraps(self: "BaseApi", *args: Any, **kwargs: Any) -> Response:
         except BadRequest as e:
             return self.response_400(message=str(e))
         except Exception as e:
-            logging.exception(e)
+            log.exception(e)
             return self.response_500(message=get_error_msg())
 
     return functools.update_wrapper(wraps, f)

diff --git a/flask_appbuilder/static/appbuilder/css/font-awesome.min.css b/flask_appbuilder/static/appbuilder/css/font-awesome.min.css
diff --git a/flask_appbuilder/static/appbuilder/css/fontawesome/brands.min.css b/flask_appbuilder/static/appbuilder/css/fontawesome/brands.min.css
diff --git a/flask_appbuilder/static/appbuilder/css/fontawesome/fontawesome.min.css b/flask_appbuilder/static/appbuilder/css/fontawesome/fontawesome.min.css
diff --git a/flask_appbuilder/static/appbuilder/css/fontawesome/regular.min.css b/flask_appbuilder/static/appbuilder/css/fontawesome/regular.min.css
@@ -0,0 +1,6 @@
+/*!
+ * Font Awesome Free 6.2.1 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ * Copyright 2022 Fonticons, Inc.
+ */
+:host,:root{--fa-style-family-classic:"Font Awesome 6 Free";--fa-font-regular:normal 400 1em/1 "Font Awesome 6 Free"}@font-face{font-family:"Font Awesome 6 Free";font-style:normal;font-weight:400;font-display:block;src:url(../../webfonts/fa-regular-400.woff2) format("woff2"),url(../../webfonts/fa-regular-400.ttf) format("truetype")}.fa-regular,.far{font-weight:400}
diff --git a/flask_appbuilder/static/appbuilder/css/fontawesome/solid.min.css b/flask_appbuilder/static/appbuilder/css/fontawesome/solid.min.css
@@ -0,0 +1,6 @@
+/*!
+ * Font Awesome Free 6.2.1 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ * Copyright 2022 Fonticons, Inc.
+ */
+:host,:root{--fa-style-family-classic:"Font Awesome 6 Free";--fa-font-solid:normal 900 1em/1 "Font Awesome 6 Free"}@font-face{font-family:"Font Awesome 6 Free";font-style:normal;font-weight:900;font-display:block;src:url(../../webfonts/fa-solid-900.woff2) format("woff2"),url(../../webfonts/fa-solid-900.ttf) format("truetype")}.fa-solid,.fas{font-weight:900}
diff --git a/flask_appbuilder/static/appbuilder/css/fontawesome/v4-font-face.min.css b/flask_appbuilder/static/appbuilder/css/fontawesome/v4-font-face.min.css
diff --git a/flask_appbuilder/static/appbuilder/css/fontawesome/v4-shims.min.css b/flask_appbuilder/static/appbuilder/css/fontawesome/v4-shims.min.css
diff --git a/flask_appbuilder/static/appbuilder/fonts/FontAwesome.otf b/flask_appbuilder/static/appbuilder/fonts/FontAwesome.otf
diff --git a/flask_appbuilder/static/appbuilder/fonts/fontawesome-webfont.eot b/flask_appbuilder/static/appbuilder/fonts/fontawesome-webfont.eot
diff --git a/flask_appbuilder/static/appbuilder/fonts/fontawesome-webfont.svg b/flask_appbuilder/static/appbuilder/fonts/fontawesome-webfont.svg
diff --git a/flask_appbuilder/static/appbuilder/fonts/fontawesome-webfont.ttf b/flask_appbuilder/static/appbuilder/fonts/fontawesome-webfont.ttf
diff --git a/flask_appbuilder/static/appbuilder/fonts/fontawesome-webfont.woff b/flask_appbuilder/static/appbuilder/fonts/fontawesome-webfont.woff
diff --git a/flask_appbuilder/static/appbuilder/fonts/fontawesome-webfont.woff2 b/flask_appbuilder/static/appbuilder/fonts/fontawesome-webfont.woff2
diff --git a/flask_appbuilder/static/appbuilder/webfonts/fa-brands-400.ttf b/flask_appbuilder/static/appbuilder/webfonts/fa-brands-400.ttf
diff --git a/flask_appbuilder/static/appbuilder/webfonts/fa-brands-400.woff2 b/flask_appbuilder/static/appbuilder/webfonts/fa-brands-400.woff2
diff --git a/flask_appbuilder/static/appbuilder/webfonts/fa-regular-400.ttf b/flask_appbuilder/static/appbuilder/webfonts/fa-regular-400.ttf
diff --git a/flask_appbuilder/static/appbuilder/webfonts/fa-regular-400.woff2 b/flask_appbuilder/static/appbuilder/webfonts/fa-regular-400.woff2
diff --git a/flask_appbuilder/static/appbuilder/webfonts/fa-solid-900.ttf b/flask_appbuilder/static/appbuilder/webfonts/fa-solid-900.ttf
diff --git a/flask_appbuilder/static/appbuilder/webfonts/fa-solid-900.woff2 b/flask_appbuilder/static/appbuilder/webfonts/fa-solid-900.woff2
diff --git a/flask_appbuilder/static/appbuilder/webfonts/fa-v4compatibility.ttf b/flask_appbuilder/static/appbuilder/webfonts/fa-v4compatibility.ttf
diff --git a/flask_appbuilder/static/appbuilder/webfonts/fa-v4compatibility.woff2 b/flask_appbuilder/static/appbuilder/webfonts/fa-v4compatibility.woff2
diff --git a/flask_appbuilder/templates/appbuilder/init.html b/flask_appbuilder/templates/appbuilder/init.html
@@ -17,7 +17,11 @@
 
     {% block head_css %}
       <link href="{{url_for('appbuilder.static',filename='css/bootstrap.min.css')}}" rel="stylesheet">
-      <link href="{{url_for('appbuilder.static',filename='css/font-awesome.min.css')}}" rel="stylesheet">
+      <link href="{{url_for('appbuilder.static',filename='css/fontawesome/fontawesome.min.css')}}" rel="stylesheet">
+      <link href="{{url_for('appbuilder.static',filename='css/fontawesome/regular.min.css')}}" rel="stylesheet">
+      <link href="{{url_for('appbuilder.static',filename='css/fontawesome/solid.min.css')}}" rel="stylesheet">
+      <link href="{{url_for('appbuilder.static',filename='css/fontawesome/brands.min.css')}}" rel="stylesheet">
+      <link href="{{url_for('appbuilder.static',filename='css/fontawesome/v4-shims.min.css')}}" rel="stylesheet">
       {% if appbuilder.app_theme %}
         <link href="{{url_for('appbuilder.static',filename='css/themes/'+ appbuilder.app_theme )}}" rel="stylesheet">
       {% endif %}