Commit Graph

810 Commits

Author SHA1 Message Date
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
Adam Tauber f104553af4 [mod][fix] cookie expiration ++ pep8 compatibility 2014-03-18 19:22:28 +01:00
Adam Tauber a9d075dcc1 [enh] translation update 2014-03-18 18:24:18 +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 993271bed3 extract publishDate from vimeo 2014-03-18 15:56:22 +01:00
Thomas Pointhuber 337bd6d907 simplify datetime extraction 2014-03-18 13:19:50 +01:00
Thomas Pointhuber fd86bf8189 fix bug, to display publishDate with timezone without error 2014-03-18 13:19:23 +01:00
Adam Tauber faed14b2c6 [fix] #55 2014-03-18 10:06:14 +01:00
Adam Tauber c14e8fe0a5 [fix] #38 2014-03-18 09:38:23 +01:00
Adam Tauber fa26da1187 Merge branch 'master' of github.com:asciimoo/searx 2014-03-17 18:30:53 +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
Thomas Pointhuber f159fc718f fix little style bug 2014-03-16 09:48:10 +01:00
Adam Tauber 44990fc0af [enh] translation updates 2014-03-16 09:39:48 +01:00
Adam Tauber b735093564 [fix] pep8 2014-03-15 20:20:41 +01:00