zaclys/searxng
1
0
Fork 1
mirror of https://github.com/searxng/searxng synced 2024-01-01 18:24:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,337 Commits 5 Branches 17 Tags 71 MiB
633c7b6a5f
Commit Graph

1124 Commits

Author SHA1 Message Date
Cqoicebordel
a723936ad4 Updated translations without fuzzy translations 2015-01-05 20:56:48 +01:00
Cqoicebordel
cacdb064db Updated translations 2015-01-05 20:26:49 +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
0ca04be55d Remove print 2015-01-05 20:24:33 +01:00
Cqoicebordel
b918cd2b8e Whitespace correction 2015-01-05 02:09:11 +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
Cqoicebordel
3aa3a4633f Few fixes on Vimeo 
Change URL from https to http
Change way of handling text xpath
 2015-01-03 23:55:50 +01:00
Cqoicebordel
4450ed5503 Digg correction 
Return no result instead of crashing if no result
 2015-01-03 23:54:02 +01:00
Cqoicebordel
96c4d52eef Add non exclusif bang 
Allow to perform a search while adding an engine (or a category) without adding it "officially" to the request.
'?' is used to add an engine without modifying anything else to the request. For example, you can perform a search in the 'general' category, and if you add '?tw' the result from Twitter will be added to the originals results.
 2015-01-03 02:31:23 +01:00
Adam Tauber
cc4e17b668 [fix] pep8 2015-01-02 12:33:40 +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
Adam Tauber
20c4de8f06 [fix] filename strip 2015-01-01 18:06:51 +01:00
Adam Tauber
8151585918 [fix] static file paths 2015-01-01 17:54:33 +01:00
Adam Tauber
9f12605f7e [enh] themes static content refactor 2015-01-01 17:48:12 +01:00
Adam Tauber
e3957d6adf Merge pull request #143 from Cqoicebordel/Wiki-date 
Use human readable date for infobox
 2015-01-01 14:36:28 +01:00
Adam Tauber
2181c4384e [mod] purge local html_to_text 2015-01-01 14:14:56 +01:00
Adam Tauber
1408859b4b [fix] ignore scripts/styles in html_to_text 2015-01-01 14:13:56 +01:00
Adam Tauber
469e08881e Merge pull request #165 from Cqoicebordel/Moar-engines 
Moar engines
 2015-01-01 14:10:59 +01:00
Adam Tauber
c7cbd38fcc Merge pull request #164 from pointhi/favicons 
improve Favicons
 2015-01-01 14:06:34 +01:00
Cqoicebordel
5d977056f7 Flake8 and Twitter corrections 
Lots of Flake8 corrections
Maybe we should change the rule to allow lines of 120 chars. It seems more usable.

Big twitter correction : now it outputs the words in right order...
 2014-12-29 21:31:04 +01:00
Cqoicebordel
576fdef440 Google Play Store 
Add Google play store apps, movies and music (sound -> gps)
 2014-12-28 23:23:31 +01:00
Cqoicebordel
e7e2981536 Digg + Twitter corrections 
Digg engines, with thumbnails
Add pubdate for twitter
 2014-12-28 22:57:59 +01:00
Thomas Pointhuber
8f4814ade2 [fix] fix test 2014-12-28 15:53:03 +01:00
Thomas Pointhuber
67698ad29a [enh] add new favicons to oscar template 2014-12-28 15:46:03 +01:00
Thomas Pointhuber
a7adcacd04 [enh] add new marker-icons for map 
fetched from https://github.com/pointhi/leaflet-color-markers
 2014-12-28 15:10:42 +01:00
Thomas Pointhuber
a0293d6196 [enh] move favicons into own directory 2014-12-28 15:07:11 +01:00
Thomas Pointhuber
98815a0d61 [enh] add turkish translation 2014-12-28 09:52:03 +01:00
Thomas Pointhuber
35dc043c09 [enh] update translations 2014-12-27 14:43:24 +01:00
Adam Tauber
fcc394540b [enh] v0.6.0 2014-12-25 17:56:01 +01:00
Adam Tauber
5cfb42350b [enh] nl, de, fr, hu translation updates 2014-12-25 11:06:30 +01:00
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
kernc
e1b76c6811 Search Music also on YouTube 
YouTube hosts a lot of music and should be enabled for Music search by default.
 2014-10-13 14:51:15 +02:00
Adam Tauber
b0bb94fd37 [fix] wikidata: using only the first url 2014-10-12 14:33:03 +02:00
Adam Tauber
13f36e6675 [enh] translation updates 2014-10-12 13:06:11 +02:00
Adam Tauber
781b8a23c4 Merge pull request #110 from pointhi/language_japanese 
add japanese translation
 2014-10-12 12:44:55 +02:00
