dalf
								
							 
						 | 
						
							
							
							
							
								
							
							
								829c758970
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/master'
							
							
							
							
							
						 | 
						
							2014-10-01 22:25:11 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Dalf
								
							 
						 | 
						
							
							
							
							
								
							
							
								0a71525ab6
								
							
						 | 
						
							
							
								
								[enh] add infoboxes and answers (clean up)
							
							
							
							
							
						 | 
						
							2014-10-01 22:17:35 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thomas Pointhuber
								
							 
						 | 
						
							
							
							
							
								
							
							
								fdad5f7cad
								
							
						 | 
						
							
							
								
								fix float division by zero bug in score calculation
							
							
							
							
							
						 | 
						
							2014-10-01 19:16:34 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thomas Pointhuber
								
							 
						 | 
						
							
							
							
							
								
							
							
								62d1a70c84
								
							
						 | 
						
							
							
								
								using Query class for parsing of search query
							
							
							
							
							
						 | 
						
							2014-10-01 17:57:53 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thomas Pointhuber
								
							 
						 | 
						
							
							
							
							
								
							
							
								510aba5e66
								
							
						 | 
						
							
							
								
								implement query parser and use it inside autocompletion
							
							
							
							
							
						 | 
						
							2014-10-01 17:18:18 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Dalf
								
							 
						 | 
						
							
							
							
							
								
							
							
								6bfd566353
								
							
						 | 
						
							
							
								
								[enh] add infoboxes and answers
							
							
							
							
							
						 | 
						
							2014-09-28 16:51:41 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Dalf
								
							 
						 | 
						
							
							
							
							
								
							
							
								e39d9fe542
								
							
						 | 
						
							
							
								
								update comment
							
							
							
							
							
						 | 
						
							2014-09-22 23:39:21 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Dalf
								
							 
						 | 
						
							
							
							
							
								
							
							
								6b058962e1
								
							
						 | 
						
							
							
								
								[fix] when two results are merged, really use the content with more text
							
							
							
							
							
						 | 
						
							2014-09-22 22:55:51 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Dalf
								
							 
						 | 
						
							
							
							
							
								
							
							
								5dc3eb3399
								
							
						 | 
						
							
							
								
								[fix] rewrite the google engine since Google Web Search API is about to expire
							
							
							
							
							
						 | 
						
							2014-09-14 14:40:55 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Dalf
								
							 
						 | 
						
							
							
							
							
								
							
							
								5d1610d87a
								
							
						 | 
						
							
							
								
								[enh] stick results from the same category and template
							
							
							
							
							
						 | 
						
							2014-09-14 14:39:22 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thomas Pointhuber
								
							 
						 | 
						
							
							
							
							
								
							
							
								53dc92b0d7
								
							
						 | 
						
							
							
								
								update comments in autocomplete.py
							
							
							
							
							
							
							
							* update comments
* add licence-header 
							
						 | 
						
							2014-09-13 18:47:28 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thomas Pointhuber
								
							 
						 | 
						
							
							
							
							
								
							
							
								22da73b8bb
								
							
						 | 
						
							
							
								
								little update update comments in search.py
							
							
							
							
							
						 | 
						
							2014-09-13 18:44:11 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thomas Pointhuber
								
							 
						 | 
						
							
							
							
							
								
							
							
								bc30c4f4ad
								
							
						 | 
						
							
							
								
								add comments to __init__.py
							
							
							
							
							
							
							
							* add comments
* add licence-header 
							
						 | 
						
							2014-09-13 18:39:03 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thomas Pointhuber
								
							 
						 | 
						
							
							
							
							
								
							
							
								7da4b3dc82
								
							
						 | 
						
							
							
								
								add comments to languages.py
							
							
							
							
							
							
							
							* add comments
* add licence-header 
							
						 | 
						
							2014-09-13 18:32:28 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thomas Pointhuber
								
							 
						 | 
						
							
							
							
							
								
							
							
								c9bab0e833
								
							
						 | 
						
							
							
								
								add comments to search.py
							
							
							
							
							
							
							
							* add comments
* add licence-header 
							
						 | 
						
							2014-09-13 18:25:25 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									dalf
								
							 
						 | 
						
							
							
							
							
								
							
							
								64b75e6d82
								
							
						 | 
						
							
							
								
								[enh] duckduckgo engine: add language support
							
							
							
							
							
						 | 
						
							2014-09-07 22:52:13 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Dalf
								
							 
						 | 
						
							
							
							
							
								
							
							
								a4ffeddce1
								
							
						 | 
						
							
							
								
								[fix] yahoo engines: parse_url doesn't throw an exception with not tracking URL
							
							
							
							
							
						 | 
						
							2014-09-07 18:42:56 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Dalf
								
							 
						 | 
						
							
							
							
							
								
							
							
								a92e3ba446
								
							
						 | 
						
							
							
								
								[fix] bing_new engine : fix published date parsing
							
							
							
							
							
						 | 
						
							2014-09-07 18:10:05 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Dalf
								
							 
						 | 
						
							
							
							
							
								
							
							
								7f1e2ba211
								
							
						 | 
						
							
							
								
								[enh] dailymotion engine: add language support
							
							
							
							
							
						 | 
						
							2014-09-07 17:14:42 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Adam Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								46e3e1a390
								
							
						 | 
						
							
							
								
								[fix] print removed
							
							
							
							
							
						 | 
						
							2014-09-05 10:46:08 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Adam Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								24401c0e16
								
							
						 | 
						
							
							
								
								[fix] print removed
							
							
							
							
							
						 | 
						
							2014-09-04 23:53:39 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Adam Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								35ddbecd74
								
							
						 | 
						
							
							
								
								[fix] string formatting
							
							
							
							
							
						 | 
						
							2014-09-04 23:53:13 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Adam Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								29afa9b4a1
								
							
						 | 
						
							
							
								
								Merge pull request #91 from pointhi/engines
							
							
							
							
							
							
							
							fix yacy-engine and add comments 
							
						 | 
						
							2014-09-04 21:50:02 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Adam Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								cb8acbd2c3
								
							
						 | 
						
							
							
								
								[enh][fix] support base_urls without language code ++ extra whitespaces removed
							
							
							
							
							
						 | 
						
							2014-09-04 21:19:11 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Adam Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								c38a743c6f
								
							
						 | 
						
							
							
								
								Merge pull request #90 from pointhi/engines
							
							
							
							
							
							
							
							using generic mediawiki engines 
							
						 | 
						
							2014-09-04 19:31:47 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thomas Pointhuber
								
							 
						 | 
						
							
							
							
							
								
							
							
								2cd980134b
								
							
						 | 
						
							
							
								
								fix yacy-engine and add comments
							
							
							
							
							
							
							
							* add language support
