Commit Graph

802 Commits

Author SHA1 Message Date
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