Cqoicebordel 
							
						 
					 
					
						
						
						
						
							
						
						
							c2e88339f7 
							
						 
					 
					
						
						
							
							Add pubdate  
						
						... 
						
						
						
						Add pubdate with a good format, against publishedDate. 
						
						
					 
					
						2014-12-08 00:51:46 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							d959cb1c05 
							
						 
					 
					
						
						
							
							[enh] gevent/grequests changed to the built-in threading lib  
						
						
						
						
					 
					
						2014-12-05 19:24:11 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							cfdfca0d41 
							
						 
					 
					
						
						
							
							[fix] whitespace remove  
						
						
						
						
					 
					
						2014-11-18 19:55:39 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							aba65369d2 
							
						 
					 
					
						
						
							
							[enh] make version of searx readable  
						
						
						
						
					 
					
						2014-11-18 11:37:42 +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 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							5740cfbf1c 
							
						 
					 
					
						
						
							
							[fix] pep8 part II.  
						
						
						
						
					 
					
						2014-10-19 12:41:04 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							4da795895d 
							
						 
					 
					
						
						
							
							[fix] default template handling  
						
						
						
						
					 
					
						2014-10-09 19:26:02 +02:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							517e57b996 
							
						 
					 
					
						
						
							
							oscar template: improve result icons  
						
						
						
						
					 
					
						2014-10-05 14:40:47 +02:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							c21a907cac 
							
						 
					 
					
						
						
							
							initial commit of the new template 'oscar'  
						
						... 
						
						
						
						* base.html mostly implemented
