zaclys
/
searxng
mirror of https://github.com/searxng/searxng.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity
1,069 Commits 5 Branches 17 Tags 71 MiB
Commit Graph

892 Commits

Author SHA1 Message Date
Adam Tauber 61ab5f2693 [fix] view tests 2014-12-24 21:15:36 +01:00
Adam Tauber 3b3921fc59 [enh] subtitleseeker: better language handling 2014-12-24 21:02:26 +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
Adam Tauber 5857141e49 Merge pull request #161 from Cqoicebordel/SubtitleSeeker-engine 
SubtitleSeeker Engine
 2014-12-24 20:21:38 +01:00
Cqoicebordel 10e4f6f316 Add language support 
Allow the user to select a language. It must be written in english, and capitalized, ie : English, French, German, Hungarian...
 2014-12-23 01:51:07 +01:00
Cqoicebordel 2ea55b1c64 Add language support 
Allow the user to select a language. It must be written in english, and capitalized, ie : English, French, German, Hungarian... (reverted from commit 829948b85d)
 2014-12-23 01:45:39 +01:00
Cqoicebordel 829948b85d Add language support 
Allow the user to select a language. It must be written in english, and capitalized, ie : English, French, German, Hungarian...
 2014-12-23 01:41:25 +01:00
Thomas Pointhuber af8dac93a8 [enh] fix pep8, improve syntax highlighting 2014-12-22 16:26:45 +01:00
Thomas Pointhuber d810763107 [enh] remove repeating codeparts inside the oscar template 2014-12-22 16:07:02 +01:00
Thomas Pointhuber 7b44fd47a7 [enh] improve grunt-file for oscar_template 2014-12-22 15:28:23 +01:00
Adam Tauber b975418e4c [fix] flickr engine code cleanup ++ handle missing owner 2014-12-22 14:15:59 +01:00
Adam Tauber af41607410 Merge pull request #149 from Cqoicebordel/Flickr-engine 
Rework Flickr Engine
 2014-12-22 13:33:32 +01:00
Cqoicebordel 550232fc21 SubtitleSeeker Engine 
Add the subtitleseeker engine.
 2014-12-22 01:00:16 +01:00
Thomas Pointhuber 7adb17452d [enh] add result_templates/code.html 2014-12-20 23:33:03 +01:00
Adam Tauber 2e41bfcbdb [enh] engine shortcut validation 2014-12-20 12:17:03 +01:00
Adam Tauber 7eb27848c2 Merge pull request #159 from pointhi/photon_fix 
[fix] fix language support in photon engine
 2014-12-20 11:58:34 +01:00
Thomas Pointhuber 533e6287ae [fix] fix language support in photon engine 2014-12-20 10:25:53 +01:00
Cqoicebordel 56399cf1ea Add 500px and Searchcode engines 
Allow to search for images on 500px. It doesn't use the official API, but the page result. Less stable, but less API key to possess...

Two engines were necessary for Searchcode because there are to search mode : search for documentation or search for code example. Both use open APIs.
 2014-12-20 07:07:32 +01:00
Adam Tauber 667f4d5cfc Merge pull request #156 from Cqoicebordel/Fix-map-oscar 
[fix][enh] Multiple JS changes in Oscar
 2014-12-19 22:53:37 +01:00
Adam Tauber f141773814 [mod][fix] https rewrite refactor ++ fixes 2014-12-19 22:40:37 +01:00
Adam Tauber 813247b37a Merge pull request #152 from pointhi/search_engines 
[enh] add photon engine, and fix pep8 errors
 2014-12-19 20:06:21 +01:00
Adam Tauber 1c969186bf [mod] better search request exception handling 2014-12-19 20:01:01 +01:00
Adam Tauber 8c05c00762 [fix] handle empty search requests 2014-12-19 19:40:40 +01:00
Adam Tauber 2b7f3e28e7 [mod] display timeoutted engine name 2014-12-19 13:59:41 +01:00
Cqoicebordel 2fe3323449 Add double clic on categories 
Allow to double clic on any category to activate or deactivate all categories.
 2014-12-19 06:11:46 +01:00