dalf
cac1761a54 [enh] infoboxes : if the result doesn't contain anything except one link, use the normal result template 2014-10-11 15:49:50 +02:00
dalf
295b1699ce [mod] return only one result from the wikidata engine 2014-10-11 12:47:30 +02:00
dalf
599c1137bb [fix] the bang was included in the search string 2014-10-11 12:46:12 +02:00
Adam Tauber
4da795895d [fix] default template handling 2014-10-09 19:26:02 +02:00
Thomas Pointhuber
032eb2354e add japanese translation 2014-10-05 17:13:39 +02:00
Thomas Pointhuber
c36c935b03 oscar template: add infobox 2014-10-05 15:46:43 +02:00
Thomas Pointhuber
517e57b996 oscar template: improve result icons 2014-10-05 14:40:47 +02:00
Thomas Pointhuber
c25aab73b7 oscar template: add no result message 2014-10-05 14:40:47 +02:00
Thomas Pointhuber
451586f09f oscar template: update translation files 2014-10-05 14:40:47 +02:00
Thomas Pointhuber
55b9b10d2e oscar template: include typeahead.css into bootstrap.min.css 2014-10-05 14:40:47 +02:00
Thomas Pointhuber
f4457da0a1 oscar template: using less to generate oscar.min.css 2014-10-05 14:40:47 +02:00
Thomas Pointhuber
841f1eedfc oscar template: generate bootstrap.min.css from source 2014-10-05 14:40:47 +02:00
Thomas Pointhuber
14b0604bc0 oscar template: implement autocompleter 2014-10-05 14:40:47 +02:00
Thomas Pointhuber
4b7164f04a oscar template: remove unused css file 2014-10-05 14:40:46 +02:00
Thomas Pointhuber
dc2c136220 oscar template: little style improvements 2014-10-05 14:40:46 +02:00
Thomas Pointhuber
47d1caed61 oscar template: add forgoten github icon 2014-10-05 14:40:46 +02:00
Thomas Pointhuber
b91b77e335 oscar template: improve result page 
* add paging support
* add suggestion panel
* add links panel
 2014-10-05 14:40:46 +02:00
Thomas Pointhuber
6fa5f02d0b oscar template: improve image results 2014-10-05 14:40:46 +02:00
Thomas Pointhuber
f3b565e17e oscar template: implement first version of results page 
* implement results page
* improve search form template
* implement all result_templates
* fix youtube engine
 2014-10-05 14:40:46 +02:00
Thomas Pointhuber
9158571059 oscar template: update messages 2014-10-05 14:40:46 +02:00
Thomas Pointhuber
a538bed745 oscar template: implement search input, index page,... 2014-10-05 14:40:46 +02:00
Thomas Pointhuber
ef1ead9c4b oscar template: add directory in which are messages stored 2014-10-05 14:40:46 +02:00
Thomas Pointhuber
25919de608 oscar template: make the categories clickable 2014-10-05 14:40:46 +02:00
Thomas Pointhuber
5568fbd89d oscar template: using tab to seperate engines in preferences 2014-10-05 14:40:46 +02:00
Thomas Pointhuber
afcfa04e30 oscar template: improve style for check and uncheck of engines 2014-10-05 14:40:46 +02:00
Thomas Pointhuber
8c6e63402a add more tooltips to preferences 2014-10-05 14:40:46 +02:00
Thomas Pointhuber
d0913f894a remove text from alert-info in /stats 2014-10-05 14:40:46 +02:00
Thomas Pointhuber
a88ce4bd33 little enhancement of oscar template 
* improve site-titles
* add message which tell you if no data is availabe yet
 2014-10-05 14:40:46 +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
Adam Tauber
c58e5a236a [fix] preferences button display 2014-10-05 13:37:26 +02:00
Adam Tauber
5d7b63223f [mod] sidebar positioning 2014-10-04 23:13:21 +02:00
Adam Tauber
727c7226d9 [fix] code cleanup 2014-10-04 22:53:54 +02:00
Adam Tauber
a48028b771 [fix] html escape url 2014-10-04 22:50:13 +02:00
Adam Tauber
bbf107ac8b [fix] debug mode disabled by default 2014-10-04 22:48:12 +02:00
dalf
63a0328c8b [enh] wikidata engine : add links to musicbrainz 2014-10-02 23:40:06 +02:00
dalf
728fc611da [fix] infoboxes and answers : pass all tests 2014-10-01 22:46:31 +02:00
dalf
829c758970 Merge remote-tracking branch 'upstream/master' 2014-10-01 22:25:11 +02:00
Dalf
0a71525ab6 [enh] add infoboxes and answers (clean up) 2014-10-01 22:17:35 +02:00
Adam Tauber
fce6fb2fa8 Merge pull request #107 from pointhi/float_bug 
fix float division by zero bug in score calculation
 2014-10-01 19:23:44 +02:00
