Matej Cotman 
							
						 
					 
					
						
						
						
						
							
						
						
							c511b6fda8 
							
						 
					 
					
						
						
							
							change package data in setup.py for oscar theme  
						
						
						
						
					 
					
						2014-11-14 10:24:40 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							b6da893c78 
							
						 
					 
					
						
						
							
							[fix] html attribute quote  
						
						
						
						
					 
					
						2014-11-11 18:59:26 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							0d80d5d3b4 
							
						 
					 
					
						
						
							
							Merge pull request  #105  from pointhi/template_oscar  
						
						... 
						
						
						
						new template: oscar 
						
						
					 
					
						2014-11-11 09:36:39 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							b422788eb4 
							
						 
					 
					
						
						
							
							[fix] wikipedia autocompleter url param  
						
						
						
						
					 
					
						2014-11-04 19:53:42 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							a9b4f458e9 
							
						 
					 
					
						
						
							
							Merge pull request  #6  from pointhi/template_oscar  
						
						... 
						
						
						
						[enh] add no-js support 
						
						
					 
					
						2014-11-04 14:32:53 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							46dd502592 
							
						 
					 
					
						
						
							
							[fix][template][oscar] print ',' only if postcode is found  
						
						
						
						
					 
					
						2014-11-04 12:58:12 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							25312c53e1 
							
						 
					 
					
						
						
							
							[enh] add no-js support  
						
						... 
						
						
						
						* image results have url, which can be clicked
* preferences full functionable without js 
						
						
					 
					
						2014-11-03 22:18:40 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							c0fc248213 
							
						 
					 
					
						
						
							
							[enh] template_oscar: improve visualisation of torrent results  
						
						
						
						
					 
					
						2014-11-03 19:00:56 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							9274a59045 
							
						 
					 
					
						
						
							
							[fix] template_oscar: improve visualisation of video-results  
						
						
						
						
					 
					
						2014-11-03 18:57:48 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							bc12a76fbb 
							
						 
					 
					
						
						
							
							[fix] use address.city if possible  
						
						
						
						
					 
					
						2014-11-03 18:53:04 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							3b7b106684 
							
						 
					 
					
						
						
							
							[enh] template_oscar: add layer to leaflet map  
						
						
						
						
					 
					
						2014-11-03 18:47:18 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							c38917bb2a 
							
						 
					 
					
						
						
							
							[enh] template_oscar: show addressdata if possible  
						
						
						
						
					 
					
						2014-11-03 18:46:58 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							2e7723a6c1 
							
						 
					 
					
						
						
							
							[enh] oscar_template: improve result visualisation  
						
						... 
						
						
						
						* highlight parts of result
* add link to archiv.to
* fix little bugs
* add little icons
* change style of "show map" button 
						
						
					 
					
						2014-11-03 10:39:47 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							b2c976a5a3 
							
						 
					 
					
						
						
							
							[enh] template_oscar: maxZoom if fitting bounds  
						
						
						
						
					 
					
						2014-11-02 22:35:06 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							740594a4b7 
							
						 
					 
					
						
						
							
							[enh] oscar_template: initial osm-map support for map results  
						
						... 
						
						
						
						* TODO: remove leaflet.min.css if not required 
						
						
					 
					
						2014-11-02 13:00:28 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							b4829891f9 
							
						 
					 
					
						
						
							
							fix missing string in translation  
						
						
						
						
					 
					
						2014-11-01 21:15:46 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							ee8cabf496 
							
						 
					 
					
						
						
							
							Merge pull request  #122  from pointhi/bugfix  
						
						... 
						
						
						
						[fix] #121 , HTTP 500 Error if res["content"] == None 
						
						
					 
					
						2014-11-01 17:49:18 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							5a7f85ecee 
							
						 
					 
					
						
						
							
							[fix]  #121 , HTTP 500 Error if res["content"] == None  
						
						
						
						
					 
					
						2014-11-01 17:32:26 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							58cc03351a 
							
						 
					 
					
						
						
							
							Merge pull request  #118  from dalf/master  
						
						... 
						
						
						
						default theme : small modifications 
						
						
					 
					
						2014-10-30 08:09:07 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							a697a1eaa5 
							
						 
					 
					
						
						
							
							oscar template: display answers  
						
						
						
						
					 
					
						2014-10-26 19:20:20 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							0e1035eac1 
							
						 
					 
					
						
						
							
							Merge  https://github.com/asciimoo/searx  into template_oscar  
						
						... 
						
						
						
						Conflicts:
	searx/translations/de/LC_MESSAGES/messages.po
	searx/translations/en/LC_MESSAGES/messages.po
	searx/translations/es/LC_MESSAGES/messages.po
	searx/translations/fr/LC_MESSAGES/messages.po
	searx/translations/hu/LC_MESSAGES/messages.po
	searx/translations/it/LC_MESSAGES/messages.po
	searx/translations/nl/LC_MESSAGES/messages.po
	searx/webapp.py 
						
						
					 
					
						2014-10-26 19:11:28 +01:00 
						 
				 
			
				
					
						
							
							
								dalf 
							
						 
					 
					
						
						
						
						
							
						
						
							8534d8b87a 
							
						 
					 
					
						
						
							
							[fix] test : the icon is included inside the <h3> element  
						
						
						
						
					 
					
						2014-10-26 12:01:54 +01:00 
						 
				 
			
				
					
						
							
							
								dalf 
							
						 
					 
					
						
						
						
						
							
						
						
							a71b326d9e 
							
						 
					 
					
						
						
							
							[mod] default template modifications  
						
						... 
						
						
						
						- more smartphone friendly