Cqoicebordel 2ab621c0e3 Some more path issues 2014-12-19 05:05:12 +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 06b59c7210 [fix] Show map on result in Oscar 
Allow to find the leafleet js when searx is not installed at the root of the web server.
 2014-12-18 15:51:09 +01:00
Adam Tauber 789e46f1c8 [fix] timeout and response parsing order 2014-12-18 12:07:20 +01:00
Adam Tauber 77c3a27f56 [mod] strict timeout handling 2014-12-18 10:11:56 +01:00
Cqoicebordel 930f724ec6 Add an No Api Flickr Engine 
It uses the webpage json infos to build the results
Let the user choose the engine in setting.yml. Noapi active by default
+ little corrections on Flickr engine
 2014-12-16 20:40:03 +01:00
Thomas Pointhuber a508d540ac [fix] pep8 2014-12-16 17:26:16 +01:00
Thomas Pointhuber 91f9973227 [fix] pep8 2014-12-16 17:10:20 +01:00
Thomas Pointhuber 672f1c674c [fix] pep8 2014-12-16 17:01:25 +01:00
Thomas Pointhuber 48058075c0 [fix] remove useless print statement 2014-12-16 16:32:59 +01:00
Thomas Pointhuber 5ae38bafdf [enh] add photon engine 2014-12-16 15:01:05 +01:00
Adam Tauber 19b1cedc23 Merge pull request #151 from pointhi/kickass_fix 
[fix] fix kickass engine
 2014-12-15 23:11:15 +01:00
Thomas Pointhuber 70fc1002db [fix] fix kickass engine 
thanks @Cqoicebordel in #144:
https://github.com/asciimoo/searx/pull/144#issuecomment-67036903
 2014-12-15 19:37:58 +01:00
Thomas Pointhuber 7895e4f7a7 [enh][oscar_template] replace kickass icon 2014-12-15 10:49:35 +01:00
Cqoicebordel 0059d08f13 Rework Flickr Engine 
Everything was redone to use the API. It needs an API key, but it's worth it.
Everything works. Title, Image, Content, URL
The API allow lots of things. Thumbnails and date will be easy to add when it will be implemented in Searx.

Fix asciimoo/searx#126
 2014-12-15 04:06:42 +01:00
Adam Tauber e047d22046 Merge pull request #144 from Cqoicebordel/KickassTorrent-Search-Engine 
Kickass torrent search engine
 2014-12-15 00:02:14 +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
Adam Tauber ba51d784d1 [fix] mysterious string remove 2014-12-14 02:27:58 +01:00
Adam Tauber d93d703703 [fix] use queues to answers/suggestions/infoboxes 2014-12-14 02:15:04 +01:00
Adam Tauber a5324d9d82 [fix] proper search timeout handling 2014-12-14 01:18:01 +01:00
Adam Tauber f5aec98cbd Merge pull request #145 from Cqoicebordel/HTML+Bugs-Templates 
Html+Bugs in templates
 2014-12-13 23:27:49 +01:00
Cqoicebordel e71b665fd5 Load the list of icons only once 2014-12-13 21:37:28 +01:00
Cqoicebordel b2f5f65595 Correct test case 
Add the alt in favicon
 2014-12-13 20:30:19 +01:00
Adam Tauber 2cfa760b57 [mod] engine load refactor 2014-12-13 19:26:40 +01:00
Adam Tauber f13a6ab795 [fix] disable debug mode 2014-12-13 18:41:24 +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 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 7c261d4885 [mod] disabling piratebay, according to #146 and https://torrentfreak.com/feds-receive-requests-to-shut-down-the-pirate-bay-140801/ 2014-12-11 18:12:38 +01:00
Adam Tauber e51cc708ad [fix] piratebay url 2014-12-11 15:28:04 +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
Cqoicebordel 74000c739d Alt on favicon 2014-12-10 18:10:19 +01:00
Cqoicebordel 18f772615b HTML Entities + Use the right template 
Courgette was using the wrong template. I assume it was a mistake.
 2014-12-10 18:09:21 +01:00
