Thomas Pointhuber
							
						 
					 | 
					
						
						
						
						
							
						
						
							afcfa04e30
							
						
					 | 
					
						
						
							
							oscar template: improve style for check and uncheck of engines
						
						
						
						
						
						
					 | 
					
						2014-10-05 14:40:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas Pointhuber
							
						 
					 | 
					
						
						
						
						
							
						
						
							8c6e63402a
							
						
					 | 
					
						
						
							
							add more tooltips to preferences
						
						
						
						
						
						
					 | 
					
						2014-10-05 14:40:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas Pointhuber
							
						 
					 | 
					
						
						
						
						
							
						
						
							d0913f894a
							
						
					 | 
					
						
						
							
							remove text from alert-info in /stats
						
						
						
						
						
						
					 | 
					
						2014-10-05 14:40:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas Pointhuber
							
						 
					 | 
					
						
						
						
						
							
						
						
							a88ce4bd33
							
						
					 | 
					
						
						
							
							little enhancement of oscar template
						
						
						
						
						
						
						
						* improve site-titles
* add message which tell you if no data is availabe yet 
						
						
					 | 
					
						2014-10-05 14:40:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas Pointhuber
							
						 
					 | 
					
						
						
						
						
							
						
						
							c21a907cac
							
						
					 | 
					
						
						
							
							initial commit of the new template 'oscar'
						
						
						
						
						
						
						
						* base.html mostly implemented
* stats.html implemented
* about.html implemented
* most of preferences.html implemented
* using bootstrap.js 
						
						
					 | 
					
						2014-10-05 14:40:46 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
						
						
							
						
						
							f72255e342
							
						
					 | 
					
						
						
							
							[enh] setup.py keywords
						
						
						
						
						
						
					 | 
					
						2014-09-06 13:51:44 +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 | 
					
					
						
						
							
							
							
						
					 |