Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							20400c40c3 
							
						 
					 
					
						
						
							
							Merge pull request  #97  from pointhi/https  
						
						... 
						
						
						
						Implementing https rewrite support 
						
					 
					
						2014-10-19 12:06:34 +02:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							1e3e646584 
							
						 
					 
					
						
						
							
							import basic https rules from https-everywhere repository  
						
						... 
						
						
						
						* licenced under GPLv3+
* downloaded from https://github.com/EFForg/https-everywhere  
						
					 
					
						2014-10-15 14:52:27 +02:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							bb126da0fb 
							
						 
					 
					
						
						
							
							improve https rewrite code  
						
						
						
					 
					
						2014-10-15 14:47:03 +02:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							0616d26feb 
							
						 
					 
					
						
						
							
							improve https rewriting  
						
						
						
					 
					
						2014-10-15 14:05:42 +02:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							6e6dbc1bb4 
							
						 
					 
					
						
						
							
							update settings_robot.yml  
						
						
						
					 
					
						2014-10-15 14:05:42 +02:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							9b9f097adb 
							
						 
					 
					
						
						
							
							Implementing https rewrite support  #71  
						
						... 
						
						
						
						* 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-15 14:05:41 +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 
						 
				 
			
				
					
						
							
							
								kernc 
							
						 
					 
					
						
						
						
						
							
						
						
							e1b76c6811 
							
						 
					 
					
						
						
							
							Search Music also on YouTube  
						
						... 
						
						
						
						YouTube hosts a lot of music and should be enabled for Music search by default. 
						
					 
					
						2014-10-13 14:51:15 +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 
						 
				 
			
				
					
						
							
							
								dalf 
							
						 
					 
					
						
						
						
						
							
						
						
							cac1761a54 
							
						 
					 
					
						
						
							
							[enh] infoboxes : if the result doesn't contain anything except one link, use the normal result template  
						
						
						
					 
					
						2014-10-11 15:49:50 +02:00 
						 
				 
			
				
					
						
							
							
								dalf 
							
						 
					 
					
						
						
						
						
							
						
						
							295b1699ce 
							
						 
					 
					
						
						
							
							[mod] return only one result from the wikidata engine  
						
						
						
					 
					
						2014-10-11 12:47:30 +02:00 
						 
				 
			
				
					
						
							
							
								dalf 
							
						 
					 
					
						
						
						
						
							
						
						
							599c1137bb 
							
						 
					 
					
						
						
							
							[fix] the bang was included in the search string  
						
						
						
					 
					
						2014-10-11 12:46:12 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							4da795895d 
							
						 
					 
					
						
						
							
							[fix] default template handling  
						
						
						
					 
					
						2014-10-09 19:26:02 +02:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							032eb2354e 
							
						 
					 
					
						
						
							
							add japanese translation  
						
						
						
					 
					
						2014-10-05 17:13:39 +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 
						 
				 
			
				
					
						
							
							
								dalf 
							
						 
					 
					
						
						
						
						
							
						
						
							63a0328c8b 
							
						 
					 
					
						
						
							
							[enh] wikidata engine : add links to musicbrainz  
						
						
						
					 
					
						2014-10-02 23:40:06 +02:00 
						 
				 
			
				
					
						
							
							
								dalf 
							
						 
					 
					
						
						
						
						
							
						
						
							728fc611da 
							
						 
					 
					
						
						
							
							[fix] infoboxes and answers : pass all tests  
						
						
						
					 
					
						2014-10-01 22:46:31 +02:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							1e99cf2a0e 
							
						 
					 
					
						
						
							
							Merge pull request  #93  from dalf/master  
						
						... 
						
						
						
						yahoo, bing_new and dailymotion fixes 
						
					 
					
						2014-09-07 19:12:05 +02:00