Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit dda4a46f authored by Markus Heiser's avatar Markus Heiser Committed by GitHub
Browse files

Merge branch 'master' into filtron

parents e2770b58 0dc5bdb6

searx/engines/flickr_noapi.py

+4 −8
Original line number Diff line number Diff line
@@ -117,14 +117,10 @@ def response(resp): 
            'img_format': img_format,

            'template': 'images.html'

        }

        try:

            result['author'] = author

            result['title'] = title

            result['content'] = content

        except:

            result['author'] = ''

            result['title'] = ''

            result['content'] = ''

        result['author'] = author.encode('utf-8', 'ignore').decode('utf-8')

        result['source'] = source.encode('utf-8', 'ignore').decode('utf-8')

        result['title'] = title.encode('utf-8', 'ignore').decode('utf-8')

        result['content'] = content.encode('utf-8', 'ignore').decode('utf-8')

        results.append(result)



    return results

searx/static/themes/oscar/js/searx.js

+1 −1
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ $(document).ready(function(){ 
                    }

                })

                .fail(function() {

                    $(result_table_loadicon).html($(result_table_loadicon).html() + "<p class=\"text-muted\">could not load data!</p>");

                    $(result_table_loadicon).html($(result_table_loadicon).html() + "<p class=\"text-muted\">"+could_not_load+"</p>");

                });

            }

        }

searx/static/themes/oscar/js/searx.min.js

+0 −0

File changed.

Preview suppressed by a .gitattributes entry or the file's encoding is unsupported.

View original file
View changed file

searx/static/themes/oscar/js/searx_src/leaflet_map.js

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ $(document).ready(function(){ 
                    }

                })

                .fail(function() {

                    $(result_table_loadicon).html($(result_table_loadicon).html() + "<p class=\"text-muted\">could not load data!</p>");

                    $(result_table_loadicon).html($(result_table_loadicon).html() + "<p class=\"text-muted\">"+could_not_load+"</p>");

                });

            }

        }

searx/static/themes/simple/js/searx.head.min.js

+0 −0

File changed.

Preview suppressed by a .gitattributes entry or the file's encoding is unsupported.

View original file
View changed file