Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								d6b1ff08ad 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:asciimoo/searx  
							
							
							
						 
						
							2015-01-09 04:15:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								299a80a1eb 
								
							 
						 
						
							
							
								
								[enh] using the logger  
							
							
							
						 
						
							2015-01-09 04:13:05 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								425a576f28 
								
							 
						 
						
							
							
								
								[fix] template syntax  
							
							
							
						 
						
							2015-01-09 04:05:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								6cbd29f674 
								
							 
						 
						
							
							
								
								[enh] logging added  
							
							
							
						 
						
							2015-01-09 04:01:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								05be069f42 
								
							 
						 
						
							
							
								
								Merge branch 'integrated-videos' of  https://github.com/Cqoicebordel/searx  into Cqoicebordel-integrated-videos  
							
							... 
							
							
							
							Conflicts:
	searx/engines/vimeo.py 
							
						 
						
							2015-01-07 11:48:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cqoicebordel 
								
							 
						 
						
							
							
							
							
								
							
							
								a723936ad4 
								
							 
						 
						
							
							
								
								Updated translations without fuzzy translations  
							
							
							
						 
						
							2015-01-05 20:56:48 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cqoicebordel 
								
							 
						 
						
							
							
							
							
								
							
							
								cacdb064db 
								
							 
						 
						
							
							
								
								Updated translations  
							
							
							
						 
						
							2015-01-05 20:26:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cqoicebordel 
								
							 
						 
						
							
							
							
							
								
							
							
								67bd68b5e5 
								
							 
						 
						
							
							
								
								Put media above result content  
							
							... 
							
							
							
							Mimick more closely usual video viewer (video above, details below) 
							
						 
						
							2015-01-05 20:25:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cqoicebordel 
								
							 
						 
						
							
							
							
							
								
							
							
								0ca04be55d 
								
							 
						 
						
							
							
								
								Remove print  
							
							
							
						 
						
							2015-01-05 20:24:33 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cqoicebordel 
								
							 
						 
						
							
							
							
							
								
							
							
								b918cd2b8e 
								
							 
						 
						
							
							
								
								Whitespace correction  
							
							
							
						 
						
							2015-01-05 02:09:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cqoicebordel 
								
							 
						 
						
							
							
							
							
								
							
							
								4a195e0b28 
								
							 
						 
						
							
							
								
								Integrated media in results + Deezer Engine  
							
							... 
							
							
							
							New "embedded" item for the results, allow to give an iframe to display the media directly in the results.
Note that the attributes src of the iframes are not set, but instead data-src is set, allowing to only load the iframe when clicked.
Deezer engine based on public API (no key). 
							
						 
						
							2015-01-05 02:04:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cqoicebordel 
								
							 
						 
						
							
							
							
							
								
							
							
								3aa3a4633f 
								
							 
						 
						
							
							
								
								Few fixes on Vimeo  
							
							... 
							
							
							
							Change URL from https to http
Change way of handling text xpath 
							
						 
						
							2015-01-03 23:55:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cqoicebordel 
								
							 
						 
						
							
							
							
							
								
							
							
								4450ed5503 
								
							 
						 
						
							
							
								
								Digg correction  
							
							... 
							
							
							
							Return no result instead of crashing if no result 
							
						 
						
							2015-01-03 23:54:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cqoicebordel 
								
							 
						 
						
							
							
							
							
								
							
							
								96c4d52eef 
								
							 
						 
						
							
							
								
								Add non exclusif bang  
							
							... 
							
							
							
							Allow to perform a search while adding an engine (or a category) without adding it "officially" to the request.
