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

377 Commits

Author SHA1 Message Date
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
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
Adam Tauber 13a27b909e [fix] #47 2014-03-08 14:00:20 +01:00
Adam Tauber 6ff57dfbe1 [enh] linkable search url display 2014-03-04 18:53:56 +01:00
asciimoo 77b936e3be [fix] debug print removed 2014-02-15 07:29:23 +01:00
asciimoo 5f8ae9b965 [fix] unicode url fix 2014-02-15 07:28:21 +01:00
asciimoo fd651083f2 [fix] PYTHONPATH settings 2014-02-14 16:16:20 +01:00
asciimoo c1d7d30b8e [mod] len() removed from conditions 2014-02-11 13:13:51 +01:00
asciimoo 8305da3e5d [fix] robots.txt 2014-02-07 18:43:05 +01:00
asciimoo 599c801ecd [mod] index rendering 2014-02-07 03:15:34 +01:00
asciimoo 9eb31c0186 [fix] unicode and pep8 fixes 2014-02-07 02:45:12 +01:00
asciimoo d63135db61 [fix] language/locale settings 2014-02-07 01:52:38 +01:00
asciimoo 0540ea9ee2 [enh][mod] code refactor ++ search engine filtering 2014-02-07 01:19:07 +01:00
asciimoo e56d7a58c7 [fix] pep8 2014-02-07 00:42:09 +01:00
asciimoo c0013edcdd [enh] engine customisation init 2014-02-07 00:35:15 +01:00
Gabor Nagy 22fd0746d9 Improves PEP8 compatibility. 2014-02-05 20:24:31 +01:00
asciimoo b22dd51bd7 [fix] pep8 2014-02-05 08:20:24 +01:00
asciimoo 5695ec58df [fix] whitespace duplication fix in nonhtml outputs 2014-02-04 19:42:32 +01:00
asciimoo 455ff25a93 [fix] pep8 2014-01-31 16:17:49 +01:00
asciimoo 48dc019b94 [enh] displaying shortcuts at engines page 2014-01-31 16:09:58 +01:00
asciimoo b57258f98b [enh] query parsing improvements - shortcut support 2014-01-31 15:55:38 +01:00
Matej Cotman 2bcc949abe add view tests 2014-01-31 07:36:58 +01:00
asciimoo 2a788c8f29 [enh] search language support init 2014-01-31 04:35:23 +01:00
asciimoo 0bf9b299e7 [fix] using absolute templatepaths 2014-01-30 19:02:23 +01:00
asciimoo 941e5fb2c4 [enh][fix] opensearch separation ++ better chrome support 2014-01-30 13:30:41 +01:00
asciimoo 63714c1759 [fix] unused var removed 2014-01-29 23:57:50 +01:00
asciimoo 8bb94e3dc4 [enh] paging support 2014-01-29 20:52:04 +01:00
asciimoo db825d4226 [enh][mod] better query parsing ++ selecting categories with query strings 2014-01-27 23:56:02 +01:00
asciimoo ba0f818e89 [fix] pep8 compatibility 2014-01-22 01:20:38 +01:00
asciimoo 852dfc77c6 [enh] configurable localization 2014-01-22 00:59:18 +01:00
asciimoo 598535b24a [mod] ui localization init - new dependency: flask-babel 2014-01-22 00:15:23 +01:00
asciimoo 7295df30e1 [mod] import restructure 2014-01-21 21:28:54 +01:00
asciimoo b2492c94f4 [fix] pep/flake8 compatibility 2014-01-20 02:31:20 +01:00
asciimoo 692c0bf5f0 [mod] robots.txt update 2014-01-20 01:38:17 +01:00
Matej Cotman dd4662978d fix: robot fw, entry points, some flake8, package searx egg 2014-01-20 01:06:29 +01:00
asciimoo f6f9af4577 [mod] favicon mods 2014-01-19 23:04:09 +01:00
asciimoo bfdd6ebb92 Merge branch 'featured_result' of https://github.com/pw3t/searx 2014-01-19 22:39:56 +01:00
asciimoo f3749434f1 [fix] new settings import 2014-01-19 17:17:52 +01:00
asciimoo 3afdd1d994 [enh] settings unification - new dependency: pyyaml 2014-01-19 00:17:02 +01:00
pw3t 380b440a55 [fix] replace the png icons by ico's, minor chnage in the html 2014-01-17 20:47:17 +01:00
pw3t a62b94e21c Merge branch 'master' of https://github.com/asciimoo/searx 2014-01-17 20:32:38 +01:00
asciimoo 1db082a287 [enh][mod] search category order 2014-01-17 17:06:54 +01:00
asciimoo 8b3ca1112c [enh] /engines page added 2014-01-17 16:23:23 +01:00
pw3t dd1baa6d58 [fix] replace the png icons by ico's, minor chnage in the html 2014-01-16 22:10:39 +01:00
pw3t d43bd05582 [ehn] Add a 'featured result feature'm putting on top of the reasults ddg definitions and wikipedia (ugly html / css) 
[ehn] Add a templates for videos, so the thumbnails all have the same side
 2014-01-16 22:06:55 +01:00
pw3t a8ec7fe6a4 [ehn] add favicons for vimeo, soundcloud, twitter and youtube 2014-01-16 22:03:43 +01:00
pw3t fdb6fac214 [ehn] Add possibility to add icon in results (more ugly html / css, need fix) 2014-01-16 22:03:43 +01:00
pw3t cf8f444e85 [ehn] Add a 'featured result feature'm putting on top of the reasults ddg definitions and wikipedia (ugly html / css) 
[ehn] Add a templates for videos, so the thumbnails all have the same side
 2014-01-16 22:03:43 +01:00
