summaryrefslogtreecommitdiff
path: root/searx/webapp.py
AgeCommit message (Collapse)Author
2015-01-16[enh] image proxy baseAdam Tauber
2015-01-15[mod] pygments dependency warningAdam Tauber
2015-01-15[enh] log highlighter errorsAdam Tauber
2015-01-15Merge branch 'code_results' of https://github.com/pointhi/searx into ↵Adam Tauber
pointhi-code_results Conflicts: searx/static/themes/default/css/style.css searx/static/themes/oscar/css/oscar.min.css searx/templates/oscar/result_templates/torrent.html
2015-01-11Merge pull request #170 from pointhi/little_fixesAdam Tauber
Little fixes, add searx-autocompletion, more informations about torrents
2015-01-10[fix] little autocompleter fixThomas Pointhuber
2015-01-10[enh] add autocompletion for searx-specific stringsThomas Pointhuber
2015-01-10[fix] autocompleter error handlingAdam Tauber
2015-01-10[fix] endless logging recursionAdam Tauber
2015-01-09Merge branch 'master' of https://github.com/asciimoo/searx into code_resultsThomas Pointhuber
Conflicts: searx/engines/searchcode_code.py searx/engines/searchcode_doc.py searx/static/oscar/js/searx.min.js searx/templates/oscar/result_templates/default.html searx/templates/oscar/result_templates/images.html searx/templates/oscar/result_templates/map.html searx/templates/oscar/result_templates/torrent.html searx/templates/oscar/result_templates/videos.html
2015-01-09[enh] using the loggerAdam Tauber
2015-01-01[fix] static content pathsAdam Tauber
2015-01-01[enh] better result template handlingAdam Tauber
2015-01-01[enh] themes static content refactorAdam Tauber
2014-12-28[enh] move favicons into own directoryThomas Pointhuber
2014-12-24Merge branch 'Detect-favicons' of https://github.com/Cqoicebordel/searx into ↵Adam Tauber
Cqoicebordel-Detect-favicons Conflicts: searx/templates/courgette/result_templates/default.html searx/templates/courgette/result_templates/map.html searx/templates/courgette/result_templates/videos.html searx/templates/default/result_templates/default.html searx/templates/default/result_templates/map.html searx/templates/default/result_templates/videos.html searx/webapp.py
2014-12-22[enh] fix pep8, improve syntax highlightingThomas Pointhuber
2014-12-20[enh] add result_templates/code.htmlThomas Pointhuber
2014-12-19[mod][fix] https rewrite refactor ++ fixesAdam Tauber
2014-12-18Final commit on faviconsCqoicebordel
Definitely remove engine array Change every themes to accomodate that change Tweak of video template of oscar to add link on video thumbnail
2014-12-14Add icons and badge for the themesCqoicebordel
Add kickass in engine list Add content for the result from kickass
2014-12-13Load the list of icons only onceCqoicebordel
2014-12-12Add a variable with all the icons of the themeCqoicebordel
Add for the template a list of available icons in the current theme.
2014-12-09[fix] autocomplete x-suggestionAdam Tauber
2014-12-08Add pubdateCqoicebordel
Add pubdate with a good format, against publishedDate.
2014-12-05[enh] gevent/grequests changed to the built-in threading libAdam Tauber
2014-11-18[fix] whitespace removeAdam Tauber
2014-11-18[enh] make version of searx readableThomas Pointhuber
2014-10-26Merge https://github.com/asciimoo/searx into template_oscarThomas Pointhuber
Conflicts: searx/translations/de/LC_MESSAGES/messages.po searx/translations/en/LC_MESSAGES/messages.po searx/translations/es/LC_MESSAGES/messages.po searx/translations/fr/LC_MESSAGES/messages.po searx/translations/hu/LC_MESSAGES/messages.po searx/translations/it/LC_MESSAGES/messages.po searx/translations/nl/LC_MESSAGES/messages.po searx/webapp.py
2014-10-19[fix] pep8 part II.Adam Tauber
2014-10-19Merge pull request #97 from pointhi/httpsAdam Tauber
Implementing https rewrite support
2014-10-15improve https rewrite codeThomas Pointhuber
2014-10-15improve https rewritingThomas Pointhuber
2014-10-15Implementing https rewrite support #71Thomas Pointhuber
* parsing XML-Files which contain target, exclusions and rules * convert regex if required (is a little hack, probably does not work for all rules) * check if target rule apply for http url, and use the rules to rewrite it * add pice of code, to check if domain name has not changed during rewrite (should be rewritten, using publicsuffix instead of little hack)
2014-10-09[fix] default template handlingAdam Tauber
2014-10-05oscar template: improve result iconsThomas Pointhuber
2014-10-05initial commit of the new template 'oscar'Thomas Pointhuber
* base.html mostly implemented * stats.html implemented * about.html implemented * most of preferences.html implemented * using bootstrap.js
2014-10-01Merge remote-tracking branch 'upstream/master'dalf
2014-10-01implement query parser and use it inside autocompletionThomas Pointhuber
2014-09-28[enh] add infoboxes and answersDalf
2014-09-06[enh] more flexible category selectionAdam Tauber
2014-09-03[fix] query escaped in all htmls, invalid todo removedAdam Tauber
2014-09-03[enh] HTTP GET theme selectAdam Tauber
2014-07-09[fix] unused globals removed II.Adam Tauber
2014-07-07[enh][mod] search refactorAdam Tauber
2014-07-04[fix] pep8Adam Tauber
2014-07-03Merge pull request #74 from posativ/patch/application-aliasAdam Tauber
add application as alias
2014-07-03fix gevent's monkey patch positionMartin Zimmermann
2014-07-03add application as aliasMartin Zimmermann
2014-06-24[enh] https rewrite basicsAdam Tauber