Cqoicebordel 978b476024 Add KickAss engine 2014-12-09 19:21:35 +01:00
Cqoicebordel 15a4c10c99 First pass at Kickass Engine 
Parse and return results correctly. Pages numbers taken care of.

Not done, and maybe to do :
- 'content' : I don't know what it could be. Maybe votes ?
- 'categories' : the results are not filtered by categories, because I don't see how to do it properly : there are too much categories on Kickass. Is 'video' only movies, or also tv show or porn ? So for now, the category is 'all'.
- Favicon/icon : may be a good idea.
 2014-12-09 19:19:39 +01:00
Cqoicebordel 7937218be6 Use human readable date 
For DoB and DoD, wikipedia use a non standard ISO format, not easily readable.
Now the date is displayed in an human readable form, using the language setting as locale if available. If not, it uses the default locale.
 2014-12-09 02:36:53 +01:00
Adam Tauber 41aca9a068 [fix] autocomplete x-suggestion 2014-12-09 00:57:04 +01:00
Adam Tauber 0f4cb32bf1 [mod] image results removed from google engine 2014-12-09 00:53:09 +01:00
Adam Tauber 2538a3ec26 [enh] v0.5.0 2014-12-08 23:57:36 +01:00
Adam Tauber 8e6ae188b8 [mod] search thread names 2014-12-08 23:55:11 +01:00
Adam Tauber 44409cb61f Merge pull request #141 from Cqoicebordel/UX+Bugs+HTML 
UX+bugs+html
 2014-12-08 23:48:01 +01:00
Cqoicebordel b973081134 [fix] Google image with special chars 
It seems like Google image is doing a double urlencode on the url of the images. So we need to unquote once before sending to the browser the urls.
It solves the 404 we could see with some image with specials chars in url. 
Exemple https://searx.laquadrature.net/?q=etes&pageno=1&category_images (there are two of those in the list)
 2014-12-08 21:12:50 +01:00
Cqoicebordel 25c743f2af Striptag on alt and title 
Strip HTML tags on alt and title of the images
 2014-12-08 12:54:12 +01:00
Cqoicebordel 79b936963f Bug + HTML corrections 
Add alt on favicon.
Use correct datetime format
Remove pubdate tag
Use url instead of pretty_url for web.archive.org
Add alt on video image
 2014-12-08 01:26:28 +01:00
Cqoicebordel 9ea2d8c131 Bug + HTML corrections 
Add alt on favicons
Use correct datetime format
Remove pubdate tag
Use url instead of pretty_url for web.archive.org
 2014-12-08 01:22:54 +01:00
Cqoicebordel 0b98f71ff0 HTML corrections 
Add alt on favicons
Use right format for datetime
Remove pubdate tag
 2014-12-08 01:19:05 +01:00
Cqoicebordel 977972a8ec UX + HTML corrections 
Add title on image for hover
Add alt on favicon
 2014-12-08 01:11:45 +01:00
Cqoicebordel 0a2051ef3c Bug + HTML corrections 
Add alt for favicon
Correct datetime format
Remove pubdate (not in html5 spec)
Don't use pretty_url for web.archive.org.
 2014-12-08 01:09:16 +01:00
Cqoicebordel 42692aa2c5 Add alt for img 
Add alt in infobox image.
 2014-12-08 01:03:28 +01:00
Cqoicebordel 34b5d95669 UX and HTML corrections 
Put the infobox first. Result first is more useful for the user.
Add id in form for "for".
htmlentities in the URL.
Take care of spaces in categories.
 2014-12-08 01:01:33 +01:00
