 Adam Tauber
|
e4681da20f
|
Merge branch 'Cqoicebordel-integrated-videos'
|
2015-01-07 11:49:11 +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 |
|
|
Adam Tauber
|
2b7f3e28e7
|
[mod] display timeoutted engine name
|
2014-12-19 13:59:41 +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 |
|
|
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
|
90a8ffb03c
|
[doc] @Reventl0v added to authors
|
2014-12-11 15:30:25 +01:00 |
|
|
Adam Tauber
|
e51cc708ad
|
[fix] piratebay url
|
2014-12-11 15:28:04 +01:00 |
|
|
Adam Tauber
|
b1234ee889
|
[fix] startpage engine compatibility
|
2014-11-17 10:19:23 +01:00 |
|