Matej Cotman e740c8a8ea tests and robot tests framework, build overhaul 2014-01-14 23:31:15 +01:00
asciimoo 348187cff9 [fix] opensearch/rss content type 2014-01-14 22:18:21 +01:00
asciimoo facc4ad326 [fix] syntax error.. 2014-01-14 18:19:21 +01:00
asciimoo 9cb744f440 [enh] opensearch/rss support part I. 2014-01-14 18:17:19 +01:00
asciimoo 7b4ec5c5e9 [fix] highlighting only html 2014-01-10 23:38:08 +01:00
pw3t 68364df342 [enh] 1st version of vimeo search engine (need improvments) 2014-01-05 22:10:46 +01:00
asciimoo 863d136ddd [fix] setting category cookie expiration to 4 weeks 2014-01-05 01:11:41 +01:00
asciimoo d2898b0818 [enh] preferences redirection 2014-01-01 23:04:13 +01:00
asciimoo 1df697305c [enh] preferences added 2014-01-01 22:16:53 +01:00
asciimoo 32512856b4 [mod][fix] using base_url instead of hostname in settings.py 2013-12-31 02:09:24 +01:00
asciimoo 141b04c6dd [enh] optionally configurable hostname - edit settings.py 2013-12-26 01:53:26 +01:00
asciimoo ce544c30c1 [fix] debug print removed 2013-12-03 14:33:22 +01:00
asciimoo ba131c842d [enh][fix] csv output updates 2013-12-02 21:36:09 +01:00
asciimoo 5c8382c1ba [enh] favicon added 2013-12-01 23:52:49 +01:00
asciimoo 822bf2f36d [enh] robots.txt added 2013-12-01 16:10:38 +01:00
asciimoo ad7c83e3f6 [mod] code formatting 2013-11-15 19:28:30 +01:00
asciimoo a192438e9a [enh] csv output support 2013-11-15 18:55:18 +01:00
asciimoo 66ff28bb9d [enh] suggestion support added 2013-11-13 19:32:46 +01:00
asciimoo 64cc960f9f [enh] specify search engine in queries 2013-11-04 00:21:27 +01:00
asciimoo 70278567ec [mod] searching by selected engines 2013-11-04 00:18:07 +01:00
asciimoo c838492d6d [fix] valid https checking 2013-10-30 23:01:58 +01:00
asciimoo d1e8c2365e [enh] https support @ opensearch.xml 2013-10-30 16:30:55 +01:00
asciimoo 66d9619862 [enh] view for stats 2013-10-27 01:03:05 +02:00
asciimoo ea475ee709 [enh] url prettify 2013-10-25 02:14:26 +02:00
asciimoo f48bc8b4e8 [fix] unused var removed 2013-10-23 21:45:14 +02:00
asciimoo 52516dab97 [enh] valid json content type 2013-10-23 21:45:00 +02:00
asciimoo 8520be3cd6 [enh] categories to request callback 2013-10-22 18:57:20 +02:00
asciimoo 9ead6546a4 [enh] about page added 2013-10-21 00:28:48 +02:00
asciimoo 174daf703b [enh] chrome opensearch support 2013-10-20 22:37:55 +02:00
asciimoo e75432c505 [enh] HTTP GET support 2013-10-20 22:21:34 +02:00
asciimoo 7aa89ef7c6 [mod] always remember selected categories 2013-10-20 21:31:06 +02:00
asciimoo ee2a55a859 [fix] default category 2013-10-20 21:19:15 +02:00
asciimoo a0cbc767e7 [enh] number of search results 2013-10-19 22:35:53 +02:00
asciimoo 726a4e4dca [enh] ordering categories 2013-10-19 20:45:48 +02:00
asciimoo 83c39a565a [enh] category selection remember 2013-10-19 19:56:11 +02:00
asciimoo 8fe660b1df [mod] config file replaced 2013-10-19 16:25:06 +02:00
asciimoo 1b3712c189 [enh] settings.py added 2013-10-19 16:18:41 +02:00
asciimoo 9bc6865ddc [enh] storing search categories in cookies 2013-10-17 21:46:35 +02:00
asciimoo f76d80de54 [enh] category support 2013-10-17 21:06:28 +02:00
asciimoo 3d8b7ea3ea [enh] json output support 2013-10-17 00:30:41 +02:00
asciimoo 6bddaf5702 [enh] opensearch xml added 2013-10-16 00:01:08 +02:00
asciimoo c4dfd416ad [enh] default engine selection 2013-10-15 22:54:15 +02:00
asciimoo 15b8b7d9bb [fix] unicode (en|de)coding 2013-10-15 22:36:48 +02:00
asciimoo 1f79a571dd [mod] removed debug messages 2013-10-15 22:18:45 +02:00
asciimoo 9e1ded688f [enh] engine selection support 2013-10-15 22:18:08 +02:00
asciimoo b752ace653 [enh] template render updates 2013-10-15 20:50:12 +02:00
asciimoo d5ec0f43e4 [mod] search refactor 2013-10-15 18:19:06 +02:00
asciimoo 554f3a95b3 [enh] license informations 2013-10-15 00:33:18 +02:00
asciimoo 62f6d34b95 [enh] search form @ results page 2013-10-15 00:02:55 +02:00
asciimoo 492e0b74c0 [enh] useragent forwarding 2013-10-14 23:52:58 +02:00
asciimoo ae9fb1d7dc [enh] initial commit 2013-10-14 23:09:13 +02:00