2139 Commits (e7401796f652c946f52faf12b1b7c871ceaa7211)

Author	SHA1	Message	Date
Noémi Ványi	80331cc8e6	add timeout errors in search_multiple_requests	7 years ago
Noémi Ványi	2242000bd4	change unresponsive_engines to a set to eliminate duplication of errors	7 years ago
Noémi Ványi	bdd9528c6b	show engine errors when no result is returned at all	7 years ago
Noémi Ványi	243d3e4298	show engine errors in infobox && add new error alert	7 years ago
Luke Bonham	3bd5ce6595	Italian localisation: corrected and fixed typos	7 years ago
marc	405e5c8f24	[fix] duckduckgo images doesn't fail with countryless language	7 years ago
Adam Tauber	38d6ba4066	[enh] generate search url of saved preferences	7 years ago
Adam Tauber	36af8f9d67	[fix] use py2/3 compatibility layer	7 years ago
marc	80460be8f6	[fix] wrap suggestions inside suggestion box ... long suggestions now wrap around the box instead of going overboard.	7 years ago
potato	9b82cb1908	[fix] is_valid_lang fixed for new languages.py + dictzone engine encoding	7 years ago
vache asatryan	5835ebf955	fix github url	7 years ago
Noémi Ványi	c361811cb5	[fix] fix xpath of google images	7 years ago
Adam Tauber	6d76d9b202	[fix] load engines if debug mode is enabled using uwsgi	7 years ago
Adam Tauber	343ac7197d	[fix] pep8	7 years ago
Adam Tauber	78365ffb8a	[enh] add init function to engines which loads parallel	7 years ago
Adam Tauber	f82646f386	[enh] version 0.12.0	7 years ago
marc	3b950929b1	[fix] fix duckduckgo's offset ... First page now starts with 0 offset, rather than starting on the 30th result. DuckDuckGo returns 30 results on each page.	7 years ago
marc	c65a409f0d	add duckduckgo images engine	7 years ago
Adam Tauber	e60e98156f	[enh] update translations - closes #930	7 years ago
Alexandre Flament	7ebe3a6f41	[mod] add category to each results, and change group criterias (template and existing image)	7 years ago
Alexandre Flament	87f673336f	[fix] rss feed : the jinja template was not found when the rss feed returns an valid feed including an error.	7 years ago
Adam Tauber	1972a044a3	[fix] produce valid urls if scheme is missing	7 years ago
Adam Tauber	8db527c1d2	[fix] use raw response with etree.parsefromstring - Unicode strings with encoding declaration are not supported	7 years ago
Noémi Ványi	b685e9753b	[enh] update existing translations	7 years ago
Adam Tauber	a4f7046b8f	[fix] pep8	7 years ago
Noémi Ványi	2a9339f4b7	[fix] add more description on possible search tpyes	7 years ago
Noémi Ványi	87f117d50e	[enh] add free software directory engine	7 years ago
Noémi Ványi	2db807368c	[enh] make search type of mediawiki configurable	7 years ago
marc	9ee8e552da	[fix] bing images	7 years ago
Alexandre Flament	9c91ab33f8	[mod] settings.yml can be /etc/searx/settings.yml ... The exact order is * first from SEARX_SETTINGS_PATH, * if not found then from searx code base, * if not found then from /etc/searx/settings.yml * if not found an exception stops searx loading	7 years ago
Alexandre Flament	ee080feaed	[mod] the static and templates directories can be defined in the settings.yml	7 years ago
Dalf	c233bf0df9	[fix] framalibre : remove result['thumbnail'] (not used)	7 years ago
Alexandre Flament	f5128c7cb9	[mod] add/modify image fetching for bing_news, qwant and twitter engines	7 years ago
Adam Tauber	52e615dede	[enh] py3 compatibility	7 years ago
Adam Tauber	46a2c63f8e	[fix] yahoo news date parsing	8 years ago
Alexandre Flament	12d91c1d67	[mod] searx doesn't crash at startup when an engine can't be loaded (see #884)	8 years ago
Adam Tauber	92ca80ba5a	[fix] build french translation to be identical with the .po source	8 years ago
Alexandre Flament	181c12ae04	[mod] upgrade requirements.txt	8 years ago
François Revol	45d15bd6f0	Add framalibre engine ... framalibre.org is a catalogue of Free Software, edited by Framasoft. For now we pass the thumbnail as img_src as it doesn't seem to be used for IT...	8 years ago
Noémi Ványi	4a4975d7fc	[enh] update translation files ... New languages: German (Germany), Finnish, Slovak, Ukrainian Updated: Bulgarian, German, Esperanto, Italian, Japanese, Dutch, Portuguese (Brazil), Russian, Swedish	8 years ago
marc	fd65c12921	make search language handling less strict ... languages.py can change, so users may query on a language that is not on the list anymore, even if it is still recognized by a few engines. also made no and nb the same because they seem to return the same, though most engines will only support one or the other.	8 years ago
marc	805fb02ed1	add language support for qwant ... closes issue #863	8 years ago
Alexandre Flament	e4d46d21c7	[mod] oscar theme: use tinypng.com to reduce logos and favicon	8 years ago
Alexandre Flament	e9785a69c7	[mod] reduce png and gif image sizes using optipng and gifsicle tools.	8 years ago
Noémi Ványi	247534be76	[fix] pageno param of search reqs in form	8 years ago
Adam Tauber	0e7ac3797d	Merge pull request #848 from maxigas/master ... add library genesis engine	8 years ago
maxigas	4ebde2b2af	add library genesis engine	8 years ago
Noémi Ványi	742e4dfdcc	[fix] fix paging of duckduckgo	8 years ago
Alexandre Flament	e67dfaaac7	Merge branch 'master' into flask_perimeter	8 years ago
Adam Tauber	ee1d44caf9	[mod] darker green url in logicodev	8 years ago
Adam Tauber	4906ac5192	[fix] add padding to pointhi theme's navbar - closes #841	8 years ago
Noémi Ványi	d88950c25f	[fix] darker green for result urls	8 years ago
Adam Tauber	b3974fc880	[fix] do not show glyph icons if noscript is enabled - #838	8 years ago
Adam Tauber	52d1087202	[enh] add result number parsing to google engine	8 years ago
Noémi Ványi	d635b5fd4d	[enh] make navbar smaller	8 years ago
Noémi Ványi	508d0f063e	[enh] make number of results less prominent	8 years ago
Noémi Ványi	8354bd0c60	[enh] make result url green	8 years ago
Adam Tauber	04306bad89	[fix] whitespace	8 years ago
Adam Tauber	30695265c2	[enh] search input design mods according to #226	8 years ago
Adam Tauber	e7aa98902f	[fix] correct search parameter check	8 years ago
Adam Tauber	2522254fb2	[fix] search time range value check	8 years ago
Adam Tauber	fa26afafd8	[fix] handle missing mapsettings	8 years ago
Alexandre Flament	15eef0ebdb	[enh] validate input and raise an exception inside search.py. The exception message is output in json and rss format.	8 years ago
Alexandre Flament	7fdfeca3a4	[mod] add a __common__ template that can't be selected but that provides a common place for shared templates. ... What has been moved into this template : * opensearch*.xml is always the same whatever the themes. * the text inside */about.html	8 years ago
Adam Tauber	57149661e4	Merge pull request #830 from davidar/se ... Semantic Scholar	8 years ago
Adam Tauber	b1d49bacb0	Merge pull request #827 from davidar/spell ... [enh] show spelling corrections	8 years ago
David A Roberts	7814d4b796	Semantic Scholar	8 years ago
David A Roberts	7492997c51	[fix] allow empty content	8 years ago
David A Roberts	1d30141c20	[enh] show spelling corrections	8 years ago
Alexandre Flament	7a16aca346	Merge branch 'master' into flask_perimeter	8 years ago
jcherqui	d98705bd06	Add 1337x icon	8 years ago
jcherqui	39a97825d9	Add torrent infos	8 years ago
jcherqui	4776abd1ac	Remove categories	8 years ago
jcherqui	a320328dda	Fix test	8 years ago
jcherqui	0549fb40d2	Add 1337x.to engine	8 years ago
Alexandre Flament	448903cd4a	[fix] searching for "!google_images text" doesn't work (bang with underscore)	8 years ago
Adam Tauber	d6cbc6b78b	[enh] 0.11.0 version bump	8 years ago
Adam Tauber	108392f8da	[fix] skip non-complete google news results	8 years ago
Dalf	06bea82935	[mod] /config API : add language_support, paging, safesearch, supported_languages, time_range_support, timeout fields.	8 years ago
Adam Tauber	0d4da30c7f	[enh] add instant answers to google engine	8 years ago
Adam Tauber	fc14fb0a67	[fix] french translation template var name	8 years ago
Adam Tauber	261015002e	[enh] update translations	8 years ago
Adam Tauber	14b96b8824	[enh] propagate all search properties to the results page's components	8 years ago
Adam Tauber	627962ce40	Merge branch 'master' into flask_perimeter	8 years ago
Noémi Ványi	e8319fa2cb	Revert "Merge pull request #793 from kvch/pics-modal" ... This reverts commit bff41987a4, reversing changes made to d08108be62.	8 years ago
Noémi Ványi	8af29d9797	Revert "Merge pull request #799 from kvch/modal-arrows" ... This reverts commit 79ceb13577, reversing changes made to eaa0fb8102.	8 years ago
Adam Tauber	7b1daf254e	[fix] autocomplete unicode issue - closes #808	8 years ago
Adam Tauber	525e5d275c	Merge pull request #801 from dalf/extract_text ... [fix] extract_text: use html.tostring instead html_to_text.	8 years ago
Alexandre Flament	84a2c97a65	[mod] searx uses flask framework only in webapp.py. Make migration to another framework easier.	8 years ago
Alexandre Flament	90e1db3e5c	[fix] extract_text: use html.tostring instead html_to_text. Fix #711	8 years ago
Adam Tauber	3d8c9bab96	Merge pull request #800 from dalf/searchpy5 ... search.py : Fix and some minor modifications	8 years ago
Adam Tauber	6bf9c398a7	[fix] use english as default language in bing ... If no language is specified, bing returns results with multiple languages for one query which isn't really useful. Setting english as default insted if nothing.	8 years ago
Alexandre Flament	5a9551925d	[fix] fix bugs introduced by commit 0a2fde19d0 from dalf/searchpy4	8 years ago
Alexandre Flament	28d51fd063	[mod] timeout in log are readable (the timeouts are compare to the start_time of the request).	8 years ago
Alexandre Flament	3a8ab5880a	[mod] result_container.extend sets result['engine'] = engine_name for each result	8 years ago
Noémi Ványi	d18d09a98b	[fix] change modal glyphicon arrows to image icons	8 years ago
Alexandre Flament	0a2fde19d0	[mod] add a search_one_request_safe function wrapper to call search_one_request. All exceptions are catched in this wrapper.	8 years ago
Noémi Ványi	1710043eb7	remove unnecessary media query && generated files	8 years ago
Noémi Ványi	420ef433ae	add img pagination support of infinite scroll	8 years ago
Noémi Ványi	2ec6034c85	add modal window for pointhi style	8 years ago
Noémi Ványi	d82f64238f	fix opening of result on new tab	8 years ago
Noémi Ványi	1157cefb1e	add generated css of modal window	8 years ago
Noemi Vanyi	5fa6af648d	add own pics modal window	8 years ago
marc	896c0c3734	revert language support column in preferences	8 years ago
marc	1175b3906f	change language list to only include languages with a minimum of engines ... that support them. users can still query lesser supported through the :lang_code bang.	8 years ago
Adam Tauber	7388067f15	[fix] load engines with uwsgi too	8 years ago
Adam Tauber	116521192e	[mod] display supported languages in preferences engine view	8 years ago
Adam Tauber	8bff42f049	Merge branch 'master' into languages	8 years ago
Adam Tauber	ea034fafa9	[fix] proper engine init	8 years ago
Adam Tauber	68cbf0448f	[fix] do not reload engines twice if started with debug mode	8 years ago
Adam Tauber	a605377c40	[enh] explicit engine init	8 years ago
Adam Tauber	14f58bdaec	[fix] robot tests ++ set default value for server http protocol version	8 years ago
Adam Tauber	a98bbefbcf	[enh] configurable listening http protocol version	8 years ago
Stefan Antoni	89914e52e3	Update settings.yml	8 years ago
Stefan Antoni	e6d69b082f	Merge branch 'master' into add_ccctv_to_settings	8 years ago
Adam Tauber	07448e15e4	[fix] disable etymonline by default - closes #789	8 years ago
Adam Tauber	b6fc154616	[enh] add searx engine	8 years ago
Stefan Antoni	96c8d36e7b	Add ccctv engine to settings.yml	8 years ago
Adam Tauber	0171db5c3f	[fix] handle missing images in google news	8 years ago
Adam Tauber	4b225eb7ef	Merge pull request #661 from davidar/et ... Online Etymology Dictionary	8 years ago
marc	f30d5e8793	[fix] supported languages column in preferences page	8 years ago
marc	7fba3d1179	Merge branch 'master' into languages	8 years ago
marc	4a1ff56389	minor fixes in utils/fetch_languages.py	8 years ago
Adam Tauber	19cd2bf3b5	[fix] re-enable ssl verification for searchcode ... closes #784	8 years ago
Adam Tauber	cf5c7d050a	[fix] engine setting if no categories specified	8 years ago
marc	af35eee10b	tests for _fetch_supported_languages in engines ... and refactor method to make it testable without making requests	8 years ago
marc	e0c270bd72	tests for language support in engines	8 years ago
marc	1b46ecd21a	[fix] broken language selector	8 years ago
marc	93233c786a	Refactor search language preference.	8 years ago
marc	f62ce21f50	[mod] fetch supported languages for several engines ... utils/fetch_languages.py gets languages supported by each engine and generates engines_languages.json with each engine's supported language.	8 years ago
marc	92c6e88ad3	small fixes	8 years ago
marc	727c287856	[fix] backwards compatibility with old language cookies	8 years ago
marc	922d51bf0c	Add country names in language list.	8 years ago
marc	a11948c71b	Add language support for more engines.	8 years ago
marc	a11230819f	automatic search when language is selected	8 years ago
marc	c677aee58a	filter langauges	8 years ago
marc	149802c569	[enh] add supported_languages on engines and auto-generate languages.py	8 years ago
Noémi Ványi	b034356825	add year filter to engines with time range support && tests ... Following engines does not support "Last year": * Bing News * DeviantArt * DuckDuckGo * Yahoo * YouTube (noapi)	8 years ago
Noémi Ványi	c59c76e6ee	add year to time range to engines which support "Last year" ... Engines: * Bing images * Flickr (noapi) * Google * Google Images * Google News	8 years ago
Noémi Ványi	2fc1091b7f	add "Last year" option to time range selection	8 years ago
Thomas Renard	16c40ffefd	htmlize yacy contents	8 years ago
Noémi Ványi	9c8ec209e1	[mod] add timeout to gigablast	8 years ago
Noémi Ványi	553f3a3a1a	fix xpath of yandex	8 years ago
Noémi Ványi	85f363774c	fix habrahabr xpath	8 years ago
Noémi Ványi	c6ed0dae6c	fix google play movies xpath	8 years ago
Adam Tauber	4676e1dcde	[fix] remove result escaping from engine	8 years ago
Adam Tauber	1a82ed6f54	[mod] 500px rewrite	8 years ago
Adam Tauber	f6e9c074bb	[fix] vimeo engine change follow-up	8 years ago
Adam Tauber	a2c94895c1	[fix] google news engine change follow-up	8 years ago
Adam Tauber	a764ebb4b1	[enh] extend json response with suggestions, infoboxes and answers	8 years ago
Adam Tauber	c3dcebb778	[fix] remove html tags from qwant results	8 years ago
Adam Tauber	be6ae81cb2	Merge pull request #776 from asciimoo/voat-engine ... add voat.co engine	8 years ago
Adam Tauber	e12a137a2f	[fix] unicode response in deezer and spotify	8 years ago
Adam Tauber	75aa46a6b3	[fix] remove unused variable	8 years ago
Adam Tauber	0205838f25	[enh] handle engine response crashes	8 years ago
Alexandre Flament	e48f07a367	Merge branch 'master' into searchpy2	8 years ago
Adam Tauber	d80fb2c8e8	[enh] central handling of empty result titles	8 years ago
Adam Tauber	72a217f983	[mod] return empty string on missing osm title ... Sometimes openstreetmap returns with None as title. In these cases use an empty string instead.	8 years ago
Adam Tauber	fdf63940e8	[fix] tests ++ flickr error	8 years ago
Adam Tauber	ef2ef7974a	[enh] central html escaping of results	8 years ago
Adam Tauber	7e1f27e459	[enh] add author to image result content	8 years ago
Adam Tauber	39f5035e13	[fix] query escaping in rss/opensearch output	8 years ago
Adam Tauber	16bdc0baf4	[mod] do not escape html content in engines	8 years ago
Adam Tauber	28f12ef5a0	[fix] proper escaping of the search query in templates	8 years ago
Adam Tauber	7986d4cf41	[fix] correct path for autoscroll on non-root urls ... closes #758	8 years ago
Noémi Ványi	3007e4e451	add voat.co engine	8 years ago
Adam Tauber	0724bd8168	[fix] pep8	8 years ago
Adam Tauber	7eed8a5dd9	[enh] add statistics answerer	8 years ago
Adam Tauber	971ed0abd1	[enh] add quick answer functionality with an example answerer	8 years ago
Adam Tauber	55dc538398	[mod] move load_module function to utils	8 years ago
Adam Tauber	827f9e41ca	[fix] gettext requires request.preferences	8 years ago
Noémi Ványi	299c882304	search: make language configurable from settings.yml	8 years ago
Noémi Ványi	12c369e858	preferences: refactor to check consistently input values	8 years ago
Adam Tauber	a757c2f005	[fix] remove unused imports	8 years ago
Adam Tauber	832cf37a97	[enh] display errors ... also tried flask's flash feature but flask creates session cookies if it isn't flushed. Avoiding session cookies to preserve privacy	8 years ago
Adam Tauber	88dfee858e	[fix] rewrite missing variable	8 years ago
Adam Tauber	96f182d75d	[fix] allow empty autocomplete setting ... closes #756 closes #761	8 years ago
Adam Tauber	43ddbc60da	[fix] pep8	8 years ago
Adam Tauber	16f2e346b3	[fix] bing unicode issue part III.	8 years ago
Adam Tauber	94196c4b6c	[enh] show traceback of search errors	8 years ago
Adam Tauber	1176505fa4	[fix] bing character encoding - closes #760	8 years ago
Adam Tauber	17b08d096c	[fix] unicode search expression for bing	8 years ago
Adam Tauber	16ff8d06c7	[fix] bing paging and language support ... see https://msdn.microsoft.com/en-us/library/ff795620.aspx for bing specific search operators closes #755	8 years ago
Alexandre Flament	219f047bf3	Merge branch 'master' into searchpy2	8 years ago
Adam Tauber	7d26b3f8f8	[fix] suspend end time check	8 years ago
Noémi Ványi	c7906555a0	add lobste.rs xpath engine	8 years ago
Alexandre Flament	01e2648e93	Simplify search.py, basically updated PR #518 ... The timeouts in settings.yml is about the total time (not only the HTTP request but also the prepare the request and parsing the response) It was more or less the case before since the threaded_requests function ignores the thread after the timeout even the HTTP request is ended. New / changed stats : * page_load_time : record the HTTP request time * page_load_count: the number of HTTP request * engine_time : the execution total time of an engine * engine_time_count : the number of "engine_time" measure The avg response times in the preferences are the engine response time (engine_load_time / engine_load_count) To sum up : * Search.search() filters the engines that can't process the request * Search.search() call search_multiple_requests function * search_multiple_requests creates one thread per engine, each thread runs the search_one_request function * search_one_request calls the request function, make the HTTP request, calls the response function, extends the result_container * search_multiple_requests waits for the the thread to finish (or timeout)	8 years ago
Alexandre Flament	58a6c045c8	[mod] replace references request.request_data (GET or POST parameters) by request.form (based on merge of POST and GET parameters)	8 years ago
dalf	fbb080f358	Change plugin API : ... - pre_search(request, search) - post_search(request, search) - on_result(request, search, result) with - request is the Flask request - search a searx.Search instance - result a searx result as usual	8 years ago
dalf	67e11c42b9	Clean up the architecture ... Purposes : - isolate the plugins calls - distinction between parsing the web request and running the search (Search class). To be able to test code easily, to run searx code outside a web server, to filter the search query parameters with plugins more easily, etc... Details : - request.request_data contains request.form or request.args (initialize inside pre_request() function) - Query class is renamed RawTextQuery - SearchQuery class defines all search parameters - get_search_query_from_webapp create a SearchQuery instance (basically the previous Search.__init__ code) - Search class and SearchWithPlugins class takes a SearchQuery instance as class constructor parameter - SearchWithPlugins class inherites from Search class, and run plugins - A dedicated function search_with_plugins executes plugins to have a well define locals() (which is used by the plugins code). - All plugins code is executed inside the try...except block (webapp.py, index function) - advanced_search HTTP parameter value stays in webapp.py (it is only part of UI) - multiple calls to result_container.get_ordered_results() doesn't compute the order multiple time (note : this method was call only once before) - paging value is stored in the result_container class (compute in the extend method) - test about engine.suspend_end_time is done during search method call (instead of __init__) - check that the format parameter value is one of these : html, rss, json, rss (before the html value was assumed but some text formatting wasn't not done)	8 years ago
Adam Tauber	142cd87095	[fix] menu style in pointhi oscar theme	8 years ago
Adam Tauber	9782633054	[fix] menu without js - closes #747	8 years ago
Noémi Ványi	1490d6bc93	add time range search for flickr	8 years ago
Noémi Ványi	5c02b9ef31	add time range support for bing images	8 years ago
Noémi Ványi	d2e0cbafb2	add time range search for youtube noapi	8 years ago
Noémi Ványi	f70d405202	add time range search for bing news	8 years ago
Noémi Ványi	e3d748ded4	show time range support in preferences	8 years ago
Adam Tauber	6243639f01	[mod] do not proxify images if image proxy is not set	8 years ago
Noémi Ványi	6334fca11c	add version info to config endpoint	8 years ago
Adam Tauber	1b9045ed89	[enh] use morty proxy for image proxification too if it is configured	8 years ago
Adam Tauber	a67a4bf2c0	[enh] allow morty proxy without hmac key	8 years ago
Adam Tauber	574d9d40d2	Merge pull request #697 from Eig8phei/http1.1 ... serve pages with HTTP/1.1	8 years ago
dalf	3e7554422b	[mod] the environment variable SEARX_DEBUG can override the general.debug value in settings.yml	8 years ago
Adam Tauber	e249698b26	Merge pull request #737 from dalf/ixquick ... [fix] ixquick : fetch results from ixquick.eu instead of ixquick.com	8 years ago
dalf	972f32d973	[fix] ixquick : fetch results from ixquick.eu instead of ixquick.com, close #727	8 years ago
Noémi Ványi	db8c2ebc3f	[fix] images modal with infinite scroll	8 years ago
Adam Tauber	760cb3c5af	Merge pull request #734 from dalf/seeks_url ... [fix] seeks URLS, close #731	8 years ago
Alexandre Flament	a88768efd8	Merge branch 'master' into http1.1	8 years ago
Noémi Ványi	53c9fde992	fix kickass torrents engine	8 years ago
Adam Tauber	218857999e	Merge pull request #726 from mmuman/opensearch_shortname ... [fix] set the title on the opensearch link tag	8 years ago
Adam Tauber	d5c0dcd18a	[fix] unicode url proxiing	8 years ago
Adam Tauber	1be6e72d51	[enh] add result proxy support - #707	8 years ago
Adam Tauber	19a6ca0b68	[enh] use HMAC for image proxy url verification	8 years ago
Alexandre Flament	5b21a7fb65	Merge branch 'master' into opensearch_shortname	8 years ago
dalf	cae84e71a5	[fix] seeks URLS, close #731	8 years ago
Alexander Minges	3c5883408c	initial commit of pdbe engine ... Adds support for queries to the Protein Data Bank Europe (PDBe).	8 years ago
François Revol	96cfdc77d2	[fix] set the title on the opensearch link tag ... Firefox uses the title attributes instead of the ShortName from the xml file as set in 0fbd7052 which closed #405	8 years ago
Pydo	beff8c6007	Merge branch 'master' of https://github.com/asciimoo/searx into feature/seedpeer-engine-integration	8 years ago
Pydo	01844b6f04	Set default categories for seedpeer provider	8 years ago
Adam Tauber	dceb903114	[mod] disallow search results for robots	8 years ago
Pydo	55a5b686ed	Merge branch 'master' of https://github.com/asciimoo/searx into feature/seedpeer-engine-integration ... Resolved conflict searx/settings.yml	8 years ago
Pydo	6f87bf2a1c	Disabled seepeer.eu by default since it does not support https	8 years ago
Adam Tauber	812ade82b1	[fix] robot test engine names	8 years ago
Adam Tauber	86daef2063	[fix] do not allow underscore in engine names - closes #708	8 years ago
Adam Tauber	bee7b497a3	[mod] rename "default" theme to "legacy"	8 years ago
marc	d1d4ed4376	[fix] results with digbit don't truncate anymore	8 years ago
Eig8phei	f90eb428c6	serve pages with HTTP/1.1	8 years ago
Lorenzo J. Lucchini	2bc42b378d	Remove unrelated change that mistakenly ended up into this branch	8 years ago
firebovine	e145fdb86d	#607 - noapi fix	8 years ago
Lorenzo J. Lucchini	05206f86e3	Adding Urban Dictionary xpath engine	8 years ago
Lorenzo J. Lucchini	a8907224a1	Improving Wolfram Alpha search hit content ... Making WA search hits contain - the (parsed) input inside the "title" instead of just "Wolfram|Alpha", to better match other hit titles and to confirm correct parsing of input to the user - the first output field that contains any text (skipping ones that are only pictures; this is usually the most meaningful "result" field) instead of the raw input as the "content", making it additionally possible to obtain WA computations from JSON API calls	8 years ago
marc	09ee2aa69d	[fix] Result text in Wolfram|Alpha (#607)	8 years ago
firebovine	baeb3ff911	fix xpath expressions for urban dictionary	8 years ago
Adam Tauber	8d4dd3c515	[fix] 404 HTTP status on not found pages - closes #681	8 years ago
Adam Tauber	ce371f766a	[enh] version 0.10.0 ... closes #659	8 years ago
Adam Tauber	ea19e19ff2	[enh] translation updates	8 years ago
Adam Tauber	3144ec1d59	[fix] unicode urls	8 years ago
potato	983415bc38	[enh] is_valid_lang moved to utils	8 years ago
potato	b7d578ae80	[enh] engine header comments	8 years ago
potato	5ed9846bbf	[fix] revert the port change	8 years ago
potato	8c72a22757	[enh] api_key usage, disable the engine by default	8 years ago
potato	c051e6a2c3	[fix] pep8	8 years ago
potato	ab471fd13b	[enh] mymemory translated engine added for multi-word translations	8 years ago
potato	22bd39fd42	[fix] only 1-word search triggers the engine	8 years ago
potato	7bf1013c15	[enh] removed missing params; [fix] pep8	8 years ago
potato	bc806bfab1	[fix] no lambda anymore, cgi.escape	8 years ago
potato	5416f0f248	[enh] dictionary engine renamed to dictzone	8 years ago
potato	84ff6e289e	[enh] filter non-existing language code/name containing requests	8 years ago
potato	b808a2e266	[fix] don't merge with suggestions	8 years ago
potato	3f4cc2146c	[enh] return results instead of answers	8 years ago
potato	9d08c81f47	Merge branch 'master' of https://github.com/asciimoo/searx	8 years ago
potato	f4525880ed	[enh] dictionary engine added	8 years ago
Adam Tauber	55abf07a4f	[fix] thread safe threaded_requests() function	8 years ago
Adam Tauber	b816752719	[enh] more compact image results ++ fixed modal links	8 years ago
Adam Tauber	3a1b6fa818	[fix] replace modal-content class to prevent remote content load ... details: http://stackoverflow.com/questions/18378720/bootstrap-3-with-remote-modal	8 years ago
Adam Tauber	fa5bc3a563	[fix] use threading to recover after incomplete request crashes - closes #651 #662	8 years ago
Adam Tauber	b27f07af23	[enh] socks proxy support	8 years ago
Adam Tauber	da4f1c2512	[mod] truncate result content in html - closes #224	8 years ago
Adam Tauber	94b5f2ca77	[fix] result url wrap - closes #652	8 years ago
Adam Tauber	959497e26b	[fix] remove trailing whitespaces	8 years ago
Pydo	41ce76e9c9	Merge branch 'master' of https://github.com/asciimoo/searx into feature/seedpeer-engine-integration	8 years ago
Pydo	2c2123b2e8	Added seepeer to config and added seepeer search parser	8 years ago
Adam Tauber	465d47283f	[fix] 404 page localization #2	8 years ago
Adam Tauber	c2f4d4449d	[fix] 404 page localization	8 years ago
Adam Tauber	b4b0231617	[fix] links in new tabs without js ++ noopener bug fix - closes #674	8 years ago
Adam Tauber	7591c8bfe3	Merge pull request #672 from kvch/self-info-paging ... Self information on later pages	8 years ago
Adam Tauber	3043c404e4	Merge pull request #671 from kvch/custom-404 ... Custom 404 message - fixes #317	8 years ago
Noemi Vanyi	aa227180e2	remove self info answers from pages after first one	8 years ago
Noemi Vanyi	0056c4035e	add custom 404 page	8 years ago
Adam Tauber	b72aec0a9b	[fix] remove btdigg - see https://torrentfreak.com/btdigg-shut-down-due-to-torrent-spam-for-now-160711/	8 years ago
Adam Tauber	32604be790	[fix] piratebay engine - using pirateproxy.red - see https://proxybay.tv/	8 years ago
Adam Tauber	f693a54ad7	Merge pull request #664 from kvch/uncapitalize-searx ... uncapitalize searx in templates	8 years ago
Adam Tauber	13bed1f872	Merge pull request #639 from kvch/digbt-engine ... add digbt engine - fixes #638	8 years ago
Noémi Ványi	4bd44cd98f	uncapitalize searx in templates	8 years ago
David A Roberts	45120bc711	Add Hoogle search engine	8 years ago
David A Roberts	1e9dab08e6	[fix] behaviour for page_size>1 and first_page_num>0 ... eg. pageno=1,21,41,... instead of 20,40,60,...	8 years ago
David A Roberts	413e143707	[fix] don't merge results with distinct fragments	8 years ago
David A Roberts	ee320d4e5b	Online Etymology Dictionary	8 years ago
Noémi Ványi	d320dd0efc	diable digbt engine in settings.yml	8 years ago
Noemi Vanyi	3a1c5876b1	add digbt engine ... Unfortunately, it is quite slow so it is disabled. Furthermore, the display of number of files is wrong on digbt.org, so it is not displayed on searx.	8 years ago
Adam Tauber	104cdb7d03	[fix] remove unused imports ++ int token timestamp by default	8 years ago
Adam Tauber	eb57481450	[fix] google images paging - closes #571	8 years ago
David A Roberts	61fe5daf30	Add Microsoft Academic search engine	8 years ago
Adam Tauber	31866d9f33	Merge pull request #629 from stepshal/E305 ... Add missing blank lines after class or function definition.	8 years ago
stepshal	7e16c9d360	Add missing blank lines after class or function definition.	8 years ago
Adam Tauber	827aba4599	Merge pull request #658 from davidar/scroll ... [enh] infinite scroll	8 years ago
David A Roberts	678b9e994a	[enh] infinite scroll ... resolves #649	8 years ago
Adam Tauber	4fae62cd88	Merge pull request #656 from cy8aer/openrepos ... openrepos: Meego/Sailfish application repository	8 years ago
Adam Tauber	975bd5beb5	[fix] oscar grunt css build	8 years ago
David A Roberts	4ffe18b4bb	[fix] delete trailing quote	8 years ago
David A Roberts	117d36b66e	Add Crossref search engine and DOAI rewrite plugin	8 years ago
Noémi Ványi	e7f93f4f12	set type of cursor to pointer in advanced search	8 years ago
Thomas Renard	9c18abfe5a	openrepos: Meego/Sailfish application repository	8 years ago
Adam Tauber	f1262ffa9e	Merge pull request #588 from a01200356/wikidata ... [enh] More data from Wikidata	8 years ago
Noemi Vanyi	c59ef83353	redesign toggle button of engines && plugins	8 years ago
marc	ad58b14be7	[fix] merge infoboxes based on weight ... also minor changes in attributes and images from wikidata	8 years ago
marc	c2e4014287	[fix] urls merge in infobox (#593) ... TODO: merge attributes	8 years ago
marc	a0a1284998	wikidata refactor and more attributes (see issue #560)	8 years ago
marc	a4c77f88d0	[fix] exception if locale doesn't have a date format ... occitan, for example	8 years ago
a01200356	93ef11adc0	[enh] multilingual wikidata ... disambiguation and tags are in local language TOFIX: needs to query the api every time to know each label's name	8 years ago
Adam Tauber	c553523f5b	Merge pull request #645 from dalf/remove_kickass ... [mod] remove the kickass engine from settings.yml	8 years ago
Adam Tauber	ffbee4bb82	[fix] collect garbage after searches to reduce memory footprint	8 years ago
Adam Tauber	bf92aa3fdd	[fix] wrap categories on small screens ++ some code formatting - closes #647	8 years ago
Adam Tauber	350a84520d	[fix] time range detection	8 years ago
Adam Tauber	3a8d193d1f	[mod] disable ddg by default - it just proxies yahoo/bing results: https://duck.co/help/company/yahoo-partnership	8 years ago
Adam Tauber	7d9c898170	Merge pull request #634 from kvch/advanced-search ... support time range search	8 years ago
Noemi Vanyi	90e74fbb28	search on filter select	8 years ago
Adam Tauber	54d987636e	[fix] do not load engines which cannot be initialized - closes #585	8 years ago
Noemi Vanyi	16a8641649	advanced-search: panel is visible when checked before	8 years ago
Noemi Vanyi	128b5245ab	time range selection as dropdown	8 years ago
Noemi Vanyi	e046c0d7ae	add time range strings to be translated	8 years ago
Noemi Vanyi	cddc9d3792	add 'Advanced settings' to strings to be translated	8 years ago
Noemi Vanyi	a7c8d5882c	fix pep8	8 years ago
Noemi Vanyi	e7baf24ec1	add time range search for deviantart	8 years ago
Noemi Vanyi	e9a78f1434	add time range search for google images	8 years ago
Noemi Vanyi	f13b9fa36a	add time range search for duckduckgo	8 years ago
Noemi Vanyi	2e5839503f	add time range search for google	8 years ago
Noemi Vanyi	713d30400b	add advanced settings to pointhi style	8 years ago
Noemi Vanyi	074521fd8a	follow up changes in search_category_on_select	8 years ago
Noemi Vanyi	2e8ab34d76	add advanced settings for logicodev style	8 years ago
Noemi Vanyi	93c0c49e9a	add time range search with yahoo	8 years ago
Adam Tauber	3a9c3fbd68	Merge pull request #644 from dalf/logicodev_fix ... [fix] close #637 : the search box doesn't overlap the menu.	8 years ago
Harry Wood	cd072676e9	moving a comma	8 years ago
Alexandre Flament	bd4d904002	[mod] remove the kickass engine from settings.yml	8 years ago
Alexandre Flament	e655e44133	[fix] close #637 : the search box doesn't overlap the menu.	8 years ago
Alexandre Flament	34835b77e2	[fix] Close #640 : remove MapQuest maps. Add in comment maps.wikimedia.org maps, see https://www.mediawiki.org/wiki/Maps	8 years ago
Noemi Vanyi	ba590de7f1	[fix] deviantart engine xpaths	8 years ago
Adam Tauber	aa09f963eb	Merge pull request #621 from stepshal/anomalous-backslash-in-string ... Fix anomalous backslash in string	8 years ago
Adam Tauber	21c5fb1c45	[fix] pep8	8 years ago
Adam Tauber	a7260ac497	[fix] do not replace image href urls - closes #594 ... These lines were added to fix a js image load issue (#535) what i cannot reproduce. Hopefully we don't see it again	8 years ago
Adam Tauber	5b5478bbd9	[fix] compute the order of results only once per search	8 years ago
Adam Tauber	485da54961	[mod][fix] use the average of results number ++ do not display smaller result number than the actual result count - closes #600	8 years ago
David A Roberts	144b7be70d	Add Google Scholar search engine	8 years ago
Adam Tauber	f7a3e9771d	Merge pull request #615 from mmuman/scanr ... Add ScanR structures search engine	8 years ago
marc	aac4ed6971	[fix] guess country code if not specified in duckduckgo engine	8 years ago
a01200356	8fc4b8156a	[fix] multilingual duckduckgo ... only works if both country and language are set	8 years ago
François Revol	1dba6dcbac	Add ScanR structures search engine ... In theory ScanR should also search for projects but the API is different, so we'd need another engine.	8 years ago
stepshal	b3ab221b98	Fix anomalous backslash in string	8 years ago
stepshal	cd9b494cb5	Fix quantity of blank lines after code object.	8 years ago
François Revol	b538de568a	Add INA search engine	8 years ago
Adam Tauber	fbbb307f2e	[enh] add engine shortcut to config api	8 years ago
Adam Tauber	9f64fd6745	[enh] update useragent versions	8 years ago
Adam Tauber	257e52954a	[enh][fix] update to latest dependencies ++ fix tests & travis test runner ... WARNING: dependency changes	8 years ago
Noemi Vanyi	c428f2d980	[fix] remove unecessary capitalize of name of instance	8 years ago
Adam Tauber	5924abd483	[fix] mobile navbar errors - closes #596	8 years ago
Adam Tauber	8ee32d5372	[fix] hide number of results if 0	8 years ago
Adam Tauber	2f7752b410	[enh] display number of results	8 years ago
Adam Tauber	36c8977390	[fix] rtl result template	8 years ago
Adam Tauber	1ee2a3d25d	[mod] more compact logicodev skin	8 years ago
Adam Tauber	0c9c063141	[fix] result url block selection	8 years ago
Adam Tauber	7013c3dc0d	[fix] logo responsivity ++ preferences button hover	8 years ago
Adam Tauber	f496dc353d	[enh] oscar theme redesign added ... The original code made by @logico-dev (#559)	8 years ago
Adam Tauber	237d251d14	[fix] save unknown preferences parameters to cookies ... Without this courgette color selector can not work	8 years ago
Adam Tauber	5dd2340bc6	[fix] gigablast redirect - closes #575	8 years ago
Adam Tauber	71d57df9d5	[fix] geektimes xpath - #575	8 years ago
Noemi Vanyi	d43d9727a3	[enh] add server_settings call - closes #566	8 years ago
Noemi Vanyi	465fcfb9bd	add archive.is xpath engine	8 years ago
Adam Tauber	27218b85fa	[fix] missing import	8 years ago
Adam Tauber	2caf0d4c9a	[enh] version 0.9.0 - #529	8 years ago
Adam Tauber	bd361e60d8	Revert "use ngettext for plurals"	8 years ago
Adam Tauber	ebc0bcb612	Merge pull request #551 from mikhirev/master ... use ngettext for plurals	8 years ago
Adam Tauber	bf1eebb17f	Merge pull request #549 from guyou/feature-pool-fine-tuning ... Use new settings to fine tune the connection pool	8 years ago
Dmitry Mikhirev	242c9ba756	3 plural forms in Russian	8 years ago
YuLun Shih	7364455d1f	Fix 'set' object does not support indexing	8 years ago
Maxqia	56e53c9297	[fix] currency_convert: make unit tests pass ... also make regex more efficent and normalize 's'es	8 years ago
Guilhem Bonnefille	d571a9d204	Preset new values with defaulting values from code	8 years ago
Guilhem Bonnefille	3f395304f9	Fix pep8	8 years ago
Dmitry Mikhirev	921720563c	update .po files	8 years ago
Dmitry Mikhirev	6d1d8a8f8d	use ngettext	8 years ago
Maxqia	fe2ce83e41	[enh] currency_convert: allow strings like google's "convert 1 euro to dollars"	8 years ago
Guilhem Bonnefille	f18a3a77ef	Use new settings to fine tune the connection pool ... In some circumstances, it is necessary to increase size of pool.	8 years ago
Kirill Isakov	c12e41a80f	Fix result selection for top & bottom scrolling	9 years ago
Kirill Isakov	7b48a66350	Add auto page scrolling to selected result	9 years ago
Kirill Isakov	0d6625e070	Add search result navigation support	9 years ago
Kirill Isakov	1faf1b645b	Set vim-hotkeys help panels to same height	9 years ago
Kirill Isakov	3246541bdc	[WIP] Add vim-hotkeys plugin	9 years ago
Thomas Pointhuber	1833a8b1b8	[fix] use old system if there is no img_src	9 years ago
Thomas Pointhuber	63d68c8e0f	[enh] add img_src to default result template	9 years ago
a01200356	a44faa7716	[fix] compile regex in ddg_definitions	9 years ago
a01200356	6dca14e95d	[enh] multilingual duckduckgo_definitions	9 years ago
a01200356	8d335dbdae	[enh] wikipedia infobox ... creates simple multilingual infobox using wikipedia's api	9 years ago
Kirill Isakov	4eeb5fb76b	[fix] incorrect URLs in Reddit results - closes #538	9 years ago
Adam Tauber	2661c3ab21	[mod] disable nyaa anime engine by default	9 years ago
Adam Tauber	85c0351dca	Merge pull request #526 from ukwt/anime ... Add a few search engines	9 years ago
Kirill Isakov	90c51cb449	Fix a few typos in Google search engine	9 years ago
Kirill Isakov	d54e82dfb9	Revert to using random UA in Reddit search engine	9 years ago
Adam Tauber	5544fdb756	Merge pull request #531 from guyou/add-doku-engine ... Add doku engine	9 years ago
Adam Tauber	11c2262055	Merge pull request #536 from kvch/general-minor-refactors ... General minor refactors	9 years ago
Adam Tauber	d27f7a1b07	[fix] clear image link if javascript enabled - closes #535	9 years ago
Guilhem Bonnefille	51cb832601	Comment out ubuntu-fr as it is not a general search engine	9 years ago
Noemi Vanyi	adb1169fa3	add description to a var that seems to be unused	9 years ago
Noemi Vanyi	7daf98933d	follow up blocked_engines renaming in templates	9 years ago
Noemi Vanyi	5867e97966	more follow ups in new preferences	9 years ago
Noemi Vanyi	8c4db08443	rename blocked engines to diabled engines	9 years ago
Noemi Vanyi	006841c4ff	minor grammar fix in error message	9 years ago
Noemi Vanyi	1805cfd20a	sort languages properly	9 years ago
Adam Tauber	bb6dae1e42	[fix] user data check	9 years ago
Noemi Vanyi	fe691a0988	new preferences handling ... Preferences class was introduced in order to handle user preferences. Right now it parses cookies and the form in preferences. Also it can retrieve settings based on the name of the setting. ATTENTION Please note that engine preferences are handled differently from now on. So it introduces incompatible changes. Every user who has saved preferences should reset and save his/her settings again. This change was needed, because everytime a default disabled engine was added saved user preferences would broke. Now engine setting tracking is fixed.	9 years ago
Adam Tauber	9331fc28a8	[fix] broken google images parsing	9 years ago
Guilhem Bonnefille	2733a92383	Fix query encoding	9 years ago
Guilhem Bonnefille	f26f0dab2e	Fix pep8 E302 ... Cf. http://legacy.python.org/dev/peps/pep-0008/#blank-lines	9 years ago
Guilhem Bonnefille	f2d1a530fb	Add ubuntu-fr wiki with new doku engine	9 years ago
Guilhem Bonnefille	cf09b500f3	Add support for dokuwiki engine	9 years ago
Adam Tauber	5cbe4c5332	[fix] try to decode url - closes #527	9 years ago
Kirill Isakov	d0001f10e6	Add searx user agent to Reddit engine request to comply with API usage terms	9 years ago
Adam Tauber	fff9460238	Merge pull request #522 from jibe-b/master ... add BASE engine in category "Science"	9 years ago
a01200356	94cb3a7f11	[enh] multilingual autocomplete ... implemented for wikipedia, qwant and google	9 years ago
jibe-b	0b90cd42e2	minor update	9 years ago
jibe-b	092e15cc1d	[enh] Add BASE engine in category Science. Basic and advanced search.	9 years ago
Kirill Isakov	0bfbdff234	Add Habrahabr & Geektimes search engines	9 years ago
Kirill Isakov	5b3c9f06eb	Add BitBucket & GitLab search engines	9 years ago
Kirill Isakov	bacc9a3df1	Add paging support to XPath & Erowid engines	9 years ago
Kirill Isakov	e202c6fbec	Fix PEP8 warnings for Nyaa.py	9 years ago
Kirill Isakov	a8832574fa	Shorten content field for very long Reddit search results	9 years ago
Kirill Isakov	80813c3e05	Add Erowid search engine	9 years ago
Kirill Isakov	c1d456b136	Add F-Droid search engine	9 years ago
Kirill Isakov	547b8a8765	Add Tokyo Toshokan search engine	9 years ago
Adam Tauber	71de593a5b	[fix] bing images page change	9 years ago
Kirill Isakov	7fbc12ee4e	Add Torrentz.eu search engine	9 years ago
Adam Tauber	6d55642ab4	[fix] no more redirect ++ explicitly specify search language to avoid googles ip based heuristics	9 years ago
Kirill Isakov	d026a97e42	Add Reddit search engine	9 years ago
Kirill Isakov	8b7dc2acb9	Remove content field from ArchWiki results; reformat code in archlinux.py ... Content field in Arch Wiki search results is of no real use, more often than not it contains no usable information and includes too many markup tags which make the text unreadable. It is safe to remove it.	9 years ago
Kirill Isakov	e5677ae6b6	Add Nyaa.se search engine	9 years ago
Kirill Isakov	d748b8419a	Add Arch Linux Wiki search engine	9 years ago
a01200356	751c9a346e	[fix] duckduckgo's xpaths changed ... test_duckduckgo modified to reflect changes in duckduckgo's html	9 years ago
Adam Tauber	0f518e489e	[fix] csv results filename encoding	9 years ago
Adam Tauber	e893d94185	[fix] docs url mod to prevent http redirect	9 years ago
Adam Tauber	6130f9a59f	Merge pull request #473 from GreenLunar/patch-2 ... Update link to documentation page	9 years ago
Adam Tauber	667f7fde39	Merge pull request #516 from pointhi/translation-fix ... Translation fix	9 years ago
Thomas Pointhuber	9a94b36593	[fix] translate plugin name and description in template	9 years ago
Thomas Pointhuber	b8d1081756	[enh] reorder locales by alphabet, add english lanuage name in brackets	9 years ago
Thomas Pointhuber	2a1ddede5d	[enh] update translation and add new languages ... add new languages: * bg * el_GR * eo * pt_BR	9 years ago
Alexandre Flament	6ab91515df	[enh] autocompletion : add qwant	9 years ago
Adam Tauber	bc81eda64b	[fix] opensearch image issue - closes #507	9 years ago
a01200356	8f3b33de23	[fix] remove unnecesary async calls in wolframalpha_noapi ... setting async to false in the request did the job, lol.	9 years ago
a01200356	4cea71e3bb	[fix] merge with 79705450df	9 years ago
a01200356	4d8996eb4d	[enh] unit tests for wolframalpha	9 years ago
a01200356	4267b11a45	[fix] apply changes in infobox's styles ... changes were made for wolframalpha infobox: - wrap text inside infobox. for example, there's a hill in New Zealand called Taumatawhakatangihangakoauauotamateapokaiwhenuakitanatahu (don't blame me, blame the Kiwis) and now it doesn't break the infobox. - add an optional image field for infobox's attributes. (doesn't affect ddg infobox at all) - table is now always split in half. needed so that images stay inside infobox. (max-width doesn't work for inline elements, it's the table that has to set the width. if you don't like how the table width looks now in ddg/wiki's infobox, i can change that code so that the style only applies when using wolframalpha.	9 years ago
a01200356	78d3f3d6b1	[enh] infobox for wolframalpha ... TODO: - infobox styles - unit tests ISSUES: - no_api version needs to re-call server for additional pods, such as plots. therefore, it's even slower than before. comment out the part that calls get_async_pod if requests reach timeout or increase timeout in settings.yml.	9 years ago
Adam Tauber	45b5073f3e	[fix] pep8	9 years ago
Adam Tauber	472a409022	[fix] robot tests	9 years ago
Adam Tauber	0fbd705259	[enh] settings option to change instance name - closes #450	9 years ago
Luc Didry	fea2c5a713	Fix results with no scheme ... Related to #428, which was fixed in e3df22b but broken in a refactoring (b6c3cb0)	9 years ago
Adam Tauber	79705450df	[fix] wolframalpha unicode inputs	9 years ago
Adam Tauber	10947536aa	[enh] suspend engines after error ... The duration is based on the number of continuous errors, but maximized in one minute	9 years ago
Adam Tauber	17b0c9f74a	[mod] engine load refactor	9 years ago
Adam Tauber	db72fc6449	[fix] encapsulate wolframalpha token fetching errors	9 years ago
Adam Tauber	d06178139f	[fix] wolframalpha page changes ... related issues: #508 #509	9 years ago
Adam Tauber	4e5af8d87b	[mod] move plugin static files to static/plugins	9 years ago
Adam Tauber	ab6a7601cb	[enh] new plugin to open results on new browser tabs	9 years ago