Commit Graph
100 Commits
Author SHA1 Message Date
Adam Tauber aff33ea896 [fix] autocompleter error handling 2015-01-10 15:27:42 +01:00
Adam Tauber 39c3f5658e [fix] endless logging recursion 2015-01-10 13:10:17 +01:00
Adam Tauber c8be128e97 [mod] ignore startpage unicode errors 2015-01-09 11:21:46 +01:00
Adam Tauber 23b4a53248 [enh] engine exception traceback 2015-01-09 04:30:55 +01:00
Adam Tauber d6b1ff08ad Merge branch 'master' of github.com:asciimoo/searx 2015-01-09 04:15:57 +01:00
Adam Tauber 299a80a1eb [enh] using the logger 2015-01-09 04:13:05 +01:00
Adam Tauber 425a576f28 [fix] template syntax 2015-01-09 04:05:39 +01:00
Adam Tauber 6cbd29f674 [enh] logging added 2015-01-09 04:01:31 +01:00
Adam Tauber 3b672039aa Merge pull request #167 from Cqoicebordel/minor-fixes
Minor fixes
2015-01-06 18:38:04 +01:00
Adam Tauber 7b531c6fce [doc] @opi added to authors 2015-01-02 12:49:17 +01:00
Adam Tauber 592d801af9 [doc] @vincib added to authors 2015-01-02 12:49:05 +01:00
Adam Tauber bc38dc8ab9 [doc] todo updates 2015-01-02 12:39:31 +01:00
Adam Tauber 0d36dcbf4c [enh] pep8 check added to tests 2015-01-02 12:36:09 +01:00
Adam Tauber cc4e17b668 [fix] pep8 2015-01-02 12:33:40 +01:00
Adam Tauber 56c15023b5 [enh] tox.ini added to rewrite standard pep8 rules 2015-01-02 12:26:21 +01:00
Adam Tauber 041fad20d6 [doc] nested list fix 2015-01-02 12:23:59 +01:00
Adam Tauber c5ff2ef9f1 [doc] release date ++ formatting 2015-01-02 12:01:56 +01:00
Adam Tauber e5a323b288 [fix] favicon paths 2015-01-01 19:52:05 +01:00
Adam Tauber 798bef77f9 [fix] static content paths 2015-01-01 19:24:47 +01:00
Adam Tauber 2f9a386c0d [enh] better result template handling 2015-01-01 18:59:53 +01:00
Adam Tauber 20c4de8f06 [fix] filename strip 2015-01-01 18:06:51 +01:00
Adam Tauber 8151585918 [fix] static file paths 2015-01-01 17:54:33 +01:00
Adam Tauber 9f12605f7e [enh] themes static content refactor 2015-01-01 17:48:12 +01:00
Adam Tauber e3957d6adf Merge pull request #143 from Cqoicebordel/Wiki-date
Use human readable date for infobox
2015-01-01 14:36:28 +01:00
Adam Tauber 2181c4384e [mod] purge local html_to_text 2015-01-01 14:14:56 +01:00
Adam Tauber 1408859b4b [fix] ignore scripts/styles in html_to_text 2015-01-01 14:13:56 +01:00
Adam Tauber 469e08881e Merge pull request #165 from Cqoicebordel/Moar-engines
Moar engines
2015-01-01 14:10:59 +01:00
Adam Tauber c7cbd38fcc Merge pull request #164 from pointhi/favicons
improve Favicons
2015-01-01 14:06:34 +01:00
Adam Tauber 213667b1ef Merge pull request #163 from pointhi/translations
[enh] update translations
2015-01-01 14:05:51 +01:00
Adam Tauber 011c43b485 [doc] list indentation fix 2014-12-25 18:07:22 +01:00
Adam Tauber fcc394540b [enh] v0.6.0 2014-12-25 17:56:01 +01:00
Adam Tauber 62a7dc1aaa [doc] changelog added 2014-12-25 11:11:42 +01:00
Adam Tauber 5cfb42350b [enh] nl, de, fr, hu translation updates 2014-12-25 11:06:30 +01:00
Adam Tauber 61ab5f2693 [fix] view tests 2014-12-24 21:15:36 +01:00
Adam Tauber 3b3921fc59 [enh] subtitleseeker: better language handling 2014-12-24 21:02:26 +01:00
Adam Tauber b4f39237a3 Merge branch 'Cqoicebordel-Detect-favicons' 2014-12-24 20:34:54 +01:00
Adam Tauber ada01cb367 Merge branch 'Detect-favicons' of https://github.com/Cqoicebordel/searx into 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-24 20:34:08 +01:00
Adam Tauber 5857141e49 Merge pull request #161 from Cqoicebordel/SubtitleSeeker-engine
SubtitleSeeker Engine
2014-12-24 20:21:38 +01:00
Adam Tauber b975418e4c [fix] flickr engine code cleanup ++ handle missing owner 2014-12-22 14:15:59 +01:00
Adam Tauber af41607410 Merge pull request #149 from Cqoicebordel/Flickr-engine
Rework Flickr Engine
2014-12-22 13:33:32 +01:00
Adam Tauber 2e41bfcbdb [enh] engine shortcut validation 2014-12-20 12:17:03 +01:00
Adam Tauber 7eb27848c2 Merge pull request #159 from pointhi/photon_fix
[fix] fix language support in photon engine
2014-12-20 11:58:34 +01:00
Adam Tauber 0b3d632cd0 Merge pull request #158 from Cqoicebordel/Moar-Engines
Add 500px and Searchcode engines
2014-12-20 11:58:24 +01:00
Adam Tauber 667f4d5cfc Merge pull request #156 from Cqoicebordel/Fix-map-oscar
[fix][enh] Multiple JS changes in Oscar
2014-12-19 22:53:37 +01:00
Adam Tauber f141773814 [mod][fix] https rewrite refactor ++ fixes 2014-12-19 22:40:37 +01:00
Adam Tauber 813247b37a Merge pull request #152 from pointhi/search_engines
[enh] add photon engine, and fix pep8 errors
2014-12-19 20:06:21 +01:00
Adam Tauber 1c969186bf [mod] better search request exception handling 2014-12-19 20:01:01 +01:00
Adam Tauber 8c05c00762 [fix] handle empty search requests 2014-12-19 19:40:40 +01:00
Adam Tauber 19b1cedc23 Merge pull request #151 from pointhi/kickass_fix
[fix] fix kickass engine
2014-12-15 23:11:15 +01:00
Adam Tauber 81ae69201d Merge pull request #150 from pointhi/oscar_image_fix
[enh][oscar_template] replace kickass icon
2014-12-15 13:28:50 +01:00
Adam Tauber e047d22046 Merge pull request #144 from Cqoicebordel/KickassTorrent-Search-Engine
Kickass torrent search engine
2014-12-15 00:02:14 +01:00
Adam Tauber ba51d784d1 [fix] mysterious string remove 2014-12-14 02:27:58 +01:00
Adam Tauber d93d703703 [fix] use queues to answers/suggestions/infoboxes 2014-12-14 02:15:04 +01:00
Adam Tauber a5324d9d82 [fix] proper search timeout handling 2014-12-14 01:18:01 +01:00
Adam Tauber f5aec98cbd Merge pull request #145 from Cqoicebordel/HTML+Bugs-Templates
Html+Bugs in templates
2014-12-13 23:27:49 +01:00
Adam Tauber 2cfa760b57 [mod] engine load refactor 2014-12-13 19:26:40 +01:00
Adam Tauber f13a6ab795 [fix] disable debug mode 2014-12-13 18:41:24 +01:00
Adam Tauber 41aca9a068 [fix] autocomplete x-suggestion 2014-12-09 00:57:04 +01:00
Adam Tauber 0f4cb32bf1 [mod] image results removed from google engine 2014-12-09 00:53:09 +01:00
Adam Tauber 2538a3ec26 [enh] v0.5.0 2014-12-08 23:57:36 +01:00
Adam Tauber 1165932d90 [doc] @Cqoicebordel added to authors 2014-12-08 23:55:43 +01:00
Adam Tauber 8e6ae188b8 [mod] search thread names 2014-12-08 23:55:11 +01:00
Adam Tauber 44409cb61f Merge pull request #141 from Cqoicebordel/UX+Bugs+HTML
UX+bugs+html
2014-12-08 23:48:01 +01:00
Adam Tauber 70981f8055 Merge pull request #142 from Cqoicebordel/Fix-Google-Image
[fix] Google image with special chars
2014-12-08 23:39:45 +01:00
Adam Tauber 9517f7a6e7 Merge pull request #139 from dalf/master
pep8 : engines
2014-12-07 17:49:01 +01:00
Adam Tauber 611f4e2a86 [fix] pep8 2014-12-05 20:03:16 +01:00
Adam Tauber d959cb1c05 [enh] gevent/grequests changed to the built-in threading lib 2014-12-05 19:24:11 +01:00
Adam Tauber b1b0b82a2a [fix] version.py pep8 and py3 compatibility 2014-12-02 00:09:08 +01:00
Adam Tauber 524e30e001 [doc] description fixes 2014-12-01 21:33:35 +01:00
Adam Tauber 45734ee5f4 Merge pull request #136 from pointhi/template_oscar_fix
[oscar_template] split up js-files, FIX #132
2014-12-01 21:02:14 +01:00
Adam Tauber 623ce79885 Merge pull request #134 from Reventl0v/patch-1
Adding `import sys` to fix the installer
2014-11-28 07:56:16 +01:00
Adam Tauber c4a27970c5 [doc] domain name change 2014-11-27 20:36:00 +01:00
Adam Tauber 25a83c33aa [enh] translation update 2014-11-26 20:42:16 +01:00
Adam Tauber 84aba71f6a [enh] french translation build 2014-11-26 20:40:37 +01:00
Adam Tauber da456604be Merge branch 'master' of github.com:asciimoo/searx 2014-11-26 20:39:15 +01:00
Adam Tauber 8dbf394a1a Merge pull request #133 from vincib/translation
update of french translation
2014-11-26 20:38:43 +01:00
Adam Tauber 3dfeb73912 [enh] user agent string update 2014-11-22 18:37:42 +01:00
Adam Tauber 91384c1f31 Merge pull request #130 from pointhi/template_oscar_fix
[fix][template_oscar] make overpass-api call over https and add better error-message
2014-11-20 15:49:31 +01:00
Adam Tauber a5fc08c369 Merge pull request #129 from courgette/courgette
responsive theme courgette
2014-11-20 15:48:31 +01:00
Adam Tauber 075a5fe898 Merge pull request #127 from pointhi/template_oscar_map
Template oscar, add map support
2014-11-19 16:19:03 +01:00
Adam Tauber 1a81c20d73 [fix] sidebar overflow 2014-11-18 20:30:06 +01:00
Adam Tauber cfdfca0d41 [fix] whitespace remove 2014-11-18 19:55:39 +01:00
Adam Tauber 6b31f55c90 [fix] suggestions display 2014-11-18 19:53:38 +01:00
Adam Tauber b8efd1214f [enh] category select warning message 2014-11-18 19:44:33 +01:00
Adam Tauber cb15a21681 [fix] syggestions max width 2014-11-18 19:03:52 +01:00
Adam Tauber 444416a9ed Merge pull request #125 from pointhi/versions
[enh] make version of searx readable
2014-11-18 13:16:54 +01:00
Adam Tauber 55234d96b7 Merge pull request #124 from matejc/oscarfix
change package data in setup.py for oscar theme
2014-11-14 11:03:59 +01:00
Adam Tauber b6da893c78 [fix] html attribute quote 2014-11-11 18:59:26 +01:00
Adam Tauber 0d80d5d3b4 Merge pull request #105 from pointhi/template_oscar
new template: oscar
2014-11-11 09:36:39 +01:00
Adam Tauber b422788eb4 [fix] wikipedia autocompleter url param 2014-11-04 19:53:42 +01:00
Adam Tauber ee8cabf496 Merge pull request #122 from pointhi/bugfix
[fix] #121, HTTP 500 Error if res["content"] == None
2014-11-01 17:49:18 +01:00
Adam Tauber 58cc03351a Merge pull request #118 from dalf/master
default theme : small modifications
2014-10-30 08:09:07 +01:00
Adam Tauber 79f1676e31 [doc] @kernc added to authors list 2014-10-21 15:44:40 +02:00
Adam Tauber 5656fc472c Merge pull request #117 from pointhi/https_fix
print error if https rewrite directory is not found, #116
2014-10-19 21:48:53 +02:00
Adam Tauber 7be9759703 [enh][fix] https rewrite rules added to setup.py 2014-10-19 21:30:56 +02:00
Adam Tauber 5740cfbf1c [fix] pep8 part II. 2014-10-19 12:41:04 +02:00
Adam Tauber b0fd71b7b3 [fix] pep8 compatibility 2014-10-19 12:18:21 +02:00
Adam Tauber 28fed5d9ad Merge pull request #115 from pointhi/engine_faroo
add faroo engine
2014-10-19 12:07:02 +02:00
Adam Tauber 20400c40c3 Merge pull request #97 from pointhi/https
Implementing https rewrite support
2014-10-19 12:06:34 +02:00
Adam Tauber 840945f498 Merge pull request #114 from kernc/patch-1
Search Music also on YouTube
2014-10-13 17:29:45 +02:00