Adam Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								a04fafd419
								
							
						 | 
						
							
							
								
								Merge branch 'code_results' of https://github.com/pointhi/searx into pointhi-code_results
							
							
							
							
							
							
							
							Conflicts:
	searx/static/themes/default/css/style.css
	searx/static/themes/oscar/css/oscar.min.css
	searx/templates/oscar/result_templates/torrent.html 
							
						 | 
						
							2015-01-15 18:26:00 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cqoicebordel
								
							 
						 | 
						
							
							
							
							
								
							
							
								824208491a
								
							
						 | 
						
							
							
								
								Scientific accuracy
							
							
							
							
							
						 | 
						
							2015-01-12 13:08:32 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cqoicebordel
								
							 
						 | 
						
							
							
							
							
								
							
							
								3002725e2d
								
							
						 | 
						
							
							
								
								Few more translations
							
							
							
							
							
						 | 
						
							2015-01-12 11:04:54 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cqoicebordel
								
							 
						 | 
						
							
							
							
							
								
							
							
								c59d0c200e
								
							
						 | 
						
							
							
								
								Fix torrent W3C+UX
							
							
							
							
							
							
							
							Puts links to torrents and magnets in tool bar
Fixes a lot of W3C errors 
							
						 | 
						
							2015-01-11 19:34:11 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thomas Pointhuber
								
							 
						 | 
						
							
							
							
							
								
							
							
								eb6f3348c4
								
							
						 | 
						
							
							
								
								[enh] display filesize greater 1TB
							
							
							
							
							
						 | 
						
							2015-01-10 19:44:08 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thomas Pointhuber
								
							 
						 | 
						
							
							
							
							
								
							
							
								08f820d74c
								
							
						 | 
						
							
							
								
								[enh] make some torrent strings translatable
							
							
							
							
							
						 | 
						
							2015-01-10 19:42:41 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thomas Pointhuber
								
							 
						 | 
						
							
							
							
							
								
							
							
								830f70a6bc
								
							
						 | 
						
							
							
								
								[enh] improve torrent results
							
							
							
							
							
						 | 
						
							2015-01-10 19:40:27 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thomas Pointhuber
								
							 
						 | 
						
							
							
							
							
								
							
							
								400b54191c
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://github.com/asciimoo/searx into code_results
							
							
							
							
							
							
							
							Conflicts:
	searx/engines/searchcode_code.py
	searx/engines/searchcode_doc.py
	searx/static/oscar/js/searx.min.js
	searx/templates/oscar/result_templates/default.html
	searx/templates/oscar/result_templates/images.html
	searx/templates/oscar/result_templates/map.html
	searx/templates/oscar/result_templates/torrent.html
	searx/templates/oscar/result_templates/videos.html 
							
						 | 
						
							2015-01-09 21:30:09 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Adam Tauber
								
							 
						 | 
						
							
							
							
							
								
							
							
								e5a323b288
								
							
						 | 
						
							
							
								
								[fix] favicon paths
							
							
							
							
							
						 | 
						
							2015-01-01 19:52:05 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thomas Pointhuber
								
							 
						 | 
						
							
							
							
							
								
							
							
								d810763107
								
							
						 | 
						
							
							
								
								[enh] remove repeating codeparts inside the oscar template
							
							
							
							
							
						 | 
						
							2014-12-22 16:07:02 +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
								
							 
						 | 
						
							
							
							
							
								
							
							
								f3f544d5b5
								
							
						 | 
						
							
							
								
								Use the new way of finding the favicon
							
							
							
							
							
						 | 
						
							2014-12-12 19:15:30 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cqoicebordel
								
							 
						 | 
						
							
							
							
							
								
							
							
								9ea2d8c131
								
							
						 | 
						
							
							
								
								Bug + HTML corrections
							
							
							
							
							
							
							
							Add alt on favicons
Use correct datetime format
Remove pubdate tag
Use url instead of pretty_url for web.archive.org 
							
						 | 
						
							2014-12-08 01:22:54 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thomas Pointhuber
								
							 
						 | 
						
							
							
							
							
								
							
							
								c0fc248213
								
							
						 | 
						
							
							
								
								[enh] template_oscar: improve visualisation of torrent results
							
							
							
							
							
						 | 
						
							2014-11-03 19:00:56 +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
								
							 
						 | 
						
							
							
							
							
								
							
							
								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
								
							 
						 | 
						
							
							
							
							
								
							
							
								517e57b996
								
							
						 | 
						
							
							
								
								oscar template: improve result icons
							
							
							
							
							
						 | 
						
							2014-10-05 14:40:47 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thomas Pointhuber
								
							 
						 | 
						
							
							
							
							
								
							
							
								f3b565e17e
								
							
						 | 
						
							
							
								
								oscar template: implement first version of results page
							
							
							
							
							
							
							
							* implement results page
* improve search form template
* implement all result_templates
* fix youtube engine 
							
						 | 
						
							2014-10-05 14:40:46 +02:00 | 
						
						
							
							
							
								
							
							
						 |