Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							bc81eda64b 
							
						 
					 
					
						
						
							
							[fix] opensearch image issue -  closes   #507  
						
						
						
					 
					
						2016-03-02 11:52:11 +01:00 
						 
				 
			
				
					
						
							
							
								a01200356 
							
						 
					 
					
						
						
						
						
							
						
						
							4267b11a45 
							
						 
					 
					
						
						
							
							[fix] apply changes in infobox's styles  
						
						... 
						
						
						
						changes were made for wolframalpha infobox:
    - wrap text inside infobox.
      for example, there's a hill in New Zealand called
      Taumatawhakatangihangakoauauotamateapokaiwhenuakitanatahu
      (don't blame me, blame the Kiwis)
      and now it doesn't break the infobox.
    - add an optional image field for infobox's attributes.
      (doesn't affect ddg infobox at all)
    - table is now always split in half.
      needed so that images stay inside infobox.
      (max-width doesn't work for inline elements, it's the table
      that has to set the width.
if you don't like how the table width looks now in ddg/wiki's infobox,
i can change that code so that the style only applies when using
wolframalpha. 
						
					 
					
						2016-02-27 19:19:04 -06:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							0fbd705259 
							
						 
					 
					
						
						
							
							[enh] settings option to change instance name -  closes   #450  
						
						
						
					 
					
						2016-02-27 18:23:55 +01:00 
						 
				 
			
				
					
						
							
							
								GreenLunar 
							
						 
					 
					
						
						
						
						
							
						
						
							e01ef3bee1 
							
						 
					 
					
						
						
							
							Update link to documentation page  
						
						
						
					 
					
						2015-12-23 10:31:25 +02:00 
						 
				 
			
				
					
						
							
							
								GreenLunar 
							
						 
					 
					
						
						
						
						
							
						
						
							9a5aba393d 
							
						 
					 
					
						
						
							
							Update description  
						
						
						
					 
					
						2015-12-04 02:42:54 +02:00 
						 
				 
			
				
					
						
							
							
								GreenLunar 
							
						 
					 
					
						
						
						
						
							
						
						
							3d129823df 
							
						 
					 
					
						
						
							
							Update description  
						
						
						
					 
					
						2015-12-04 02:42:08 +02:00 
						 
				 
			
				
					
						
							
							
								GreenLunar 
							
						 
					 
					
						
						
						
						
							
						
						
							f8aba1cad8 
							
						 
					 
					
						
						
							
							Update description  
						
						
						
					 
					
						2015-12-04 02:41:33 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							5eabba2da1 
							
						 
					 
					
						
						
							
							[mod] list all engines of a result  
						
						
						
					 
					
						2015-10-03 17:46:12 +02:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							a75d10206e 
							
						 
					 
					
						
						
							
							Correct the loop through search engines  
						
						... 
						
						
						
						Fix  #432  
					
						2015-09-17 18:18:48 +02:00 
						 
				 
			
				
					
						
							
							
								Luc Didry 
							
						 
					 
					
						
						
						
						
							
						
						
							57e618edf7 
							
						 
					 
					
						
						
							
							Add Image on opensearch  
						
						
						
					 
					
						2015-07-09 23:05:45 +02:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							a8b75ca47b 
							
						 
					 
					
						
						
							
							[enh] oscar template: using table instead of container-fluid to show cookies  
						
						
						
					 
					
						2015-06-05 09:07:59 +02:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							0978f10887 
							
						 
					 
					
						
						
							
							[fix] do not hide categorie inside preferences if there is no engine activated  
						
						
						
					 
					
						2015-06-05 08:48:47 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Flament 
							
						 
					 
					
						
						
						
						
							
						
						
							d4d2dd9cb3 
							
						 
					 
					
						
						
							
							[enh] oscar theme: display engine response times in the preferences  
						
						
						
					 
					
						2015-05-30 12:15:23 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							01bebc0c30 
							
						 
					 
					
						
						
							
							[enh] prettier search url display  
						
						
						
					 
					
						2015-05-19 18:58:04 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							41e00e65a5 
							
						 
					 
					
						
						
							
							Merge branch 'oscar-cookies' of  https://github.com/Cqoicebordel/searx  into Cqoicebordel-oscar-cookies  
						
						... 
						
						
						
						Conflicts:
	searx/templates/oscar/preferences.html 
						
					 
					
						2015-04-26 20:14:40 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							5c5ff19ec1 
							
						 
					 
					
						
						
							
							[fix] indentation  
						
						
						
					 
					
						2015-04-26 20:09:28 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							39f0cd94ee 
							
						 
					 
					
						
						
							
							[fix] remove swapfile  
						
						
						
					 
					
						2015-04-26 18:53:17 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Flament 
							
						 
					 
					
						
						
						
						
							
						
						
							ada5993f61 
							
						 
					 
					
						
						
							
							[fix]  #264  : implementation using Referrer Policy (Editor’s Draft, 3 March 2015)  
						
						... 
						
						
						
						see http://w3c.github.io/webappsec/specs/referrer-policy/  
						
					 
					
						2015-04-26 15:48:48 +02:00 
						 
				 
			
				
					
						
							
							
								Alexandre Flament 
							
						 
					 
					
						
						
						
						
							
						
						
							77b2fbb61e 
							
						 
					 
					
						
						
							
							[enh] implements  #264  : add rel="noreferrer" to external links  
						
						
						
					 
					
						2015-04-26 15:32:26 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							952473d297 
							
						 
					 
					
						
						
							
							Merge pull request  #246  from Cqoicebordel/pix-arts  
						
						... 
						
						
						
						New theme ! 
						
					 
					
						2015-04-25 12:52:07 -04:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							dd84814b68 
							
						 
					 
					
						
						
							
							[enh] plugins: client side dependency support  
						
						
						
					 
					
						2015-04-12 19:24:01 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							6f73f4e7a4 
							
						 
					 
					
						
						
							
							[fix] ordered categories in preferences -  closes   #258  
						
						
						
					 
					
						2015-04-07 18:09:38 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							1184f45ca5 
							
						 
					 
					
						
						
							
							[enh] reset default preferences  
						
						
						
					 
					
						2015-04-07 11:07:48 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							37c58fd9ca 
							
						 
					 
					
						
						
							
							[enh] plugin preferences - server-side ++ oscar theme  
						
						
						
					 
					
						2015-03-11 18:57:36 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							359dfc5ebb 
							
						 
					 
					
						
						
							
							[mod] checkbox macro  
						
						
						
					 
					
						2015-03-10 23:03:06 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							8d1d4819ae 
							
						 
					 
					
						
						
							
							[fix] whitespace remove and proper no-result warning display  
						
						
						
					 
					
						2015-03-09 00:32:23 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							6ee35145ca 
							
						 
					 
					
						
						
							
							New Tab in preferences in Oscar to view Cookies  
						
						... 
						
						
						
						This tab only purpose is to allow to see what searx is storing on the user's computer.
At a later time, we could implement a way to delete those cookies. 
						
					 
					
						2015-02-18 18:31:01 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							5c63f2a80a 
							
						 
					 
					
						
						
							
							A bit of cleanup  
						
						
						
					 
					
						2015-02-17 19:01:18 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							e181041f11 
							
						 
					 
					
						
						
							
							Ajax loading + Tweaks of CSS  
						
						
						
					 
					
						2015-02-17 01:07:14 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							d740e7384a 
							
						 
					 
					
						
						
							
							New Theme, Pix-art.  
						
						... 
						
						
						
						First commit 
						
					 
					
						2015-02-15 19:09:17 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							bbb5e23551 
							
						 
					 
					
						
						
							
							Remove whitespace caused by Jinja commands  
						
						... 
						
						
						
						Adding this conf change will remove every newline created by a Jinja command (`{% %}`). It can save a bit of bandwidth. 
						
					 
					
						2015-02-14 01:42:06 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							77ba28cf50 
							
						 
					 
					
						
						
							
							Some RTL fixes  
						
						... 
						
						
						
						- Pull the suggestions to the right in oscar
- Add `‎` to a few places to print good url
- Always LTR code display
- Order pref label and info in pref for mobile view
And add `sort` for ui languages and languages to find them more easily. 
						
					 
					
						2015-02-13 01:03:18 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							b5cbbcede4 
							
						 
					 
					
						
						
							
							LTR the about page correctly  
						
						
						
					 
					
						2015-02-12 02:02:30 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							d4ba97d00d 
							
						 
					 
					
						
						
							
							Engine table in preference page in Courgette text-aligned to the right in RTL  
						
						
						
					 
					
						2015-02-11 22:00:13 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							f4bdcc067f 
							
						 
					 
					
						
						
							
							Real fix for preferences in RTL *and* in LTR  
						
						
						
					 
					
						2015-02-11 20:53:06 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							3d5a4b091d 
							
						 
					 
					
						
						
							
							Translate the 'cached' in results  
						
						
						
					 
					
						2015-02-11 20:32:28 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							cec3ea77d5 
							
						 
					 
					
						
						
							
							Maps data must be LTR in RTL  
						
						
						
					 
					
						2015-02-11 20:18:01 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							a4ae775e0f 
							
						 
					 
					
						
						
							
							Preferences in the right order in RTL  
						
						
						
					 
					
						2015-02-11 20:08:04 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							3f4d0053ee 
							
						 
					 
					
						
						
							
							Import result_footer_rtl in video so it doesn't crash...  
						
						
						
					 
					
						2015-02-11 15:58:59 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							df9cf9d09b 
							
						 
					 
					
						
						
							
							Merge branch 'rtl' of github.com:Cqoicebordel/searx  
						
						
						
					 
					
						2015-02-10 15:23:56 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							e7de9674b1 
							
						 
					 
					
						
						
							
							[enh] add safesearch functionality  
						
						... 
						
						
						
						2 = strict
1 = moderate
0 = none 
						
					 
					
						2015-02-08 21:53:37 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							1de781a143 
							
						 
					 
					
						
						
							
							[enh] category specific engine deactivation -  closes   #205  
						
						
						
					 
					
						2015-02-03 18:37:38 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							032f9bb1c9 
							
						 
					 
					
						
						
							
							Revert some wrong merge to allow torrents links to be visible  
						
						
						
					 
					
						2015-01-21 18:03:11 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							cd179bbdbb 
							
						 
					 
					
						
						
							
							Modify theme Courgette to add colors  
						
						... 
						
						
						
						Two colors are needed so I use a space in the cookie and a split in jinja to "encode" and "decode" them.
We should enforce that each theme if they must use a cookie, prefix its name with the name of the theme.
The color proposed here are based on bootstrap. We could use others. 
						
					 
					
						2015-01-19 22:07:19 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							1f00ce8527 
							
						 
					 
					
						
						
							
							Revert: [enh] add new bootstrap-themes to oscar-template  
						
						
						
					 
					
						2015-01-18 13:54:24 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							016a0ffe8a 
							
						 
					 
					
						
						
							
							[enh] show js warning only if menu can't be used or inside preferences  
						
						
						
					 
					
						2015-01-18 13:03:53 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							096ffd0659 
							
						 
					 
					
						
						
							
							[enh] add new bootstrap-themes to oscar-template  
						
						
						
					 
					
						2015-01-18 12:00:38 +01:00 
						 
				 
			
				
					
						
							
							
								dalf 
							
						 
					 
					
						
						
						
						
							
						
						
							1d51512152 
							
						 
					 
					
						
						
							
							Proxify most of images references  
						
						... 
						
						
						
						Create hash only when necessary 
						
					 
					
						2015-01-18 09:54:24 +01:00 
						 
				 
			
				
					
						
							
							
								dalf 
							
						 
					 
					
						
						
						
						
							
						
						
							9154cf7930 
							
						 
					 
					
						
						
							
							Proxify images inside infoboxes  
						
						
						
					 
					
						2015-01-17 22:36:48 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							d910744efe 
							
						 
					 
					
						
						
							
							Test its existence before using thumbnail_src  
						
						... 
						
						
						
						Thanks @pointhi ! 
						
					 
					
						2015-01-17 19:49:21 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							2c15546518 
							
						 
					 
					
						
						
							
							Tiny forgots  
						
						
						
					 
					
						2015-01-17 19:28:11 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							cb4a3fe598 
							
						 
					 
					
						
						
							
							Add thumbnails in images results  
						
						... 
						
						
						
						- Modify engines to create/fetch an URL for the thumbnails
- Modify themes to show thumbnails instead of full images.
In Courgette, the result is not very beautiful. Should we change it ? 
						
					 
					
						2015-01-17 19:21:09 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							0a3b9a7b00 
							
						 
					 
					
						
						
							
							[enh] add image proxy toggle to preferences templates  
						
						
						
					 
					
						2015-01-16 16:58:44 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							a1bf02e652 
							
						 
					 
					
						
						
							
							[enh] add image proxy to image results  
						
						
						
					 
					
						2015-01-16 16:26:48 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							2fc1de54da 
							
						 
					 
					
						
						
							
							Lots of courgette modification  
						
						
						
					 
					
						2015-01-16 00:56:54 +01:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							c5599e3c7c 
							
						 
					 
					
						
						
							
							Merge pull request  #174  from pointhi/nojs_fix  
						
						... 
						
						
						
						add no javascript support to oscar-template 
						
					 
					
						2015-01-15 17:05:44 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							de6064994e 
							
						 
					 
					
						
						
							
							[enh] show text "Start search" instead of icon, if javascript is disabled  
						
						
						
					 
					
						2015-01-15 16:03:30 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							525833bea7 
							
						 
					 
					
						
						
							
							[enh] disable js-based links if no js is available  
						
						
						
					 
					
						2015-01-15 15:55:39 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							5bfaabeb6b 
							
						 
					 
					
						
						
							
							[enh] add nojs support into oscar-template  
						
						
						
					 
					
						2015-01-15 15:48:50 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							389fc3b8b2 
							
						 
					 
					
						
						
							
							Few fixes  
						
						... 
						
						
						
						- Whitespaces
- Change a few <p> in <span>
- Add RSS to allow browser detection
- A few UIUX changes
- Add a few more allowed translations 
						
					 
					
						2015-01-15 01:48:46 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							e32cb59ad6 
							
						 
					 
					
						
						
							
							W3C fix  
						
						
						
					 
					
						2015-01-11 19:45:17 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							6ca81f649d 
							
						 
					 
					
						
						
							
							Fix RSS link  
						
						... 
						
						
						
						Fix page number, urlencoded request and encoded & 
						
					 
					
						2015-01-11 19:34:50 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							9109686c4e 
							
						 
					 
					
						
						
							
							[enh] using less html code to disable autoescaping for embeded results  
						
						
						
					 
					
						2015-01-10 20:26:17 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							29a526ff0e 
							
						 
					 
					
						
						
							
							[enh] add rss-link which can be detected by browsers  
						
						
						
					 
					
						2015-01-10 15:24:21 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							d6b1ff08ad 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:asciimoo/searx  
						
						
						
					 
					
						2015-01-09 04:15:57 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							425a576f28 
							
						 
					 
					
						
						
							
							[fix] template syntax  
						
						
						
					 
					
						2015-01-09 04:05:39 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							a0293d6196 
							
						 
					 
					
						
						
							
							[enh] move favicons into own directory  
						
						
						
					 
					
						2014-12-28 15:07:11 +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 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							d810763107 
							
						 
					 
					
						
						
							
							[enh] remove repeating codeparts inside the oscar template  
						
						
						
					 
					
						2014-12-22 16:07:02 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							7adb17452d 
							
						 
					 
					
						
						
							
							[enh] add result_templates/code.html  
						
						
						
					 
					
						2014-12-20 23:33:03 +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 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							ba51d784d1 
							
						 
					 
					
						
						
							
							[fix] mysterious string remove  
						
						
						
					 
					
						2014-12-14 02:27:58 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							53a9af39ef 
							
						 
					 
					
						
						
							
							Use the new way of finding the favicon  
						
						
						
					 
					
						2014-12-12 19:16:29 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							f3f544d5b5 
							
						 
					 
					
						
						
							
							Use the new way of finding the favicon  
						
						
						
					 
					
						2014-12-12 19:15:30 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							002b812cc6 
							
						 
					 
					
						
						
							
							Use the new way of finding the favicon  
						
						
						
					 
					
						2014-12-12 19:14:30 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							3ffe6014ed 
							
						 
					 
					
						
						
							
							Use the new way of finding the favicon  
						
						
						
					 
					
						2014-12-12 19:13:40 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							3b88adf8b6 
							
						 
					 
					
						
						
							
							Use the new way of finding an icon  
						
						
						
					 
					
						2014-12-12 19:12:37 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							8fb6ea1bf1 
							
						 
					 
					
						
						
							
							Add title and alt on image in infobox  
						
						
						
					 
					
						2014-12-10 18:27:08 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							5104552937 
							
						 
					 
					
						
						
							
							Multiple HTML corrections  
						
						... 
						
						
						
						Alt on favicon
No <p> in <p>
Correct alt and title on img 
						
					 
					
						2014-12-10 18:21:41 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							94ea67547a 
							
						 
					 
					
						
						
							
							HTML and usability corrections  
						
						... 
						
						
						
						Put the result URL at the top, like in other results template
Put the magnet link on the same line as the stats (peer/seed). 
						
					 
					
						2014-12-10 18:20:20 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							3e05570b32 
							
						 
					 
					
						
						
							
							Alt on favicon  
						
						
						
					 
					
						2014-12-10 18:17:47 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							2bb820c281 
							
						 
					 
					
						
						
							
							Correct alt and title  
						
						
						
					 
					
						2014-12-10 18:17:10 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							8708e5fc56 
							
						 
					 
					
						
						
							
							Alt on favicons  
						
						
						
					 
					
						2014-12-10 18:16:32 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							149e19c68a 
							
						 
					 
					
						
						
							
							Correct HTML entities and link  
						
						
						
					 
					
						2014-12-10 18:15:39 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							a809fd1bbb 
							
						 
					 
					
						
						
							
							Multiple HTML corrections  
						
						... 
						
						
						
						Alt on favicon
Width of image should be 400 and not 400px
Correct alt+title on image
No <p> contains <p> 
						
					 
					
						2014-12-10 18:14:29 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							eef05c3ddc 
							
						 
					 
					
						
						
							
							Alt on favicon  
						
						
						
					 
					
						2014-12-10 18:11:59 +01:00 
						 
				 
			
				
					
						
							
							
								Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							b043237c61 
							
						 
					 
					
						
						
							
							Correct alt and title  
						
						
						
					 
					
						2014-12-10 18:11:20 +01:00