| 
							
							
								 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 | 2b7f3e28e7 | [mod] display timeoutted engine name | 2014-12-19 13:59:41 +01:00 |  | 
			
				
					| 
							
							
								 Adam Tauber | 789e46f1c8 | [fix] timeout and response parsing order | 2014-12-18 12:07:20 +01:00 |  | 
			
				
					| 
							
							
								 Adam Tauber | 77c3a27f56 | [mod] strict timeout handling | 2014-12-18 10:11:56 +01:00 |  | 
			
				
					| 
							
							
								 Thomas Pointhuber | 70fc1002db | [fix] fix kickass engine thanks @Cqoicebordel in #144:
https://github.com/asciimoo/searx/pull/144#issuecomment-67036903 | 2014-12-15 19:37: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 | 8e6ae188b8 | [mod] search thread names | 2014-12-08 23:55:11 +01:00 |  | 
			
				
					| 
							
							
								 Adam Tauber | d959cb1c05 | [enh] gevent/grequests changed to the built-in threading lib | 2014-12-05 19:24:11 +01:00 |  | 
			
				
					| 
							
							
								 Thomas Pointhuber | 5a7f85ecee | [fix] #121, HTTP 500 Error if res["content"] == None | 2014-11-01 17:32:26 +01:00 |  | 
			
				
					| 
							
							
								 Adam Tauber | 5740cfbf1c | [fix] pep8 part II. | 2014-10-19 12:41:04 +02:00 |  | 
			
				
					| 
							
							
								 dalf | 599c1137bb | [fix] the bang was included in the search string | 2014-10-11 12:46:12 +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 |  | 
			
				
					| 
							
							
								 Thomas Pointhuber | 62d1a70c84 | using Query class for parsing of search query | 2014-10-01 17:57:53 +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 | 5d1610d87a | [enh] stick results from the same category and template | 2014-09-14 14:39:22 +02:00 |  | 
			
				
					| 
							
							
								 Thomas Pointhuber | 22da73b8bb | little update update comments in search.py | 2014-09-13 18:44:11 +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 | b0ba367a1a | [enh][mod] search refactor | 2014-07-07 13:59:27 +02:00 |  | 
			
				
					| 
							
							
								 asciimoo | c1d7d30b8e | [mod] len() removed from conditions | 2014-02-11 13:13:51 +01:00 |  | 
			
				
					| 
							
							
								 asciimoo | 9ede9b955d | [fix] language query string comparison | 2014-02-09 11:35:52 +01:00 |  | 
			
				
					| 
							
							
								 asciimoo | 7c031a3ea6 | [enh] better search language selection from query | 2014-02-09 11:12:58 +01:00 |  | 
			
				
					| 
							
							
								 asciimoo | d11a873d40 | [enh] chainable query modifiers | 2014-02-09 01:23:01 +01:00 |  | 
			
				
					| 
							
							
								 asciimoo | a641971a6f | [enh] language selection from query | 2014-02-09 01:22:30 +01:00 |  | 
			
				
					| 
							
							
								 asciimoo | 7f45e8a562 | [mod] query parsing refactor vol.1 | 2014-02-09 01:07:18 +01:00 |  | 
			
				
					| 
							
							
								 asciimoo | 9eb31c0186 | [fix] unicode and pep8 fixes | 2014-02-07 02:45:12 +01:00 |  | 
			
				
					| 
							
							
								 asciimoo | 0540ea9ee2 | [enh][mod] code refactor ++ search engine filtering | 2014-02-07 01:19:07 +01:00 |  |