| 
							
							
								 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 |  |