Cqoicebordel c2e88339f7 Add pubdate 
Add pubdate with a good format, against publishedDate.
 2014-12-08 00:51:46 +01:00
dalf 7c13d630e4 [fix] pep8 : engines (errors E121, E127, E128 and E501 still exist) 2014-12-07 16:37:56 +01:00
dalf ffcec383b7 [fix] pep8 : duckduckgo_definitions and wikidata engines 2014-12-07 16:36:20 +01:00
Adam Tauber 611f4e2a86 [fix] pep8 2014-12-05 20:03:16 +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 b1b0b82a2a [fix] version.py pep8 and py3 compatibility 2014-12-02 00:09:08 +01:00
Adam Tauber 524e30e001 [doc] description fixes 2014-12-01 21:33:35 +01:00
Adam Tauber 45734ee5f4 Merge pull request #136 from pointhi/template_oscar_fix 
[oscar_template] split up js-files, FIX #132
 2014-12-01 21:02:14 +01:00
Thomas Pointhuber e687f5c290 [enh][oscar_template] split js-files and compile them together 2014-11-30 13:21:58 +01:00
Adam Tauber 25a83c33aa [enh] translation update 2014-11-26 20:42:16 +01:00
Adam Tauber 84aba71f6a [enh] french translation build 2014-11-26 20:40:37 +01:00
Adam Tauber da456604be Merge branch 'master' of github.com:asciimoo/searx 2014-11-26 20:39:15 +01:00
Benjamin Sonntag 075fa2da7d update of french translation 2014-11-26 20:36:18 +01:00
Adam Tauber 3dfeb73912 [enh] user agent string update 2014-11-22 18:37:42 +01:00
Adam Tauber 91384c1f31 Merge pull request #130 from pointhi/template_oscar_fix 
[fix][template_oscar] make overpass-api call over https and add better error-message
 2014-11-20 15:49:31 +01:00
Thomas Pointhuber 08f4b7f506 [fix][template_oscar] make overpass-api call over https 
and add better error message if ajax-call fail
 2014-11-20 15:31:00 +01:00
Thomas LEBEAU 3ed43cf31a responsive theme courgette 2014-11-20 15:14:03 +01:00
Adam Tauber 075a5fe898 Merge pull request #127 from pointhi/template_oscar_map 
Template oscar, add map support
 2014-11-19 16:19:03 +01:00
Thomas Pointhuber 807db97690 [enh][translation] update translation files and add german translation 2014-11-19 15:49:55 +01:00
Thomas Pointhuber 4b75d41f86 [enh][oscar_template] loading map informations from overpass-api 2014-11-19 15:49:55 +01:00
Adam Tauber 1a81c20d73 [fix] sidebar overflow 2014-11-18 20:30:06 +01:00
Adam Tauber cfdfca0d41 [fix] whitespace remove 2014-11-18 19:55:39 +01:00
Adam Tauber 6b31f55c90 [fix] suggestions display 2014-11-18 19:53:38 +01:00
Adam Tauber b8efd1214f [enh] category select warning message 2014-11-18 19:44:33 +01:00
Adam Tauber cb15a21681 [fix] syggestions max width 2014-11-18 19:03:52 +01:00
Thomas Pointhuber aba65369d2 [enh] make version of searx readable 2014-11-18 11:37:42 +01:00
Adam Tauber b1234ee889 [fix] startpage engine compatibility 2014-11-17 10:19:23 +01:00
Adam Tauber b6da893c78 [fix] html attribute quote 2014-11-11 18:59:26 +01:00
Adam Tauber 0d80d5d3b4 Merge pull request #105 from pointhi/template_oscar 
new template: oscar
 2014-11-11 09:36:39 +01:00
Adam Tauber b422788eb4 [fix] wikipedia autocompleter url param 2014-11-04 19:53:42 +01:00
Thomas Pointhuber a9b4f458e9 Merge pull request #6 from pointhi/template_oscar 
[enh] add no-js support
 2014-11-04 14:32:53 +01:00
