retoor/searxng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
961 Commits 6 Branches 17 Tags
1408859b4b0ca9efc590ca0e112c6bc0cb984e2c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Adam Tauber b0bb94fd37 [fix] wikidata: using only the first url 2014-10-12 14:33:03 +02:00
Adam Tauber 13f36e6675 [enh] translation updates 2014-10-12 13:06:11 +02:00
Adam Tauber 781b8a23c4 Merge pull request #110 from pointhi/language_japanese 
add japanese translation
 2014-10-12 12:44:55 +02:00
Adam Tauber f3d884ef45 Merge pull request #113 from dalf/master 
[fix] the bang was included in the search string, [mod] infoboxes modifications
 2014-10-12 12:43:46 +02:00
Adam Tauber 4da795895d [fix] default template handling 2014-10-09 19:26:02 +02:00
Adam Tauber c58e5a236a [fix] preferences button display 2014-10-05 13:37:26 +02:00
Adam Tauber 5d7b63223f [mod] sidebar positioning 2014-10-04 23:13:21 +02:00
Adam Tauber 727c7226d9 [fix] code cleanup 2014-10-04 22:53:54 +02:00
Adam Tauber a48028b771 [fix] html escape url 2014-10-04 22:50:13 +02:00
Adam Tauber bbf107ac8b [fix] debug mode disabled by default 2014-10-04 22:48:12 +02:00
Adam Tauber 67b69619ba Merge pull request #104 from dalf/master 
[enh] add infoboxes and answers, [fix] when two results are merged, really use the content with more text
 2014-10-04 22:46:47 +02:00
Adam Tauber fce6fb2fa8 Merge pull request #107 from pointhi/float_bug 
fix float division by zero bug in score calculation
 2014-10-01 19:23:44 +02:00
Adam Tauber 5fbda0dafe Merge pull request #67 from opi/patch-1 
[enh] Add french translation for webapp.
 2014-10-01 18:27:20 +02:00
Adam Tauber 983339bb03 Merge pull request #106 from pointhi/query_parser 
FIX: #101 implement query parser and use it inside autocompletion and search query extraction
 2014-10-01 18:24:58 +02:00
Adam Tauber bd2db71fa6 Merge branch 'comments' of https://github.com/pointhi/searx 
Conflicts:
	searx/search.py
 2014-09-22 21:40:40 +02:00
Adam Tauber 090254feca Merge pull request #99 from dalf/master 
[enh] stick results from the same category and template and [fix] rewrite the google engine
 2014-09-14 18:57:08 +02:00
Adam Tauber d23dd7e276 Merge pull request #94 from dalf/master 
[enh] duckduckgo engine: add language support
 2014-09-08 18:32:07 +02:00
Adam Tauber 00e5262834 [enh] archive.org link added to results 2014-09-08 00:52:15 +02:00
Adam Tauber cd3a52e189 [enh] duckduckgo autocomplete added 2014-09-07 23:56:06 +02:00
Adam Tauber 1e99cf2a0e Merge pull request #93 from dalf/master 
yahoo, bing_new and dailymotion fixes
 2014-09-07 19:12:05 +02:00
Adam Tauber c23db1b2bf [enh] more flexible category selection 2014-09-06 15:21:29 +02:00
Adam Tauber a288aa322e Merge branch 'master' of github.com:asciimoo/searx 2014-09-06 14:17:26 +02:00
Adam Tauber e0ff9a6179 [enh] settings.yml docs 2014-09-06 14:17:14 +02:00
Adam Tauber b731827228 [enh] openstreetmap added to config 2014-09-06 14:09:27 +02:00
Adam Tauber 3319091496 [enh] new engine: openstreetmap 2014-09-06 14:09:03 +02:00