ZaclysIndustries
/
searxngRebrandZaclys
forked from zaclys/searxng
2
0
Fork 0
Code Issues Pull Requests Activity
3,467 Commits 3 Branches 17 Tags 53 MiB
Commit Graph

368 Commits

Author SHA1 Message Date
Alexandre Flament a88768efd8 Merge branch 'master' into http1.1 2016-10-22 14:25:50 +02:00
Adam Tauber d5c0dcd18a [fix] unicode url proxiing 2016-10-17 01:32:31 +02:00
Adam Tauber 1be6e72d51 [enh] add result proxy support - #707 2016-10-17 00:23:15 +02:00
Adam Tauber 19a6ca0b68 [enh] use HMAC for image proxy url verification 2016-10-16 23:41:33 +02:00
Adam Tauber dceb903114 [mod] disallow search results for robots 2016-10-01 20:22:52 +02:00
Eig8phei f90eb428c6 serve pages with HTTP/1.1 2016-09-15 14:47:09 +03:00
Adam Tauber 8d4dd3c515 [fix] 404 HTTP status on not found pages - closes #681 2016-09-07 08:32:01 +02:00
Adam Tauber fa5bc3a563 [fix] use threading to recover after incomplete request crashes - closes #651 #662 2016-09-05 22:46:25 +02:00
Adam Tauber da4f1c2512 [mod] truncate result content in html - closes #224 2016-09-05 22:22:25 +02:00
Adam Tauber b4b0231617 [fix] links in new tabs without js ++ noopener bug fix - closes #674 2016-09-04 15:57:43 +02:00
Noemi Vanyi 0056c4035e add custom 404 page 2016-08-24 19:53:09 +02:00
Noemi Vanyi 16a8641649 advanced-search: panel is visible when checked before 2016-07-25 23:30:48 +02:00
Noemi Vanyi 93c0c49e9a add time range search with yahoo 2016-07-25 23:19:46 +02:00
Adam Tauber 21c5fb1c45 [fix] pep8 2016-07-17 00:03:22 +02:00
Adam Tauber 5b5478bbd9 [fix] compute the order of results only once per search 2016-07-16 21:44:28 +02:00
Adam Tauber 485da54961 [mod][fix] use the average of results number ++ do not display smaller result number than the actual result count - closes #600 2016-07-16 21:44:17 +02:00
stepshal cd9b494cb5 Fix quantity of blank lines after code object. 2016-07-10 21:44:27 +07:00
Adam Tauber fbbb307f2e [enh] add engine shortcut to config api 2016-07-07 09:27:34 +02:00
Adam Tauber 257e52954a [enh][fix] update to latest dependencies ++ fix tests & travis test runner 
WARNING: dependency changes
 2016-07-04 22:46:43 +02:00
Adam Tauber 2f7752b410 [enh] display number of results 2016-06-28 00:06:50 +02:00
Noemi Vanyi d43d9727a3 [enh] add server_settings call - closes #566 2016-06-11 00:20:09 +02:00
Adam Tauber 27218b85fa [fix] missing import 2016-06-07 21:43:24 +02:00
Adam Tauber bd361e60d8 Revert "use ngettext for plurals" 2016-05-24 12:49:21 +02:00
Dmitry Mikhirev 6d1d8a8f8d use ngettext 2016-05-02 12:36:54 +03:00
Noemi Vanyi adb1169fa3 add description to a var that seems to be unused 2016-04-09 19:49:59 +02:00
Noemi Vanyi 7daf98933d follow up blocked_engines renaming in templates 2016-04-09 19:49:59 +02:00
Noemi Vanyi 5867e97966 more follow ups in new preferences 2016-04-09 19:49:59 +02:00
Noemi Vanyi 8c4db08443 rename blocked engines to diabled engines 2016-04-09 19:49:59 +02:00
Noemi Vanyi 006841c4ff minor grammar fix in error message 2016-04-09 18:02:12 +02:00
Noemi Vanyi fe691a0988 new preferences handling 
Preferences class was introduced in order to handle user preferences. Right now
it parses cookies and the form in preferences. Also it can retrieve settings
based on the name of the setting.

ATTENTION
Please note that engine preferences are handled differently from now on. So it
introduces incompatible changes. Every user who has saved preferences should reset and
save his/her settings again.

This change was needed, because everytime a default disabled engine was
added saved user preferences would broke. Now engine setting tracking is
fixed.
 2016-04-09 01:08:44 +02:00
Adam Tauber fff9460238 Merge pull request #522 from jibe-b/master 
add BASE engine in category "Science"
 2016-03-30 11:09:22 +02:00
a01200356 94cb3a7f11 [enh] multilingual autocomplete 
implemented for wikipedia, qwant and google
 2016-03-29 19:10:13 -06:00