Thomas Pointhuber
fdad5f7cad fix float division by zero bug in score calculation 2014-10-01 19:16:34 +02:00
Adam Tauber
5fbda0dafe Merge pull request #67 from opi/patch-1 
[enh] Add french translation for webapp.
 2014-10-01 18:27:20 +02:00
Thomas Pointhuber
62d1a70c84 using Query class for parsing of search query 2014-10-01 17:57:53 +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
Dalf
e39d9fe542 update comment 2014-09-22 23:39:21 +02:00
Dalf
6b058962e1 [fix] when two results are merged, really use the content with more text 2014-09-22 22:55:51 +02:00
Adam Tauber
bd2db71fa6 Merge branch 'comments' of https://github.com/pointhi/searx 
Conflicts:
	searx/search.py
 2014-09-22 21:40:40 +02:00
Dalf
5dc3eb3399 [fix] rewrite the google engine since Google Web Search API is about to expire 2014-09-14 14:40:55 +02:00
Dalf
5d1610d87a [enh] stick results from the same category and template 2014-09-14 14:39:22 +02:00
Thomas Pointhuber
53dc92b0d7 update comments in autocomplete.py 
* update comments
* add licence-header
 2014-09-13 18:47:28 +02:00
Thomas Pointhuber
22da73b8bb little update update comments in search.py 2014-09-13 18:44:11 +02:00
Thomas Pointhuber
bc30c4f4ad add comments to __init__.py 
* add comments
* add licence-header
 2014-09-13 18:39:03 +02:00
Thomas Pointhuber
7da4b3dc82 add comments to languages.py 
* add comments
* add licence-header
 2014-09-13 18:32:28 +02:00
Thomas Pointhuber
c9bab0e833 add comments to search.py 
* add comments
* add licence-header
 2014-09-13 18:25:25 +02:00
Adam Tauber
d23dd7e276 Merge pull request #94 from dalf/master 
[enh] duckduckgo engine: add language support
 2014-09-08 18:32:07 +02:00
Adam Tauber
00e5262834 [enh] archive.org link added to results 2014-09-08 00:52:15 +02:00
Adam Tauber
cd3a52e189 [enh] duckduckgo autocomplete added 2014-09-07 23:56:06 +02:00
dalf
64b75e6d82 [enh] duckduckgo engine: add language support 2014-09-07 22:52:13 +02:00
Dalf
a4ffeddce1 [fix] yahoo engines: parse_url doesn't throw an exception with not tracking URL 2014-09-07 18:42:56 +02:00
Dalf
a92e3ba446 [fix] bing_new engine : fix published date parsing 2014-09-07 18:10:05 +02:00
Dalf
7f1e2ba211 [enh] dailymotion engine: add language support 2014-09-07 17:14:42 +02:00
Adam Tauber
c23db1b2bf [enh] more flexible category selection 2014-09-06 15:21:29 +02:00
Adam Tauber
a288aa322e Merge branch 'master' of github.com:asciimoo/searx 2014-09-06 14:17:26 +02:00
Adam Tauber
e0ff9a6179 [enh] settings.yml docs 2014-09-06 14:17:14 +02:00
Adam Tauber
b731827228 [enh] openstreetmap added to config 2014-09-06 14:09:27 +02:00
Adam Tauber
3319091496 [enh] new engine: openstreetmap 2014-09-06 14:09:03 +02:00
Adam Tauber
46e3e1a390 [fix] print removed 2014-09-05 10:46:08 +02:00
Adam Tauber
24401c0e16 [fix] print removed 2014-09-04 23:53:39 +02:00
Adam Tauber
35ddbecd74 [fix] string formatting 2014-09-04 23:53:13 +02:00
Adam Tauber
29afa9b4a1 Merge pull request #91 from pointhi/engines 
fix yacy-engine and add comments
 2014-09-04 21:50:02 +02:00
Adam Tauber
cb8acbd2c3 [enh][fix] support base_urls without language code ++ extra whitespaces removed 2014-09-04 21:19:11 +02:00
Adam Tauber
c38a743c6f Merge pull request #90 from pointhi/engines 
using generic mediawiki engines
 2014-09-04 19:31:47 +02:00
