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
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
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