- more text browser friendly
- next button always on the right
- in case of small screen supporting touch event, categories are displayed on one line with a scroll 
						
						
					 
					
						2014-10-26 11:14:05 +01:00 
						 
				 
			
				
					
						
							
							
								dalf 
							
						 
					 
					
						
						
						
						
							
						
						
							be4d219ae7 
							
						 
					 
					
						
						
							
							[mod] use pngcrush to reduce the size of png files  
						
						
						
						
					 
					
						2014-10-25 17:07:39 +02:00 
						 
				 
			
				
					
						
							
							
								dalf 
							
						 
					 
					
						
						
						
						
							
						
						
							400279182e 
							
						 
					 
					
						
						
							
							[fix] no horizontal scrolling on small screen  
						
						... 
						
						
						
						[fix] small images in the results aren't not "zoomed" 
						
						
					 
					
						2014-10-25 17:05:37 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							79f1676e31 
							
						 
					 
					
						
						
							
							[doc] @kernc added to authors list  
						
						
						
						
					 
					
						2014-10-21 15:44:40 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							5656fc472c 
							
						 
					 
					
						
						
							
							Merge pull request  #117  from pointhi/https_fix  
						
						... 
						
						
						
						print error if https rewrite directory is not found, #116  
						
						
					 
					
						2014-10-19 21:48:53 +02:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							6ecf03c736 
							
						 
					 
					
						
						
							
							print error if https rewrite directory is not found,  #116  
						
						
						
						
					 
					
						2014-10-19 21:39:30 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							7be9759703 
							
						 
					 
					
						
						
							
							[enh][fix] https rewrite rules added to setup.py  
						
						
						
						
					 
					
						2014-10-19 21:30:56 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							5740cfbf1c 
							
						 
					 
					
						
						
							
							[fix] pep8 part II.  
						
						
						
						
					 
					
						2014-10-19 12:41:04 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							b0fd71b7b3 
							
						 
					 
					
						
						
							
							[fix] pep8 compatibility  
						
						
						
						
					 
					
						2014-10-19 12:18:21 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							28fed5d9ad 
							
						 
					 
					
						
						
							
							Merge pull request  #115  from pointhi/engine_faroo  
						
						... 
						
						
						
						add faroo engine 
						
						
					 
					
						2014-10-19 12:07:02 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							20400c40c3 
							
						 
					 
					
						
						
							
							Merge pull request  #97  from pointhi/https  
						
						... 
						
						
						
						Implementing https rewrite support 
						
						
					 
					
						2014-10-19 12:06:34 +02:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							bc5a7153d3 
							
						 
					 
					
						
						
							
							fix comment header of faroo engine  
						
						
						
						
					 
					
						2014-10-17 12:56:14 +02:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							db4ca4784b 
							
						 
					 
					
						
						
							
							fix faroo engine  
						
						
						
						
					 
					
						2014-10-17 12:54:22 +02:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							8af2184a45 
							
						 
					 
					
						
						
							
							add faroo engine support  
						
						
						
						
					 
					
						2014-10-17 12:42:16 +02:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							1e3e646584 
							
						 
					 
					
						
						
							
							import basic https rules from https-everywhere repository  
						
						... 
						
						
						
						* licenced under GPLv3+