Thomas Pointhuber
2cd980134b fix yacy-engine and add comments 
* add language support
* add image-support
* add basic-implementation for video, music and file handling
* refactore engine
* add comments
 2014-09-03 13:47:12 +02:00
Thomas Pointhuber
63560607ad fix mediawiki-comment 
* bug: setting language_support to False result in no results
 2014-09-03 11:50:58 +02:00
Thomas Pointhuber
52ad49ccba using general mediawiki-engine 
* writing general mediawiki-engine
* using this engine for wikipedia
* using this engine for uncyclopedia
 2014-09-03 11:40: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
Thomas Pointhuber
629a05e149 fix youtube engine and add comments 
* add language-support
* decrease search-results/site to 5
* add comments
 2014-09-02 21:19:20 +02:00
Thomas Pointhuber
bb628469d3 fix wikipedia engine and add comments 
* add paging support
* make number_of_results changable
* make result calculation more clear
* add comments
 2014-09-02 21:01:24 +02:00
Thomas Pointhuber
8eb064dea1 add little note to duckduckgo engine 2014-09-02 20:21:33 +02:00
Thomas Pointhuber
badf8504fd remove categories : social media from twitter engine in settings.yml 2014-09-02 20:15:49 +02:00
Thomas Pointhuber
9460750fea fix twitter engine and add comments 
* add language-support
* add comments
* little refactoring
 2014-09-02 20:14:52 +02:00
Thomas Pointhuber
678a80f043 fix startpage engine and add comments 
* add language support
* remove not required code
* improve google-ad detection (no false detection anymore, I hope)
* other improvements
 2014-09-02 19:57:01 +02:00
Thomas Pointhuber
a46bbb4042 fix stackoverflow and add comments 2014-09-02 18:49:42 +02:00
Thomas Pointhuber
80f98d6041 add little comment 2014-09-02 18:12:42 +02:00
Thomas Pointhuber
64a68a7296 update soundcloud and add comments 2014-09-02 18:12:30 +02:00
Thomas Pointhuber
dae88d862b update piratebay engine and add comments 2014-09-02 17:56:32 +02:00
Thomas Pointhuber
334a286c18 update github engine and add comments 2014-09-02 17:37:47 +02:00
Thomas Pointhuber
c5d83059d5 update generalfile engine and add comments 2014-09-02 17:28:35 +02:00
Thomas Pointhuber
80b9312e42 add comments to dummy engine 2014-09-02 17:20:16 +02:00
Thomas Pointhuber
e6e4de8ba0 rewrite duckduckgo engine and add comments 2014-09-02 17:14:57 +02:00
Thomas Pointhuber
3d61d9b930 little refactoring 2014-09-02 17:13:44 +02:00
Thomas Pointhuber
16d1526818 add comments to deviantart engine 2014-09-02 16:48:18 +02:00
Thomas Pointhuber
58a443be29 fix vimeo engine and add comments 
engine generate (Error: None), I don't know why
 2014-09-01 17:10:25 +02:00
Thomas Pointhuber
03db970e6a fix yahoo engines and add comments 2014-09-01 16:17:29 +02:00
Thomas Pointhuber
90dcfc1ddd fix dailymotion engine and add comments to it 2014-09-01 15:36:53 +02:00
Thomas Pointhuber
144f89bf78 add comments to google-engines 2014-09-01 15:10:05 +02:00
Thomas Pointhuber
cdf74fe563 add bing_images 2014-09-01 14:39:18 +02:00
Thomas Pointhuber
4b1e0423a0 update bing engines and fix bing_news 2014-09-01 14:38:59 +02:00
Adam Tauber
55dfb305a0 Merge pull request #86 from pointhi/engines 
little fix for google images engine
 2014-08-31 23:26:35 +02:00