* add image-support
* add basic-implementation for video, music and file handling
* refactore engine
* add comments 
							
						 | 
						
							2014-09-03 13:47:12 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thomas Pointhuber
								
							 
						 | 
						
							
							
							
							
								
							
							
								63560607ad
								
							
						 | 
						
							
							
								
								fix mediawiki-comment
							
							
							
							
							
							
							
							* bug: setting language_support to False result in no results 
							
						 | 
						
							2014-09-03 11:50:58 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thomas Pointhuber
								
							 
						 | 
						
							
							
							
							
								
							
							
								52ad49ccba
								
							
						 | 
						
							
							
								
								using general mediawiki-engine
							
							
							
							
							
							
							
							* writing general mediawiki-engine
* using this engine for wikipedia
* using this engine for uncyclopedia 
							
						 | 
						
							2014-09-03 11:40:29 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Adam Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								ed925cf561
								
							
						 | 
						
							
							
								
								[fix] query escaped in all htmls, invalid todo removed
							
							
							
							
							
						 | 
						
							2014-09-03 00:58:32 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Adam Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								22a3cf7ac7
								
							
						 | 
						
							
							
								
								[enh] HTTP GET theme select
							
							
							
							
							
						 | 
						
							2014-09-03 00:57:09 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thomas Pointhuber
								
							 
						 | 
						
							
							
							
							
								
							
							
								629a05e149
								
							
						 | 
						
							
							
								
								fix youtube engine and add comments
							
							
							
							
							
							
							
							* add language-support
* decrease search-results/site to 5
* add comments 
							
						 | 
						
							2014-09-02 21:19:20 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thomas Pointhuber
								
							 
						 | 
						
							
							
							
							
								
							
							
								bb628469d3
								
							
						 | 
						
							
							
								
								fix wikipedia engine and add comments
							
							
							
							
							
							
							
							* add paging support
* make number_of_results changable
* make result calculation more clear
* add comments 
							
						 | 
						
							2014-09-02 21:01:24 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thomas Pointhuber
								
							 
						 | 
						
							
							
							
							
								
							
							
								8eb064dea1
								
							
						 | 
						
							
							
								
								add little note to duckduckgo engine
							
							
							
							
							
						 | 
						
							2014-09-02 20:21:33 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thomas Pointhuber
								
							 
						 | 
						
							
							
							
							
								
							
							
								badf8504fd
								
							
						 | 
						
							
							
								
								remove categories : social media from twitter engine in settings.yml
							
							
							
							
							
						 | 
						
							2014-09-02 20:15:49 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thomas Pointhuber
								
							 
						 | 
						
							
							
							
							
								
							
							
								9460750fea
								
							
						 | 
						
							
							
								
								fix twitter engine and add comments
							
							
							
							
							
							
							
							* add language-support
* add comments
* little refactoring 
							
						 | 
						
							2014-09-02 20:14:52 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thomas Pointhuber
								
							 
						 | 
						
							
							
							
							
								
							
							
								678a80f043
								
							
						 | 
						
							
							
								
								fix startpage engine and add comments
							
							
							
							
							
							
							
							* add language support
* remove not required code
* improve google-ad detection (no false detection anymore, I hope)
* other improvements 
							
						 | 
						
							2014-09-02 19:57:01 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thomas Pointhuber
								
							 
						 | 
						
							
							
							
							
								
							
							
								a46bbb4042
								
							
						 | 
						
							
							
								
								fix stackoverflow and add comments
							
							
							
							
							
						 | 
						
							2014-09-02 18:49:42 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thomas Pointhuber
								
							 
						 | 
						
							
							
							
							
								
							
							
								80f98d6041
								
							
						 | 
						
							
							
								
								add little comment
							
							
							
							
							
						 | 
						
							2014-09-02 18:12:42 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thomas Pointhuber
								
							 
						 | 
						
							
							
							
							
								
							
							
								64a68a7296
								
							
						 | 
						
							
							
								
								update soundcloud and add comments
							
							
							
							
							
						 | 
						
							2014-09-02 18:12:30 +02:00 | 
						
						
							
							
							
								
							
							
						 |