* downloaded from https://github.com/EFForg/https-everywhere  
						
						
					 
					
						2014-10-15 14:52:27 +02:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							bb126da0fb 
							
						 
					 
					
						
						
							
							improve https rewrite code  
						
						
						
						
					 
					
						2014-10-15 14:47:03 +02:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							0616d26feb 
							
						 
					 
					
						
						
							
							improve https rewriting  
						
						
						
						
					 
					
						2014-10-15 14:05:42 +02:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							6e6dbc1bb4 
							
						 
					 
					
						
						
							
							update settings_robot.yml  
						
						
						
						
					 
					
						2014-10-15 14:05:42 +02:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							9b9f097adb 
							
						 
					 
					
						
						
							
							Implementing https rewrite support  #71  
						
						... 
						
						
						
						* parsing XML-Files which contain target, exclusions and rules
* convert regex if required (is a little hack, probably does not work
for all rules)
* check if target rule apply for http url, and use the rules to rewrite
it
* add pice of code, to check if domain name has not changed during
rewrite (should be rewritten, using publicsuffix instead of little hack) 
						
						
					 
					
						2014-10-15 14:05:41 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							840945f498 
							
						 
					 
					
						
						
							
							Merge pull request  #114  from kernc/patch-1  
						
						... 
						
						
						
						Search Music also on YouTube 
						
						
					 
					
						2014-10-13 17:29:45 +02:00 
						 
				 
			
				
					
						
							
							
								kernc 
							
						 
					 
					
						
						
						
						
							
						
						
							e1b76c6811 
							
						 
					 
					
						
						
							
							Search Music also on YouTube  
						
						... 
						
						
						
						YouTube hosts a lot of music and should be enabled for Music search by default. 
						
						
					 
					
						2014-10-13 14:51:15 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							b0bb94fd37 
							
						 
					 
					
						
						
							
							[fix] wikidata: using only the first url  
						
						
						
						
					 
					
						2014-10-12 14:33:03 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							13f36e6675 
							
						 
					 
					
						
						
							
							[enh] translation updates  
						
						
						
						
					 
					
						2014-10-12 13:06:11 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							781b8a23c4 
							
						 
					 
					
						
						
							
							Merge pull request  #110  from pointhi/language_japanese  
						
						... 
						
						
						
						add japanese translation 
						
						
					 
					
						2014-10-12 12:44:55 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							f3d884ef45 
							
						 
					 
					
						
						
							
							Merge pull request  #113  from dalf/master  
						
						... 
						
						
						
						[fix] the bang was included in the search string, [mod] infoboxes modifications 
						
						
					 
					
						2014-10-12 12:43:46 +02:00 
						 
				 
			
				
					
						
							
							
								dalf 
							
						 
					 
					
						
						
						
						
							
						
						
							cac1761a54 
							
						 
					 
					
						
						
							
							[enh] infoboxes : if the result doesn't contain anything except one link, use the normal result template  
						
						
						
						
					 
					
						2014-10-11 15:49:50 +02:00 
						 
				 
			
				
					
						
							
							
								dalf 
							
						 
					 
					
						
						
						
						
							
						
						
							295b1699ce 
							
						 
					 
					
						
						
							
							[mod] return only one result from the wikidata engine  
						
						
						
						
					 
					
						2014-10-11 12:47:30 +02:00 
						 
				 
			
				
					
						
							
							
								dalf 
							
						 
					 
					
						
						
						
						
							
						
						
							599c1137bb 
							
						 
					 
					
						
						
							
							[fix] the bang was included in the search string  
						
						
						
						
					 
					
						2014-10-11 12:46:12 +02:00