* stats.html implemented
* about.html implemented
* most of preferences.html implemented
* using bootstrap.js 
						
						
					 
					
						2014-10-05 14:40:46 +02:00 
						 
				 
			
				
					
						
							
							
								dalf 
							
						 
					 
					
						
						
						
						
							
						
						
							829c758970 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						
						
						
					 
					
						2014-10-01 22:25:11 +02:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							510aba5e66 
							
						 
					 
					
						
						
							
							implement query parser and use it inside autocompletion  
						
						
						
						
					 
					
						2014-10-01 17:18:18 +02:00 
						 
				 
			
				
					
						
							
							
								Dalf 
							
						 
					 
					
						
						
						
						
							
						
						
							6bfd566353 
							
						 
					 
					
						
						
							
							[enh] add infoboxes and answers  
						
						
						
						
					 
					
						2014-09-28 16:51:41 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							c23db1b2bf 
							
						 
					 
					
						
						
							
							[enh] more flexible category selection  
						
						
						
						
					 
					
						2014-09-06 15:21:29 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							ed925cf561 
							
						 
					 
					
						
						
							
							[fix] query escaped in all htmls, invalid todo removed  
						
						
						
						
					 
					
						2014-09-03 00:58:32 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							22a3cf7ac7 
							
						 
					 
					
						
						
							
							[enh] HTTP GET theme select  
						
						
						
						
					 
					
						2014-09-03 00:57:09 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							11f5684b9f 
							
						 
					 
					
						
						
							
							[fix] unused globals removed II.  
						
						
						
						
					 
					
						2014-07-09 01:23:18 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							b0ba367a1a 
							
						 
					 
					
						
						
							
							[enh][mod] search refactor  
						
						
						
						
					 
					
						2014-07-07 13:59:27 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							cebf5868b3 
							
						 
					 
					
						
						
							
							[fix] pep8  
						
						
						
						
					 
					
						2014-07-04 16:49:34 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							8a7daed507 
							
						 
					 
					
						
						
							
							Merge pull request  #74  from posativ/patch/application-alias  
						
						... 
						
						
						
						add application as alias 
						
						
					 
					
						2014-07-03 22:42:25 +02:00 
						 
				 
			
				
					
						
							
							
								Martin Zimmermann 
							
						 
					 
					
						
						
						
						
							
						
						
							cbdc1e1e76 
							
						 
					 
					
						
						
							
							fix gevent's monkey patch position  
						
						
						
						
					 
					
						2014-07-03 22:08:36 +02:00 
						 
				 
			
				
					
						
							
							
								Martin Zimmermann 
							
						 
					 
					
						
						
						
						
							
						
						
							7d5c131349 
							
						 
					 
					
						
						
							
							add application as alias  
						
						
						
						
					 
					
						2014-07-03 22:07:57 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							96c8b20a04 
							
						 
					 
					
						
						
							
							[enh] https rewrite basics  
						
						
						
						
					 
					
						2014-06-24 16:30:04 +02:00 
						 
				 
			
				
					
						
							
							
								Matej Cotman 
							
						 
					 
					
						
						
						
						
							
						
						
							08eaffe245 
							
						 
					 
					
						
						
							
							add multi theming support  
						
						
						
						
					 
					
						2014-06-05 13:18:22 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							a41c1392f0 
							
						 
					 
					
						
						
							
							[fix] using different opensearch url to fix chrome POST request bug  
						
						
						
						
					 
					
						2014-05-01 10:14:47 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							44d3af9fb2 
							
						 
					 
					
						
						
							
							Merge pull request  #61  from matejc/optional_search_get  
						
						... 
						
						
						
						Optional search get 
						
						
					 
					
						2014-04-08 17:51:30 +02:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							8e2d996e27 
							
						 
					 
					
						
						
							
							[fix] autocomplete encoding  
						
						
						
						
					 
					
						2014-03-29 17:04:33 +01:00 
						 
				 
			
				
					
						
							
							
								Matej Cotman 
							
						 
					 
					
						
						
						
						
							
						
						
							32e98967b7 
							
						 
					 
					
						
						
							
							add optional request with GET method for search and results pages  
						
						
						
						
					 
					
						2014-03-29 16:50:48 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							879bac8adb 
							
						 
					 
					
						
						
							
							[fix] opensearch autocomplete  
						
						
						
						
					 
					
						2014-03-29 16:40:43 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							41dd4d9ba3 
							
						 
					 
					
						
						
							
							[enh] autocompleter server side part  
						
						
						
						
					 
					
						2014-03-29 16:29:19 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							a76525d1f3 
							
						 
					 
					
						
						
							
							add client var to all render pages  
						
						
						
						
					 
					
						2014-03-21 12:19:48 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							71c6124f7b 
							
						 
					 
					
						
						
							
							fix little bug to allow webapp.py without client var  
						
						
						
						
					 
					
						2014-03-21 11:29:10 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							c8cf95aa56 
							
						 
					 
					
						
						
							
							deactivate autocompleter by default  
						
						
						
						
					 
					
						2014-03-21 11:11:31 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							cc7f3cb617 
							
						 
					 
					
						
						
							
							initial implemention of autocompletion in opensearch.xml  
						
						
						
						
					 
					
						2014-03-20 15:39:17 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							8abf4ab993 
							
						 
					 
					
						
						
							
							adding initial code for backend-part of autocompleter  
						
						... 
						
						
						
						including test-code 
						
						
					 
					
						2014-03-20 10:28:24 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							f104553af4 
							
						 
					 
					
						
						
							
							[mod][fix] cookie expiration ++ pep8 compatibility  
						
						
						
						
					 
					
						2014-03-18 19:22:28 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							018a14431b 
							
						 
					 
					
						
						
							
							Merge pull request  #57  from pointhi/results  
						
						... 
						
						
						
						improving publishDate extraction and output of it 
						
						
					 
					
						2014-03-18 18:20:10 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							fd86bf8189 
							
						 
					 
					
						
						
							
							fix bug, to display publishDate with timezone without error  
						
						
						
						
					 
					
						2014-03-18 13:19:23 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							06b9238786 
							
						 
					 
					
						
						
							
							[fix]  #38  
						
						
						
						
					 
					
						2014-03-17 18:30:08 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							6f49bd8f08 
							
						 
					 
					
						
						
							
							adding publish date to video-results and rss-feed  
						
						
						
						
					 
					
						2014-03-17 11:43:00 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							b735093564 
							
						 
					 
					
						
						
							
							[fix] pep8  
						
						
						
						
					 
					
						2014-03-15 20:20:41 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							d54ef01898 
							
						 
					 
					
						
						
							
							simplify publish Date formating  
						
						
						
						
					 
					
						2014-03-15 19:41:54 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							ef2b1b7515 
							
						 
					 
					
						
						
							
							fix little bug  
						
						
						
						
					 
					
						2014-03-15 19:31:34 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							794165d19c 
							
						 
					 
					
						
						
							
							improve published Date output  
						
						
						
						
					 
					
						2014-03-15 19:13:57 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							7a922b2ab8 
							
						 
					 
					
						
						
							
							adding translations support for publish-date  
						
						
						
						
					 
					
						2014-03-14 10:55:52 +01:00 
						 
				 
			
				
					
						
							
							
								Thomas Pointhuber 
							
						 
					 
					
						
						
						
						
							
						
						
							b88146d669 
							
						 
					 
					
						
						
							
							showing publishedDate for news  
						
						
						
						
					 
					
						2014-03-14 09:55:11 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Tauber 
							
						 
					 
					
						
						
						
						
							
						
						
							16155ddc39 
							
						 
					 
					
						
						
							
							[fix] pep8  
						
						
						
						
					 
					
						2014-03-08 14:03:42 +01:00