Thomas Pointhuber 46dd502592 [fix][template][oscar] print ',' only if postcode is found 2014-11-04 12:58:12 +01:00
Thomas Pointhuber 25312c53e1 [enh] add no-js support 
* image results have url, which can be clicked
* preferences full functionable without js
 2014-11-03 22:18:40 +01:00
Thomas Pointhuber c0fc248213 [enh] template_oscar: improve visualisation of torrent results 2014-11-03 19:00:56 +01:00
Thomas Pointhuber 9274a59045 [fix] template_oscar: improve visualisation of video-results 2014-11-03 18:57:48 +01:00
Thomas Pointhuber bc12a76fbb [fix] use address.city if possible 2014-11-03 18:53:04 +01:00
Thomas Pointhuber 3b7b106684 [enh] template_oscar: add layer to leaflet map 2014-11-03 18:47:18 +01:00
Thomas Pointhuber c38917bb2a [enh] template_oscar: show addressdata if possible 2014-11-03 18:46:58 +01:00
Thomas Pointhuber 2e7723a6c1 [enh] oscar_template: improve result visualisation 
* highlight parts of result
* add link to archiv.to
* fix little bugs
* add little icons
* change style of "show map" button
 2014-11-03 10:39:47 +01:00
Thomas Pointhuber b2c976a5a3 [enh] template_oscar: maxZoom if fitting bounds 2014-11-02 22:35:06 +01:00
Thomas Pointhuber 740594a4b7 [enh] oscar_template: initial osm-map support for map results 
* TODO: remove leaflet.min.css if not required
 2014-11-02 13:00:28 +01:00
Thomas Pointhuber b4829891f9 fix missing string in translation 2014-11-01 21:15:46 +01:00
Thomas Pointhuber 5a7f85ecee [fix] #121, HTTP 500 Error if res["content"] == None 2014-11-01 17:32:26 +01:00
Adam Tauber 58cc03351a Merge pull request #118 from dalf/master 
default theme : small modifications
 2014-10-30 08:09:07 +01:00
Thomas Pointhuber a697a1eaa5 oscar template: display answers 2014-10-26 19:20:20 +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
dalf 8534d8b87a [fix] test : the icon is included inside the <h3> element 2014-10-26 12:01:54 +01:00
dalf a71b326d9e [mod] default template modifications 
- more smartphone friendly
- more text browser friendly
- next button always on the right
- in case of small screen supporting touch event, categories are displayed on one line with a scroll
 2014-10-26 11:14:05 +01:00
dalf be4d219ae7 [mod] use pngcrush to reduce the size of png files 2014-10-25 17:07:39 +02:00
dalf 400279182e [fix] no horizontal scrolling on small screen 
[fix] small images in the results aren't not "zoomed"
 2014-10-25 17:05:37 +02:00
Thomas Pointhuber 6ecf03c736 print error if https rewrite directory is not found, #116 2014-10-19 21:39:30 +02:00
Adam Tauber 5740cfbf1c [fix] pep8 part II. 2014-10-19 12:41:04 +02:00
Adam Tauber b0fd71b7b3 [fix] pep8 compatibility 2014-10-19 12:18:21 +02:00
Adam Tauber 28fed5d9ad Merge pull request #115 from pointhi/engine_faroo 
add faroo engine
 2014-10-19 12:07:02 +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 bc5a7153d3 fix comment header of faroo engine 2014-10-17 12:56:14 +02:00
Thomas Pointhuber db4ca4784b fix faroo engine 2014-10-17 12:54:22 +02:00
Thomas Pointhuber 8af2184a45 add faroo engine support 2014-10-17 12:42:16 +02:00
Thomas Pointhuber 1e3e646584 import basic https rules from https-everywhere repository 
* licenced under GPLv3+
* downloaded from https://github.com/EFForg/https-everywhere
 2014-10-15 14:52:27 +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 6e6dbc1bb4 update settings_robot.yml 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