jibe-b 092e15cc1d [enh] Add BASE engine in category Science. Basic and advanced search. 2016-03-29 16:17:17 +02:00
Adam Tauber 0f518e489e [fix] csv results filename encoding 2016-03-16 10:43:28 +01:00
Adam Tauber bc81eda64b [fix] opensearch image issue - closes #507 2016-03-02 11:52:11 +01:00
Adam Tauber 0fbd705259 [enh] settings option to change instance name - closes #450 2016-02-27 18:23:55 +01:00
Thomas Pointhuber 8bc0f04f4b [fix] typo 2016-01-21 15:57:02 +01:00
Adam Tauber fab698003f [mod] move wolframalpha to "science" category 2016-01-21 10:45:34 +01:00
Adam Tauber 29dfd9679b [fix] use base_url in http redirects - closes #451 2015-10-23 23:07:36 +02:00
Adam Tauber b6c3cb0bdd [enh][mod] result handling refactor 
Several changes has been made:
 - Parallel result merge
 - Scoring algorithm slightly changed (see result_score())
 - Proper Thread locking on global data manipulation
 2015-10-03 17:26:07 +02:00
Adam Tauber 3a8eafcc6b [fix] cookie parameter type 2015-08-12 15:49:48 +02:00
Adam Tauber 43cd8e0c41 [enh] default settings option to safe_search - #396 2015-08-02 20:32:32 +02:00
Adam Tauber c1d9cfd9ae [enh] default settings option to autocomplete backend - #396 2015-08-02 20:32:32 +02:00
Adam Tauber 1fcf066a81 [mod] change settings file structure according to #314 2015-08-02 20:32:22 +02:00
Adam Tauber d0830d4edf [enh] add settings option to set listening address - closes #397 2015-08-02 19:03:55 +02:00
Adam Tauber ff322d3373 [fix] debug message parameter 2015-06-21 16:50:42 +02:00
Adam Tauber 6ef7c3276c [fix] reverse proxy non-root url fix 2015-06-16 19:55:31 +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 18e7d60702 Merge pull request #298 from dalf/ssl 
[fix] SSL : SNI support
 2015-04-26 13:12:04 -04:00
Alexandre Flament 187617498a Log an error if the ndg-httpsclient, pyopenssl and pyasn1 packages are not installed. 
See #298
 2015-04-26 18:58:31 +02:00
