OwlBurst/Ponysearch
1
0
Fork 0
forked from Ponysearch/Ponysearch
Code Pull requests Activity
1390 commits 4 branches 17 tags 71 MiB
Commit graph

1166 commits

Author SHA1 Message Date
Cqoicebordel
bbb5e23551 Remove whitespace caused by Jinja commands 
Adding this conf change will remove every newline created by a Jinja command (`{% %}`). It can save a bit of bandwidth.
 2015-02-14 01:42:06 +01:00
Cqoicebordel
a20d09f76b Translations update 2015-02-13 18:28:35 +01:00
Adam Tauber
bf09daa31d [enh] log redirects 2015-02-13 13:02:37 +01:00
Adam Tauber
3ff269c84c Merge pull request #237 from dalf/master 
[fix] close #197 for all engines
 2015-02-13 12:21:38 +01:00
dalf
5029cb4787 [fix] close #197 for all engines 2015-02-13 11:17:00 +01:00
Cqoicebordel
77ba28cf50 Some RTL fixes 
- Pull the suggestions to the right in oscar
- Add `‎` to a few places to print good url
- Always LTR code display
- Order pref label and info in pref for mobile view

And add `sort` for ui languages and languages to find them more easily.
 2015-02-13 01:03:18 +01:00
dimqua
f1a6522686 [enh] update russian translation 2015-02-12 23:34:03 +03:00
Adam Tauber
ec2516b93d Merge pull request #233 from dalf/master 
[fix] kickass engine
 2015-02-12 15:20:17 +01:00