'?' is used to add an engine without modifying anything else to the request. For example, you can perform a search in the 'general' category, and if you add '?tw' the result from Twitter will be added to the originals results. 
							
						 
						
							2015-01-03 02:31:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								cc4e17b668 
								
							 
						 
						
							
							
								
								[fix] pep8  
							
							
							
						 
						
							2015-01-02 12:33:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								e5a323b288 
								
							 
						 
						
							
							
								
								[fix] favicon paths  
							
							
							
						 
						
							2015-01-01 19:52:05 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								798bef77f9 
								
							 
						 
						
							
							
								
								[fix] static content paths  
							
							
							
						 
						
							2015-01-01 19:24:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								2f9a386c0d 
								
							 
						 
						
							
							
								
								[enh] better result template handling  
							
							
							
						 
						
							2015-01-01 18:59:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								20c4de8f06 
								
							 
						 
						
							
							
								
								[fix] filename strip  
							
							
							
						 
						
							2015-01-01 18:06:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								8151585918 
								
							 
						 
						
							
							
								
								[fix] static file paths  
							
							
							
						 
						
							2015-01-01 17:54:33 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								9f12605f7e 
								
							 
						 
						
							
							
								
								[enh] themes static content refactor  
							
							
							
						 
						
							2015-01-01 17:48:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								e3957d6adf 
								
							 
						 
						
							
							
								
								Merge pull request  #143  from Cqoicebordel/Wiki-date  
							
							... 
							
							
							
							Use human readable date for infobox 
							
						 
						
							2015-01-01 14:36:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								2181c4384e 
								
							 
						 
						
							
							
								
								[mod] purge local html_to_text  
							
							
							
						 
						
							2015-01-01 14:14:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								1408859b4b 
								
							 
						 
						
							
							
								
								[fix] ignore scripts/styles in html_to_text  
							
							
							
						 
						
							2015-01-01 14:13:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								469e08881e 
								
							 
						 
						
							
							
								
								Merge pull request  #165  from Cqoicebordel/Moar-engines  
							
							... 
							
							
							
							Moar engines 
							
						 
						
							2015-01-01 14:10:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								c7cbd38fcc 
								
							 
						 
						
							
							
								
								Merge pull request  #164  from pointhi/favicons  
							
							... 
							
							
							
							improve Favicons 
							
						 
						
							2015-01-01 14:06:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cqoicebordel 
								
							 
						 
						
							
							
							
							
								
							
							
								5d977056f7 
								
							 
						 
						
							
							
								
								Flake8 and Twitter corrections  
							
							... 
							
							
							
							Lots of Flake8 corrections
Maybe we should change the rule to allow lines of 120 chars. It seems more usable.
Big twitter correction : now it outputs the words in right order... 
							
						 
						
							2014-12-29 21:31:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cqoicebordel 
								
							 
						 
						
							
							
							
							
								
							
							
								576fdef440 
								
							 
						 
						
							
							
								
								Google Play Store  
							
							... 
							
							
							
							Add Google play store apps, movies and music (sound -> gps) 
							
						 
						
							2014-12-28 23:23:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cqoicebordel 
								
							 
						 
						
							
							
							
							
								
							
							
								e7e2981536 
								
							 
						 
						
							
							
								
								Digg + Twitter corrections  
							
							... 
							
							
							
							Digg engines, with thumbnails