Adam Tauber 1f0e6ce65b Merge pull request #297 from dalf/proxies 
[enh] Implement http proxies for outgoing requests. (see #236)
 2015-04-26 12:19:15 -04:00
Adam Tauber 952473d297 Merge pull request #246 from Cqoicebordel/pix-arts 
New theme !
 2015-04-25 12:52:07 -04:00
Alexandre Flament 83e48fa89b flake8 fix 2015-04-25 12:05:35 +02:00
Alexandre Flament cde37be4f5 [enh] basic support for http proxy (see #236) 2015-04-25 11:44:53 +02:00
Adam Tauber d2a636f75d [mod] https rewrite pluginification 2015-04-13 00:30:12 +02:00
Adam Tauber dd84814b68 [enh] plugins: client side dependency support 2015-04-12 19:24:01 +02:00
Adam Tauber f59daa4a4b [fix] do not escape empty result content - closes #291 2015-04-12 17:37:01 +02:00
Adam Tauber b2e026dde2 [mod] remove image proxy requests from the connection pool 2015-04-10 01:10:49 +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
Luc Didry 7004de6aa7 Fixes #271 
The opensearch method is now the method set in the preferences.

As before, POST by default and GET for Chrome/Chromium which doesn't
handle POST
 2015-03-15 20:07:50 +01:00
Adam Tauber 22c4195c89 [fix] request args 2015-03-15 12:13:24 +01:00
Adam Tauber 37c58fd9ca [enh] plugin preferences - server-side ++ oscar theme 2015-03-11 18:57:36 +01:00
Adam Tauber 88aee611f7 [mod] merge GET, POST vars 2015-03-10 22:45:59 +01:00
Adam Tauber cae22bfc76 [enh] per user plugin switch 2015-03-10 20:44:02 +01:00
Adam Tauber 00cc4dcbf4 [enh] plugin support basics ++ self ip plugin 2015-03-10 19:55:22 +01:00
Adam Tauber d1b12f9016 [mod] search return value 2015-03-08 23:30:31 +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 b5cbbcede4 LTR the about page correctly 2015-02-12 02:02:30 +01:00
Adam Tauber e43f61069a [fix] category name i18n - closes #221 2015-02-10 23:14:37 +01:00
Adam Tauber df9cf9d09b Merge branch 'rtl' of github.com:Cqoicebordel/searx 2015-02-10 15:23:56 +01:00
Adam Tauber c711212662 [fix] image proxify utf urls 2015-02-09 12:24:54 +01:00
Thomas Pointhuber 832ea60e3d [fix] pep8, tests 2015-02-08 22:01:24 +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 91f7c031d5 [fix] handle proxied https scheme with uwsgi 2015-02-07 12:28:36 +01:00
Adam Tauber 1de781a143 [enh] category specific engine deactivation - closes #205 2015-02-03 18:37:38 +01:00
Thomas Pointhuber 14079ea2b0 [fix] codec can't encode character inside image_proxify 2015-02-01 10:18:32 +01:00
Thomas Pointhuber 38302ef58b [fix] hash error if url is including non ascii characters 2015-02-01 10:07:53 +01:00
Adam Tauber b19e681cce [enh] default disabled engines - closes #109 2015-01-31 23:11:45 +01:00
Adam Tauber 8de97dac03 [mod] pretty url separation 2015-01-29 19:44:52 +01:00
Adam Tauber bac98a02cb [mod] reduce cookie expirity time - fixes #204 2015-01-27 20:00:17 +01:00
Adam Tauber 78081baa8f [enh] always enable inner autocompletition (server side only) 2015-01-25 22:52:48 +01:00
Adam Tauber 10891bdeab Merge pull request #192 from dalf/connection-pool 
[enh] improve response time. close #100
 2015-01-21 19:44:20 +01:00
dalf d07cfd9089 [enh] use one single http connection pool : improve response time. close #100 2015-01-21 11:33:16 +01:00
Cqoicebordel 816a2c5cbe Move cookies in render() 2015-01-20 16:29:54 +01:00
Cqoicebordel 393d24ba50 Flake8 2015-01-19 22:26:48 +01:00
Cqoicebordel 1a24fd9c52 Add cookies to every requests 2015-01-19 21:23:22 +01:00
Cqoicebordel b01b95194e Allow non specific cookies 2015-01-19 20:16:06 +01:00
Adam Tauber 8cd7617054 [fix] opensearch xml mimetype - #184 2015-01-18 14:26:52 +01:00
dalf 1d51512152 Proxify most of images references 
Create hash only when necessary
 2015-01-18 09:54:24 +01:00
dalf b6d27aca59 [enh] image-proxy : handle ETag and date related headers, add hash to URL 2015-01-17 21:54:40 +01:00
Adam Tauber 08c2e263f5 [enh] configurable default interface locale - #177 2015-01-17 20:38:46 +01:00
Adam Tauber 9ca50676eb [fix] pep8 2015-01-16 17:37:34 +01:00
Adam Tauber f3d7af33fd [enh] image proxy config from preferences 2015-01-16 16:57:53 +01:00
Adam Tauber 01143f48c5 [enh] image proxification 2015-01-16 16:26:15 +01:00
Adam Tauber 60eb831966 [enh] image proxy base 2015-01-16 16:02:21 +01:00
Adam Tauber fe5ff51377 [mod] pygments dependency warning 2015-01-15 18:55:25 +01:00
Adam Tauber a61a96d975 [enh] log highlighter errors 2015-01-15 18:39:40 +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 8ef709ea1f Merge pull request #170 from pointhi/little_fixes 
Little fixes, add searx-autocompletion, more informations about torrents
 2015-01-11 01:20:46 +01:00
Thomas Pointhuber c19b0899a4 [fix] little autocompleter fix 2015-01-10 19:55:21 +01:00
Thomas Pointhuber 4e2dae30f0 [enh] add autocompletion for searx-specific strings 2015-01-10 16:42:57 +01:00
Adam Tauber aff33ea896 [fix] autocompleter error handling 2015-01-10 15:27:42 +01:00
Adam Tauber 39c3f5658e [fix] endless logging recursion 2015-01-10 13:10:17 +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 299a80a1eb [enh] using the logger 2015-01-09 04:13: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
Adam Tauber 9f12605f7e [enh] themes static content refactor 2015-01-01 17:48:12 +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 af8dac93a8 [enh] fix pep8, improve syntax highlighting 2014-12-22 16:26:45 +01:00
Thomas Pointhuber 7adb17452d [enh] add result_templates/code.html 2014-12-20 23:33:03 +01:00
Adam Tauber f141773814 [mod][fix] https rewrite refactor ++ fixes 2014-12-19 22:40:37 +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 e623ee593a Add icons and badge for the themes 
Add kickass in engine list
Add content for the result from kickass
 2014-12-14 23:27:27 +01:00
Cqoicebordel e71b665fd5 Load the list of icons only once 2014-12-13 21:37:28 +01:00
Cqoicebordel 0bfc793194 Add a variable with all the icons of the theme 
Add for the template a list of available icons in the current theme.
 2014-12-12 19:09:02 +01:00
Adam Tauber 41aca9a068 [fix] autocomplete x-suggestion 2014-12-09 00:57:04 +01:00
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