dalf
9d537c0bad [fix] kickass tests 2015-02-12 14:50:41 +01:00
dalf
9db0bbc304 [fix] kickass engine : change the hostname to kickass.to (since kickass.so doesn't respond). 
Close #197 perhaps not in clean way. Explanation :
In fact 301 responses are followed, except the hook is called for each HTTP response,
the first time for the HTTP 301 response then for HTTP 200 response.
Since the kickass engine excepts a real result, the engine crashes, AND the requests lib stops here.
Add a simple test at the beginning of the result function allows pass the first response and handle correctly the second response (the real one)

May be a proper way is to add this test in search.py ?

Code inside requests :
53d02381e2/requests/sessions.py (L579)
and line 591
 2015-02-12 14:30:03 +01:00
Adam Tauber
f6db77d81e Merge pull request #210 from Cqoicebordel/unit-tests 
unit tests
 2015-02-12 10:52:55 +01:00
Cqoicebordel
b5cbbcede4 LTR the about page correctly 2015-02-12 02:02:30 +01:00
Cqoicebordel
d4ba97d00d Engine table in preference page in Courgette text-aligned to the right in RTL 2015-02-11 22:00:13 +01:00
Cqoicebordel
f4bdcc067f Real fix for preferences in RTL *and* in LTR 2015-02-11 20:53:06 +01:00
Cqoicebordel
3d5a4b091d Translate the 'cached' in results 2015-02-11 20:32:28 +01:00
Cqoicebordel
cec3ea77d5 Maps data must be LTR in RTL 2015-02-11 20:18:01 +01:00
Cqoicebordel
a4ae775e0f Preferences in the right order in RTL 2015-02-11 20:08:04 +01:00
Cqoicebordel
f96154b7c4 Google's unit test 2015-02-11 17:16:52 +01:00
Cqoicebordel
3f4d0053ee Import result_footer_rtl in video so it doesn't crash... 2015-02-11 15:58:59 +01:00
Thomas Pointhuber
6a0a693d6c [enh] add hebrew locale to searx 2015-02-11 15:04:05 +01:00
Thomas Pointhuber
0bdc79f45e [enh] add hebrew translation 2015-02-11 14:59:09 +01:00
Thomas Pointhuber
4b213ef4a2 [enh] update translations, regarding to #221 2015-02-11 14:19:06 +01:00
Adam Tauber
e43f61069a [fix] category name i18n - closes #221 2015-02-10 23:14:37 +01:00
Cqoicebordel
f703a77fc9 Photon's unit test 
As in Flickr, a continue is not detected by coverage as covered but it is.
 2015-02-10 18:44:49 +01:00
Adam Tauber
df9cf9d09b Merge branch 'rtl' of github.com:Cqoicebordel/searx 2015-02-10 15:23:56 +01:00
Cqoicebordel
8c2a5f0492 DDG Definitions' unit tests 2015-02-09 18:28:08 +01:00
Cqoicebordel
0a537d3b89 Yacy's unit test 2015-02-09 16:55:01 +01:00
Adam Tauber
c711212662 [fix] image proxify utf urls 2015-02-09 12:24:54 +01:00
Thomas Pointhuber
7ac6361b51 [enh] set google safesearch filter more restictive 2015-02-08 22:29:26 +01:00
Thomas Pointhuber
10666fd7c0 [enh] add safesearch to google_images 2015-02-08 22:15:25 +01:00
Thomas Pointhuber
832ea60e3d [fix] pep8, tests 2015-02-08 22:01:24 +01:00
Thomas Pointhuber
e7de9674b1 [enh] add safesearch functionality 
2 = strict
1 = moderate
0 = none
 2015-02-08 21:53:37 +01:00
Thomas Pointhuber
dd4686a388 [enh] add blekko_images engine 2015-02-08 14:49:46 +01:00
Thomas Pointhuber
04f7118d0a [enh] add gigablast engine 2015-02-08 14:12:14 +01:00
Cqoicebordel
fb04f76698 Faroo's unit test 2015-02-07 15:35:12 +01:00
Adam Tauber
91f7c031d5 [fix] handle proxied https scheme with uwsgi 2015-02-07 12:28:36 +01:00
Cqoicebordel
d0a1df881a Openstreetmap's unit test 2015-02-07 01:15:04 +01:00
Cqoicebordel
f1c10f4fe4 Startpage's unit test 2015-02-06 17:31:10 +01:00
Cqoicebordel
3a4d6045c1 Subtitleseeker's unit test 2015-02-06 16:39:59 +01:00
Cqoicebordel
9f13af8d3c Yahoo's unit test 2015-02-04 20:41:40 +01:00
Cqoicebordel
ff2ad57a87 Yahoo News' unit test 2015-02-04 20:07:26 +01:00
Cqoicebordel
d6e511fc2f Twitter's unit test 
There is a commented line of a test that I didn't succed to make it work. It's an issue of unicode, utf-8, ascii, latin1... I think I tried everything, but if you have an idea... I'm still a newbie in python...
 2015-02-04 19:39:31 +01:00
Cqoicebordel
a96208be96 Mediawiki's unit test 2015-02-03 19:56:26 +01:00
Adam Tauber
40ae8c8247 [enh] v0.7.0 2015-02-03 19:15:58 +01:00
Adam Tauber
996c797ab2 [fix] default blocked categories 2015-02-03 18:48:52 +01:00
Adam Tauber
1de781a143 [enh] category specific engine deactivation - closes #205 2015-02-03 18:37:38 +01:00
Adam Tauber
268e0516ee [fix] piratebay url change in tests 2015-02-03 00:27:40 +01:00
Adam Tauber
6be2065670 [fix] piratebay url 2015-02-03 00:21:25 +01:00
Cqoicebordel
1ea5bc63a5 Currency converter's unit test + DDG correction 
Does anyone know how to trigger the except in the currency converter while still being matched by the regex ?
 2015-02-02 18:39:50 +01:00
Cqoicebordel
efe6dead55 Duckduckgo unit test 2015-02-02 17:55:39 +01:00
Adam Tauber
7f865356f9 Merge branch 'unit-tests' of https://github.com/Cqoicebordel/searx into Cqoicebordel-unit-tests 
Conflicts:
	searx/tests/test_engines.py
 2015-02-02 09:36:43 +01:00
Cqoicebordel
5a16077455 PirateBay unit test + reactivation in Settings 2015-02-01 15:23:26 +01:00
Cqoicebordel
c6535dd65e Flickr Noapi unit test 2015-02-01 14:31:04 +01:00
Adam Tauber
03137eebd9 Merge pull request #208 from pointhi/new_engines 
add 1x.com engine, improve yacy-engine
 2015-02-01 14:07:34 +01:00
Thomas Pointhuber
a605d0ae69 [enh] add test for 1x.com 2015-02-01 13:52:43 +01:00
Cqoicebordel
8cf2ee5721 500px unit test 2015-02-01 13:43:10 +01:00
Adam Tauber
f18807955b [mod] python importable engine names 2015-02-01 11:55:47 +01:00
Thomas Pointhuber
7e30633edd [enh] improve yacy engine 2015-02-01 11:48:15 +01:00
Thomas Pointhuber
6042f2bc53 [enh] add 1x.com engine 
* Deacivated by default, because of the big amount of results
 2015-02-01 11:27:28 +01:00
Thomas Pointhuber
14079ea2b0 [fix] codec can't encode character inside image_proxify 2015-02-01 10:18:32 +01:00
Thomas Pointhuber
38302ef58b [fix] hash error if url is including non ascii characters 2015-02-01 10:07:53 +01:00
Adam Tauber
78828efdb0 [enh] allow override of blocked engines from query string 2015-01-31 23:11:48 +01:00
Adam Tauber
b19e681cce [enh] default disabled engines - closes #109 2015-01-31 23:11:45 +01:00
Adam Tauber
bfd321a7a9 [mod] python importable engine names 2015-01-31 22:05:13 +01:00
Cqoicebordel
04fa31b7f4 Vimeo's unit test 2015-01-31 19:49:54 +01:00
Cqoicebordel
d20ddf9da1 Stackoverflow's unit test 2015-01-31 17:29:22 +01:00
Cqoicebordel
787fee6a09 Soundcloud's unit test 2015-01-31 17:10:37 +01:00
Cqoicebordel
b7dc1fb9d5 Google news' unit test 2015-01-31 16:38:03 +01:00
Cqoicebordel
d5b8005ee1 Google images' unit test 2015-01-31 16:16:30 +01:00
Cqoicebordel
8ea749d6ec Kickass' unit test 2015-01-30 21:02:17 +01:00
Cqoicebordel
52a57ee045 Replace every bunch of whitespaces with only one space in HTML text 2015-01-30 21:00:49 +01:00
Cqoicebordel
a3d444ab85 BTDigg's unit test 2015-01-30 19:52:44 +01:00
Cqoicebordel
5761d6f0ab Bing news engine corrections 
XPath *never* return None.

(I found the HTML report of coverage)
 2015-01-29 21:19:59 +01:00
Cqoicebordel
efde2c21c8 Bing news' unit test 
I have no idea why coverage tell 97% and 2 misses in branches. If anyone has an idea...
 2015-01-29 20:56:57 +01:00
Cqoicebordel
dad0434f34 Bing images' unit test 2015-01-29 20:15:52 +01:00
Adam Tauber
8de97dac03 [mod] pretty url separation 2015-01-29 19:44:52 +01:00
Cqoicebordel
d495704551 Deviant Art's unit test 2015-01-29 01:13:33 +01:00
Cqoicebordel
1d255061c7 Digg's unit test 2015-01-29 00:26:12 +01:00
Cqoicebordel
92368a4107 Dailymotion's unit test 2015-01-27 23:20:57 +01:00
Cqoicebordel
3282e62ff9 Searchcode engines corrections 2015-01-27 22:39:25 +01:00
Cqoicebordel
0f81aa8410 Searchcode doc's test unit 2015-01-27 22:38:56 +01:00
Cqoicebordel
eca5de73a7 Searchcode code's test unit 2015-01-27 22:37:11 +01:00
Cqoicebordel
cfe81d741c A bit of utils unit tests 2015-01-27 20:03:33 +01:00
Adam Tauber
bac98a02cb [mod] reduce cookie expirity time - fixes #204 2015-01-27 20:00:17 +01:00
Adam Tauber
dafb49c804 [mod] update useragent versions 2015-01-27 19:58:39 +01:00
Adam Tauber
27efdf38c8 [fix] flickr-noapi logging ++ use correct image url - fixes #203 #181 2015-01-27 19:25:03 +01:00
Cqoicebordel
4dba3739fb Youtube's unit test 2015-01-26 18:24:08 +01:00
Cqoicebordel
8f040e30ad Flickr's test unit 2015-01-26 17:36:10 +01:00
Adam Tauber
78081baa8f [enh] always enable inner autocompletition (server side only) 2015-01-25 22:52:48 +01:00
Cqoicebordel
192f255e13 Mixcloud's unit test 2015-01-25 22:33:02 +01:00
Cqoicebordel
0f52cc7542 Deezer's unit test 2015-01-25 22:12:34 +01:00
Cqoicebordel
525af2a031 Add bing in the test units 2015-01-25 20:14:37 +01:00
Cqoicebordel
44c9216c49 Sanitize extract_text 2015-01-25 20:04:44 +01:00
Thomas Pointhuber
7716806c3d [fix] btdigg 2015-01-25 10:21:44 +01:00
Adam Tauber
e7d90b8e86 Merge pull request #200 from Cqoicebordel/bing-date 
Change the cookie in bing_news to use the english interface
 2015-01-23 11:50:51 +01:00
Cqoicebordel
cbe3c8be85 Change the cookie in bing_news to use the english interface 
But still uses the language to set the market, and so provide relevant results to the language.
Fix #198
 2015-01-22 22:46:34 +01:00
Adam Tauber
833ac04232 [enh] russian .mo file added 2015-01-22 22:42:41 +01:00
Adam Tauber
699fe60e50 [fix] handle single closing element in HTMLTextExtractor 2015-01-22 17:43:45 +01:00
Adam Tauber
06186e72a9 [fix] poolrequest post method parameters 2015-01-22 17:20:44 +01:00
dalf
0a83be0ec9 [fix] google engine: depending on the IP of the searx instance, each searx request where making two HTTP requests (see https://support.google.com/websearch/answer/873?hl=en ) 2015-01-22 11:40:28 +01:00
Adam Tauber
c169fc3aa2 Merge pull request #194 from Cqoicebordel/moar-engines 
Moar engines
 2015-01-22 08:46:04 +01:00
Adam Tauber
10891bdeab Merge pull request #192 from dalf/connection-pool 
[enh] improve response time. close #100
 2015-01-21 19:44:20 +01:00
Cqoicebordel
032f9bb1c9 Revert some wrong merge to allow torrents links to be visible 2015-01-21 18:03:11 +01:00
Cqoicebordel
85dcfa2c7d BTDigg and Mixcloud engines 2015-01-21 18:02:29 +01:00
dalf
d07cfd9089 [enh] use one single http connection pool : improve response time. close #100 2015-01-21 11:33:16 +01:00
Adam Tauber
549dcac588 Merge pull request #188 from Cqoicebordel/general-cookies 
General cookies
 2015-01-20 17:17:13 +01:00
Cqoicebordel
816a2c5cbe Move cookies in render() 2015-01-20 16:29:54 +01:00
Adam Tauber
f6b4220414 Merge pull request #186 from Cqoicebordel/add-bang-autocompletion 
Add '?' bang to the autocompleter
 2015-01-20 13:41:07 +01:00
Cqoicebordel
393d24ba50 Flake8 2015-01-19 22:26:48 +01:00
Cqoicebordel
4d0aeae567 Thanks @pointhi ! 2015-01-19 22:17:12 +01:00
Cqoicebordel
cd179bbdbb Modify theme Courgette to add colors 
Two colors are needed so I use a space in the cookie and a split in jinja to "encode" and "decode" them.
We should enforce that each theme if they must use a cookie, prefix its name with the name of the theme.

The color proposed here are based on bootstrap. We could use others.
 2015-01-19 22:07:19 +01:00
Cqoicebordel
71ae75d73e Extract color 2015-01-19 22:04:53 +01:00
Cqoicebordel
9b2187b261 Change theme to allow the logo to be text instead of image 2015-01-19 21:24:46 +01:00
Cqoicebordel
1a24fd9c52 Add cookies to every requests 2015-01-19 21:23:22 +01:00
dimqua
475f41224d Update messages.po 2015-01-19 22:51:07 +03:00
Cqoicebordel
b01b95194e Allow non specific cookies 2015-01-19 20:16:06 +01:00
Cqoicebordel
bc2d5bf88c Add '?' bang to the autocompleter 2015-01-19 19:47:32 +01:00
dimqua
052856e01b Update settings.yml 2015-01-19 21:03:20 +03:00
dimqua
5a3236ddc6 Create messages.po 2015-01-19 20:58:20 +03:00
Adam Tauber
fecac90e88 Merge pull request #183 from pointhi/bootstrap_themes 
improve oscar-template
 2015-01-18 20:04:06 +01:00
Adam Tauber
8cd7617054 [fix] opensearch xml mimetype - #184 2015-01-18 14:26:52 +01:00
Thomas Pointhuber
9c94b1a00a [update] bootstrap.min.css 2015-01-18 13:55:45 +01:00
Thomas Pointhuber
1f00ce8527 Revert: [enh] add new bootstrap-themes to oscar-template 2015-01-18 13:54:24 +01:00
Thomas Pointhuber
7366a0e141 [fix] add wordwrap to fix style issues 2015-01-18 13:42:31 +01:00
Thomas Pointhuber
a53c688879 [fix] pep8 2015-01-18 13:05:00 +01:00
Thomas Pointhuber
016a0ffe8a [enh] show js warning only if menu can't be used or inside preferences 2015-01-18 13:03:53 +01:00
Thomas Pointhuber
096ffd0659 [enh] add new bootstrap-themes to oscar-template 2015-01-18 12:00:38 +01:00
dalf
1d51512152 Proxify most of images references 
Create hash only when necessary
 2015-01-18 09:54:24 +01:00
dalf
9154cf7930 Proxify images inside infoboxes 2015-01-17 22:36:48 +01:00
dalf
b6d27aca59 [enh] image-proxy : handle ETag and date related headers, add hash to URL 2015-01-17 21:54:40 +01:00
Adam Tauber
a865e6672f [doc] locale settings comment - #177 2015-01-17 20:51:39 +01:00
Adam Tauber
08c2e263f5 [enh] configurable default interface locale - #177 2015-01-17 20:38:46 +01:00
Adam Tauber
317bce74dd [fix] robot test config option update 2015-01-17 20:36:44 +01:00
Cqoicebordel
d910744efe Test its existence before using thumbnail_src 
Thanks @pointhi !
 2015-01-17 19:49:21 +01:00
Cqoicebordel
2c15546518 Tiny forgots 2015-01-17 19:28:11 +01:00
Cqoicebordel
4238812a51 Flake8 2015-01-17 19:24:35 +01:00
Cqoicebordel
cb4a3fe598 Add thumbnails in images results 
- Modify engines to create/fetch an URL for the thumbnails
- Modify themes to show thumbnails instead of full images.

In Courgette, the result is not very beautiful. Should we change it ?
 2015-01-17 19:21:09 +01:00
Adam Tauber
edd9d31180 [fix] test with default theme 2015-01-16 17:46:02 +01:00
Adam Tauber
9ca50676eb [fix] pep8 2015-01-16 17:37:34 +01:00
Adam Tauber
0a3b9a7b00 [enh] add image proxy toggle to preferences templates 2015-01-16 16:58:44 +01:00
Adam Tauber
f3d7af33fd [enh] image proxy config from preferences 2015-01-16 16:57:53 +01:00
Adam Tauber
a1bf02e652 [enh] add image proxy to image results 2015-01-16 16:26:48 +01:00
Adam Tauber
01143f48c5 [enh] image proxification 2015-01-16 16:26:15 +01:00
Adam Tauber
60eb831966 [enh] image proxy base 2015-01-16 16:02:21 +01:00
Adam Tauber
306c644fa7 [mod] oscar as default theme 2015-01-16 12:36:33 +01:00
Adam Tauber
3fd562ccd7 Merge pull request #176 from Cqoicebordel/courgette-UXUI 
Courgette theme - UIUX
 2015-01-16 12:24:38 +01:00
Cqoicebordel
2fc1de54da Lots of courgette modification 2015-01-16 00:56:54 +01:00
Cqoicebordel
14447a0761 Modify courgette theme and less it. 2015-01-16 00:55:28 +01:00
Cqoicebordel
4f14f6cd26 New icons for Courgette 2015-01-16 00:29:11 +01:00
Cqoicebordel
b4b666e703 Flake8 2015-01-15 20:27:30 +01:00
Cqoicebordel
fa0330f0ff Fix startpage 
Fix issue with unicode caracters in startpage : we shouldn't urlencode them if we are using POST.
Should fix #169. @dimqua can you confirm ?
 2015-01-15 20:18:40 +01:00
Adam Tauber
fe5ff51377 [mod] pygments dependency warning 2015-01-15 18:55:25 +01:00
Adam Tauber
6503fdf2aa [enh] add cpp language rewrite rule 2015-01-15 18:40:19 +01:00
Adam Tauber
a61a96d975 [enh] log highlighter errors 2015-01-15 18:39:40 +01:00
Adam Tauber
a04fafd419 Merge branch 'code_results' of https://github.com/pointhi/searx into pointhi-code_results 
Conflicts:
	searx/static/themes/default/css/style.css
	searx/static/themes/oscar/css/oscar.min.css
	searx/templates/oscar/result_templates/torrent.html
 2015-01-15 18:26:00 +01:00
Adam Tauber
c5599e3c7c Merge pull request #174 from pointhi/nojs_fix 
add no javascript support to oscar-template
 2015-01-15 17:05:44 +01:00
Thomas Pointhuber
de6064994e [enh] show text "Start search" instead of icon, if javascript is disabled 2015-01-15 16:03:30 +01:00
Thomas Pointhuber
525833bea7 [enh] disable js-based links if no js is available 2015-01-15 15:55:39 +01:00
Thomas Pointhuber
5bfaabeb6b [enh] add nojs support into oscar-template 2015-01-15 15:48:50 +01:00
Cqoicebordel
389fc3b8b2 Few fixes 
- Whitespaces
- Change a few <p> in <span>
- Add RSS to allow browser detection
- A few UIUX changes
- Add a few more allowed translations
 2015-01-15 01:48:46 +01:00
Cqoicebordel
08df681b48 Tweaks of color and theme 2015-01-15 01:46:01 +01:00
Cqoicebordel
ceb650a01f Add lots of icons 2015-01-15 01:00:48 +01:00
Adam Tauber
410dbc573b [enh] static content generalization 2015-01-12 14:54:16 +01:00
Adam Tauber
12425618ca Merge pull request #172 from Cqoicebordel/torrents-w3c+ux+rss 
Torrents w3c+ux+rss
 2015-01-12 14:15:45 +01:00
Adam Tauber
b47b8cc2c6 Merge pull request #166 from Cqoicebordel/non-exclusif-bang 
Add non exclusif bang
 2015-01-12 14:14:40 +01:00
Cqoicebordel
824208491a Scientific accuracy 2015-01-12 13:08:32 +01:00
Cqoicebordel
3002725e2d Few more translations 2015-01-12 11:04:54 +01:00
Cqoicebordel
e32cb59ad6 W3C fix 2015-01-11 19:45:17 +01:00
Cqoicebordel
6ca81f649d Fix RSS link 
Fix page number, urlencoded request and encoded &
 2015-01-11 19:34:50 +01:00
Cqoicebordel
c59d0c200e Fix torrent W3C+UX 
Puts links to torrents and magnets in tool bar
Fixes a lot of W3C errors
 2015-01-11 19:34:11 +01:00
Adam Tauber
d7ea44ab8d [fix] dates before 1900 2015-01-11 13:26:42 +01:00
Adam Tauber
23fa74b5f9 [enh] date formatting by locale 2015-01-11 13:26:40 +01:00
Adam Tauber
e1856426e2 [fix] hadle missing title 2015-01-11 01:42:55 +01:00
Adam Tauber
8ef709ea1f Merge pull request #170 from pointhi/little_fixes 
Little fixes, add searx-autocompletion, more informations about torrents
 2015-01-11 01:20:46 +01:00
Thomas Pointhuber
9109686c4e [enh] using less html code to disable autoescaping for embeded results 2015-01-10 20:26:17 +01:00
Thomas Pointhuber
811515101b [fix] pep8 2015-01-10 20:01:36 +01:00
Thomas Pointhuber
c19b0899a4 [fix] little autocompleter fix 2015-01-10 19:55:21 +01:00
Thomas Pointhuber
eb6f3348c4 [enh] display filesize greater 1TB 2015-01-10 19:44:08 +01:00
Thomas Pointhuber
08f820d74c [enh] make some torrent strings translatable 2015-01-10 19:42:41 +01:00
Thomas Pointhuber
830f70a6bc [enh] improve torrent results 2015-01-10 19:40:27 +01:00
Thomas Pointhuber
4e2dae30f0 [enh] add autocompletion for searx-specific strings 2015-01-10 16:42:57 +01:00
Adam Tauber
aff33ea896 [fix] autocompleter error handling 2015-01-10 15:27:42 +01:00
Thomas Pointhuber
29a526ff0e [enh] add rss-link which can be detected by browsers 2015-01-10 15:24:21 +01:00
Adam Tauber
39c3f5658e [fix] endless logging recursion 2015-01-10 13:10:17 +01:00
Thomas Pointhuber
400b54191c Merge branch 'master' of https://github.com/asciimoo/searx into code_results 
Conflicts:
	searx/engines/searchcode_code.py
	searx/engines/searchcode_doc.py
	searx/static/oscar/js/searx.min.js
	searx/templates/oscar/result_templates/default.html
	searx/templates/oscar/result_templates/images.html
	searx/templates/oscar/result_templates/map.html
	searx/templates/oscar/result_templates/torrent.html
	searx/templates/oscar/result_templates/videos.html
 2015-01-09 21:30:09 +01:00
Adam Tauber
c8be128e97 [mod] ignore startpage unicode errors 2015-01-09 11:21:46 +01:00
Adam Tauber
23b4a53248 [enh] engine exception traceback 2015-01-09 04:30:55 +01:00
Adam Tauber
d6b1ff08ad Merge branch 'master' of github.com:asciimoo/searx 2015-01-09 04:15:57 +01:00
Adam Tauber
299a80a1eb [enh] using the logger 2015-01-09 04:13:05 +01:00
Adam Tauber
425a576f28 [fix] template syntax 2015-01-09 04:05:39 +01:00
Adam Tauber
6cbd29f674 [enh] logging added 2015-01-09 04:01:31 +01:00
Adam Tauber
05be069f42 Merge branch 'integrated-videos' of https://github.com/Cqoicebordel/searx into Cqoicebordel-integrated-videos 
Conflicts:
	searx/engines/vimeo.py
 2015-01-07 11:48:36 +01:00
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