Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							c7cbd38fcc 
							
						 
					 
					
						
						
							
							Merge pull request  #164  from pointhi/favicons  
						
						... 
						
						
						
						improve Favicons 
						
					 
					
						2015-01-01 14:06:34 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							213667b1ef 
							
						 
					 
					
						
						
							
							Merge pull request  #163  from pointhi/translations  
						
						... 
						
						
						
						[enh] update translations 
						
					 
					
						2015-01-01 14:05:51 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							011c43b485 
							
						 
					 
					
						
						
							
							[doc] list indentation fix  
						
						
						
					 
					
						2014-12-25 18:07:22 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							fcc394540b 
							
						 
					 
					
						
						
							
							[enh] v0.6.0  
						
						
						
					 
					
						2014-12-25 17:56:01 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							62a7dc1aaa 
							
						 
					 
					
						
						
							
							[doc] changelog added  
						
						
						
					 
					
						2014-12-25 11:11:42 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							b4f39237a3 
							
						 
					 
					
						
						
							
							Merge branch 'Cqoicebordel-Detect-favicons'  
						
						
						
					 
					
						2014-12-24 20:34:54 +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 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							7adb17452d 
							
						 
					 
					
						
						
							
							[enh] add result_templates/code.html  
						
						
						
					 
					
						2014-12-20 23:33:03 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							2e41bfcbdb 
							
						 
					 
					
						
						
							
							[enh] engine shortcut validation  
						
						
						
					 
					
						2014-12-20 12:17:03 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							7eb27848c2 
							
						 
					 
					
						
						
							
							Merge pull request  #159  from pointhi/photon_fix  
						
						... 
						
						
						
						[fix] fix language support in photon engine 
						
					 
					
						2014-12-20 11:58:34 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							0b3d632cd0 
							
						 
					 
					
						
						
							
							Merge pull request  #158  from Cqoicebordel/Moar-Engines  
						
						... 
						
						
						
						Add 500px and Searchcode engines 
						
					 
					
						2014-12-20 11:58:24 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							533e6287ae 
							
						 
					 
					
						
						
							
							[fix] fix language support in photon engine  
						
						
						
					 
					
						2014-12-20 10:25:53 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							56399cf1ea 
							
						 
					 
					
						
						
							
							Add 500px and Searchcode engines  
						
						... 
						
						
						
						Allow to search for images on 500px. It doesn't use the official API, but the page result. Less stable, but less API key to possess...
Two engines were necessary for Searchcode because there are to search mode : search for documentation or search for code example. Both use open APIs. 
						
					 
					
						2014-12-20 07:07:32 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							667f4d5cfc 
							
						 
					 
					
						
						
							
							Merge pull request  #156  from Cqoicebordel/Fix-map-oscar  
						
						... 
						
						
						
						[fix][enh] Multiple JS changes in Oscar 
						
					 
					
						2014-12-19 22:53:37 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							f141773814 
							
						 
					 
					
						
						
							
							[mod][fix] https rewrite refactor ++ fixes  
						
						
						
					 
					
						2014-12-19 22:40:37 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							813247b37a 
							
						 
					 
					
						
						
							
							Merge pull request  #152  from pointhi/search_engines  
						
						... 
						
						
						
						[enh] add photon engine, and fix pep8 errors 
						
					 
					
						2014-12-19 20:06:21 +01:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							2fe3323449 
							
						 
					 
					
						
						
							
							Add double clic on categories  
						
						... 
						
						
						
						Allow to double clic on any category to activate or deactivate all categories. 
						
					 
					
						2014-12-19 06:11:46 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							2ab621c0e3 
							
						 
					 
					
						
						
							
							Some more path issues  
						
						
						
					 
					
						2014-12-19 05:05:12 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							83d6f36659 
							
						 
					 
					
						
						
							
							Final commit on favicons  
						
						... 
						
						
						
						Definitely remove engine array
Change every themes to accomodate that change
Tweak of video template of oscar to add link on video thumbnail 
						
					 
					
						2014-12-18 16:26:32 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							06b59c7210 
							
						 
					 
					
						
						
							
							[fix] Show map on result in Oscar  
						
						... 
						
						
						
						Allow to find the leafleet js when searx is not installed at the root of the web server. 
						
					 
					
						2014-12-18 15:51:09 +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 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							17fd4ea4e7 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/Flickr-engine' into Flickr-engine  
						
						... 
						
						
						
						Conflicts:
	searx/engines/flickr.py
	searx/settings.yml 
						
					 
					
						2014-12-16 20:44:11 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							930f724ec6 
							
						 
					 
					
						
						
							
							Add an No Api Flickr Engine  
						
						... 
						
						
						
						It uses the webpage json infos to build the results
Let the user choose the engine in setting.yml. Noapi active by default
+ little corrections on Flickr engine 
						
					 
					
						2014-12-16 20:40:03 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							a508d540ac 
							
						 
					 
					
						
						
							
							[fix] pep8  
						
						
						
					 
					
						2014-12-16 17:26:16 +01:00