Add pubdate for twitter 
							
						 
						
							2014-12-28 22:57:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thomas Pointhuber 
								
							 
						 
						
							
							
							
							
								
							
							
								8f4814ade2 
								
							 
						 
						
							
							
								
								[fix] fix test  
							
							
							
						 
						
							2014-12-28 15:53:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thomas Pointhuber 
								
							 
						 
						
							
							
							
							
								
							
							
								67698ad29a 
								
							 
						 
						
							
							
								
								[enh] add new favicons to oscar template  
							
							
							
						 
						
							2014-12-28 15:46:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thomas Pointhuber 
								
							 
						 
						
							
							
							
							
								
							
							
								a7adcacd04 
								
							 
						 
						
							
							
								
								[enh] add new marker-icons for map  
							
							... 
							
							
							
							fetched from https://github.com/pointhi/leaflet-color-markers  
							
						 
						
							2014-12-28 15:10:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thomas Pointhuber 
								
							 
						 
						
							
							
							
							
								
							
							
								a0293d6196 
								
							 
						 
						
							
							
								
								[enh] move favicons into own directory  
							
							
							
						 
						
							2014-12-28 15:07:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thomas Pointhuber 
								
							 
						 
						
							
							
							
							
								
							
							
								98815a0d61 
								
							 
						 
						
							
							
								
								[enh] add turkish translation  
							
							
							
						 
						
							2014-12-28 09:52:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thomas Pointhuber 
								
							 
						 
						
							
							
							
							
								
							
							
								35dc043c09 
								
							 
						 
						
							
							
								
								[enh] update translations  
							
							
							
						 
						
							2014-12-27 14:43:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								fcc394540b 
								
							 
						 
						
							
							
								
								[enh] v0.6.0  
							
							
							
						 
						
							2014-12-25 17:56:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								5cfb42350b 
								
							 
						 
						
							
							
								
								[enh] nl, de, fr, hu translation updates  
							
							
							
						 
						
							2014-12-25 11:06:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								61ab5f2693 
								
							 
						 
						
							
							
								
								[fix] view tests  
							
							
							
						 
						
							2014-12-24 21:15:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								3b3921fc59 
								
							 
						 
						
							
							
								
								[enh] subtitleseeker: better language handling  
							
							
							
						 
						
							2014-12-24 21:02:26 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								ada01cb367 
								
							 
						 
						
							
							
								
								Merge branch 'Detect-favicons' of  https://github.com/Cqoicebordel/searx  into Cqoicebordel-Detect-favicons  
							
							... 
							
							
							
							Conflicts:
	searx/templates/courgette/result_templates/default.html
	searx/templates/courgette/result_templates/map.html
	searx/templates/courgette/result_templates/videos.html
	searx/templates/default/result_templates/default.html
	searx/templates/default/result_templates/map.html
	searx/templates/default/result_templates/videos.html
	searx/webapp.py 
							
						 
						
							2014-12-24 20:34:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								5857141e49 
								
							 
						 
						
							
							
								
								Merge pull request  #161  from Cqoicebordel/SubtitleSeeker-engine  
							
							... 
							
							
							
							SubtitleSeeker Engine 
							
						 
						
							2014-12-24 20:21:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cqoicebordel 
								
							 
						 
						
							
							
							
							
								
							
							
								10e4f6f316 
								
							 
						 
						
							
							
								
								Add language support  
							
							... 
							
							
							
							Allow the user to select a language. It must be written in english, and capitalized, ie : English, French, German, Hungarian... 
							
						 
						
							2014-12-23 01:51:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cqoicebordel 
								
							 
						 
						
							
							
							
							
								
							
							
								2ea55b1c64 
								
							 
						 
						
							
							
								
								Add language support  
							
							... 
							
							
							
							Allow the user to select a language. It must be written in english, and capitalized, ie : English, French, German, Hungarian... (reverted from commit 829948b85d 
							
						 
						
							2014-12-23 01:45:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cqoicebordel 
								
							 
						 
						
							
							
							
							
								
							
							
								829948b85d 
								
							 
						 
						
							
							
								
								Add language support  
							
							... 
							
							
							
							Allow the user to select a language. It must be written in english, and capitalized, ie : English, French, German, Hungarian... 
							
						 
						
							2014-12-23 01:41:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thomas Pointhuber 
								
							 
						 
						
							
							
							
							
								
							
							
								af8dac93a8 
								
							 
						 
						
							
							
								
								[enh] fix pep8, improve syntax highlighting  
							
							
							
						 
						
							2014-12-22 16:26:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thomas Pointhuber 
								
							 
						 
						
							
							
							
							
								
							
							
								d810763107 
								
							 
						 
						
							
							
								
								[enh] remove repeating codeparts inside the oscar template  
							
							
							
						 
						
							2014-12-22 16:07:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thomas Pointhuber 
								
							 
						 
						
							
							
							
							
								
							
							
								7b44fd47a7 
								
							 
						 
						
							
							
								
								[enh] improve grunt-file for oscar_template  
							
							
							
						 
						
							2014-12-22 15:28:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								b975418e4c 
								
							 
						 
						
							
							
								
								[fix] flickr engine code cleanup ++ handle missing owner  
							
							
							
						 
						
							2014-12-22 14:15:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Adam Tauber 
								
							 
						 
						
							
							
							
							
								
							
							
								af41607410 
								
							 
						 
						
							
							
								
								Merge pull request  #149  from Cqoicebordel/Flickr-engine  
							
							... 
							
							
							
							Rework Flickr Engine 
							
						 
						
							2014-12-22 13:33:32 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cqoicebordel 
								
							 
						 
						
							
							
							
							
								
							
							
								550232fc21 
								
							 
						 
						
							
							
								
								SubtitleSeeker Engine  
							
							... 
							
							
							
							Add the subtitleseeker engine. 
							
						 
						
							2014-12-22 01:00:16 +01:00