Thomas Pointhuber
6450082987 little fix for google images engine 2014-08-31 23:00:54 +02:00
Thomas LEBEAU
75853bd0b5 [courgette_theme] add autocomplete theme 2014-08-19 15:06:20 +02:00
Thomas LEBEAU
195ff7522e optim img bg 2014-08-18 11:19:11 +02:00
Thomas LEBEAU
1188907c4f remove artichaut.css 2014-08-18 10:56:16 +02:00
Thomas LEBEAU
a28cfd4887 [new] theme courgette 2014-08-18 10:45:05 +02:00
Adam Tauber
111a86d355 [fix] html escape 2014-08-06 14:43:44 +02:00
Adam Tauber
6fb9eb8e47 [mod] select autocomplete results with mouse click 2014-07-15 17:02:58 +02:00
Gabor Nagy
f705800612 Add tests for searx.engines.(dummy|github) 2014-07-14 15:33:56 +02:00
Gabor Nagy
8810273010 Cover searx.utils 2014-07-12 15:46:55 +02:00
Adam Tauber
11f5684b9f [fix] unused globals removed II. 2014-07-09 01:23:18 +02:00
Adam Tauber
66f02dc2b6 [fix] unused globals removed 2014-07-09 01:18:37 +02:00
Adam Tauber
d290c1b9ac [enh] github ribbon to landingpage 2014-07-07 14:29:12 +02:00
Adam Tauber
b0ba367a1a [enh][mod] search refactor 2014-07-07 13:59:27 +02:00
Adam Tauber
a07b2b514c [fix] url path unquoted check to avoid duplications 2014-07-05 17:33:19 +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
2f4c2298ba [enh][mod] engine list updates 2014-06-27 17:26:17 +02:00
Adam Tauber
8b0cb686d5 [enh] general-file.com engine added 2014-06-27 17:25:16 +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
3386e21cdf [fix] flickr.com mods 2014-05-20 16:57:03 +02:00
Adam Tauber
8d40445ab8 [mod] useragent generation 2014-05-20 16:55:49 +02:00
Adam Tauber
b226e6462b [fix] www. domain duplications 2014-05-20 01:16:49 +02:00
opi
7617cf1da9 [enh] Add french translation for webapp. 2014-05-17 12:03:15 +02:00
Adam Tauber
b704f46f8d [fix] flickr compatibility 2014-05-16 18:07:34 +02:00
Adam Tauber
73948f3020 [fix] pep8 2014-05-16 16:51:23 +02:00
Adam Tauber
7e946a369b [mod] tpb sort refactor 2014-05-16 16:49:42 +02:00
Adam Tauber
6d84ef13f2 [fix] indentation 2014-05-16 16:44:51 +02:00
rhapsodhy
6725112e6b [enh] sort piratebay results by seeders 2014-05-14 19:30:32 +01:00
Adam Tauber
66f87f8117 [mod] right sidebar 2014-05-10 06:42:33 +02:00
Adam Tauber
7c48b0f7da [fix] suggestions margin 2014-05-10 06:40:56 +02:00
Adam Tauber
ead8d30ea0 [mod] inline suggestions 2014-05-10 06:39:07 +02:00
Adam Tauber
c761d93dd6 [mod] search field width 2014-05-09 11:49:11 +02:00
Adam Tauber
b70f16c8c9 [fix] test updates 2014-05-09 02:16:55 +02:00
Adam Tauber
5d9d04a16e [enh] better highlighting 2014-05-09 02:04:20 +02:00
Adam Tauber
58de2801ce [fix] padding 2014-05-09 01:32:21 +02:00
Adam Tauber
47d548d6a2 [enh][mod] results ui refactor 2014-05-09 01:27:55 +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
d2f89f0446 [fix] wikipedia autocomplete error handling 2014-03-29 17:15:59 +01: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
52a817f5c1 [fix] pep8 2014-03-29 16:38:45 +01:00
Adam Tauber
fd730ebcad [fix] autocompleter.py added 2014-03-29 16:30:49 +01:00
Adam Tauber
41dd4d9ba3 [enh] autocompleter server side part 2014-03-29 16:29:19 +01:00
Adam Tauber
20504a0e83 Merge branch 'autocompleter' of https://github.com/pointhi/searx into autocomplete 2014-03-25 18:00:45 +01:00
Adam Tauber
0207070cde [fix] import 2014-03-24 12:04:07 +01:00
Adam Tauber
c55f03baea [mod] engine mod - urbandictionary suspended 2014-03-24 12:02:37 +01:00
Adam Tauber
a8a0de644d [fix] indexing 2014-03-21 18:17:13 +01:00
Adam Tauber
01c2eeb8ff [fix] indexing ++ url extraction 2014-03-21 16:36:13 +01:00
Adam Tauber
3854703d95 [mod] ddg engine mods 2014-03-21 16:33:17 +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
360543dec4 add forgotten search.less 2014-03-20 13:16:58 +01:00
Thomas Pointhuber
e181fd8f56 edit style of autcompleter 2014-03-20 11:08:55 +01:00
Thomas Pointhuber
8abf4ab993 adding initial code for backend-part of autocompleter 
including test-code
 2014-03-20 10:28:24 +01:00
Thomas Pointhuber
b5c695c6f5 edit style of autocompleter 2014-03-19 20:26:08 +01:00
Thomas Pointhuber
ecd293c8a9 add front-part of autocompleter function 2014-03-19 20:19:44 +01:00
Adam Tauber
ce08abe223 [fix] remove unused imports ++ pep8 2014-03-18 19:24:01 +01:00