Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac8759cd authored by Kang-min Liu's avatar Kang-min Liu
Browse files

Merge remote-tracking branch 'origin/master'

parents c7c6c35c e98aef6f

.travis.yml

+6 −0
Original line number Diff line number Diff line 
sudo: false

cache:

  - pip

  - npm

  - directories:

    - $HOME/.cache/pip

language: python

python:

  - "2.7"

AUTHORS.rst

+4 −0
Original line number Diff line number Diff line
@@ -34,3 +34,7 @@ generally made searx better: 
- @opi

- @dimqua

- Giorgos Logiotatidis

- Luc Didry

- Niklas Haas

- @underr

- Emmanuel Benazera

CHANGELOG.rst

+46 −0
Original line number Diff line number Diff line 
0.8.0 2015.09.08

================



- New engines



  - Blekko (image)

  - Gigablast (general)

  - Spotify (music)

  - Swisscows (general, images)

  - Qwant (general, images, news, social media)

- Plugin system

- New plugins



  - HTTPS rewrite

  - Search on cagetory select

  - User information

  - Tracker url part remover

- Multiple outgoing IP and HTTP/HTTPS proxy support

- New autocompleter: startpage

- New theme: pix-art

- Settings file structure change

- Fabfile, docker deployment

- Optional safesearch result filter

- Force HTTPS in engines if possible

- Disabled HTTP referrer on outgoing links

- Display cookie information

- Prettier search URLs

- Right-to-left text handling in themes

- Translation updates (New locales: Chinese, Hebrew, Portuguese, Romanian)





New dependencies

~~~~~~~~~~~~~~~~



- pyopenssl

- ndg-httpsclient

- pyasn1

- pyasn1-modules

- certifi





News

~~~~



@dalf joined the maintainer "team"



0.7.0 2015.02.03

================

README.rst

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ remember 'untested code is broken code'. 
Runs robot (Selenium) tests, you must have ``firefox`` installed because

this functional tests actually run the browser and perform operations on

it. Also searx is executed with

`settings\_robot <https://github.com/asciimoo/searx/blob/master/searx/settings_robot.py>`__.

`settings\_robot <https://github.com/asciimoo/searx/blob/master/searx/settings_robot.yml>`__.



``make flake8``

'''''''''''''''

searx/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ else: 
with open(settings_path) as settings_yaml:

    settings = load(settings_yaml)



if settings.get('server', {}).get('debug'):

if settings.get('general', {}).get('debug'):

    logging.basicConfig(level=logging.DEBUG)

else:

    logging.basicConfig(level=logging.WARNING)