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
299a80a1eb
[enh] using the logger
2015-01-09 04:13:05 +01:00
Adam Tauber
798bef77f9
[fix] static content paths
2015-01-01 19:24:47 +01:00
Adam Tauber
2f9a386c0d
[enh] better result template handling
2015-01-01 18:59:53 +01:00
Adam Tauber
9f12605f7e
[enh] themes static content refactor
2015-01-01 17:48:12 +01:00
Thomas Pointhuber
a0293d6196
[enh] move favicons into own directory
2014-12-28 15:07:11 +01:00
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
Thomas Pointhuber
af8dac93a8
[enh] fix pep8, improve syntax highlighting
2014-12-22 16:26:45 +01:00
Thomas Pointhuber
7adb17452d
[enh] add result_templates/code.html
2014-12-20 23:33:03 +01:00
Adam Tauber
f141773814
[mod][fix] https rewrite refactor ++ fixes
2014-12-19 22:40:37 +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
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
Cqoicebordel
e71b665fd5
Load the list of icons only once
2014-12-13 21:37:28 +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
Adam Tauber
41aca9a068
[fix] autocomplete x-suggestion
2014-12-09 00:57:04 +01:00
Cqoicebordel
c2e88339f7
Add pubdate
...
Add pubdate with a good format, against publishedDate.
2014-12-08 00:51:46 +01:00
Adam Tauber
d959cb1c05
[enh] gevent/grequests changed to the built-in threading lib
2014-12-05 19:24:11 +01:00
Adam Tauber
cfdfca0d41
[fix] whitespace remove
2014-11-18 19:55:39 +01:00
Thomas Pointhuber
aba65369d2
[enh] make version of searx readable
2014-11-18 11:37:42 +01:00
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
Adam Tauber
5740cfbf1c
[fix] pep8 part II.
2014-10-19 12:41:04 +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
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
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
Adam Tauber
4da795895d
[fix] default template handling
2014-10-09 19:26:02 +02:00
Thomas Pointhuber
517e57b996
oscar template: improve result icons
2014-10-05 14:40:47 +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
dalf
829c758970
Merge remote-tracking branch 'upstream/master'
2014-10-01 22:25:11 +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
Adam Tauber
c23db1b2bf
[enh] more flexible category selection
2014-09-06 15:21: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
Adam Tauber
11f5684b9f
[fix] unused globals removed II.
2014-07-09 01:23:18 +02:00
Adam Tauber
b0ba367a1a
[enh][mod] search refactor
2014-07-07 13:59:27 +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
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
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
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
41dd4d9ba3
[enh] autocompleter server side part
2014-03-29 16:29:19 +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
