retoor/searxng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,031 Commits 6 Branches 17 Tags
ec453e0239dcaa6edefe7f50567f2da2eec77b5d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Heiser ec453e0239 [fix] docker 'Error compiling' and 'SyntaxError' messages 
The make docker target spits out some SyntaxError.  With this .dockerignore
there is no more error. Explanation:

- the python files are compiled while building the docker image
- a node modules contains some python files
- the python files inside the node module doesn't compile

It raises the fact that node_modules were included in the docker image which
should not happen.  Same the local directory was included.  Dockerfile builds
searx in its own way (without virtualenv)

Thanks @dalf:

- https://github.com/asciimoo/searx/pull/1900#issuecomment-604892737

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-03-29 11:06:22 +02:00
Markus Heiser d7523071a0 travis: use build environment from Makefile 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-03-26 19:14:07 +01:00
Markus Heiser 1075f58a72 test: move tests from manage.sh to Makefile 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-03-26 18:41:45 +01:00
Markus Heiser e7fbefa8bd build: move build styles from manage.sh to Makefile 
To build all styles use:

  make styles

To build individual styles use one of:

  make style.legacy
  make style.courgette
  make style.pixart
  make style.bootstrap

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-03-26 18:00:07 +01:00
Markus Heiser 6846402d73 .gitignore: make package-lock.json visible 
Even if we do not versioning them right now.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-03-26 15:35:32 +01:00
Markus Heiser 9717521981 Minor improvements of the HTML *about* page 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-03-26 13:45:37 +01:00
Markus Heiser 809e6f7933 make project: re-build generic files of the searx project 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-03-26 13:35:17 +01:00
Markus Heiser 00251d7c66 Makefile: add target 'useragents.update' to fetch versions of Firefox 
Update searx/data/useragents.json with the most recent versions of Firefox.

BTW: add 'useragents.update' to 'project' target and clean up the Makefile and
remove it from the manage.sh script.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>

closes: https://github.com/asciimoo/searx/issues/1882
 2020-03-26 13:32:08 +01:00
Markus Heiser 5d087ee466 Rewrite of the HTL *about* page 
The *about* page should only address higher-level issues that are important to
each user.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-03-26 13:09:29 +01:00
Markus Heiser 3486613a19 brands: hardcode ISSUE_URL and some links on the about-page 
A *brand* of searx is a fork which might have its own design and some special
functions which might bee reasonable in a special context.

In this sense, the fork might have its own documentation but not its own issue
tracker.  The *upstream* of a brand is always https://github.com/asciimoo from
where the brand-fork pulls the master branch regularly.  A fork which has its
own issue tracker is a spin-off and out of the scope of the searx project
itself.  The conclusion is:

- hard code ISSUE_URL (in the Makefile)
- always refer to DOCS_URL
- links in the about page refer to the *upstream* (searx project)
  except DOCS_URL
- "fork me on github" ribbons refer to the *upstream*

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-03-26 10:58:25 +01:00
Markus Heiser 3381471933 brands: add ISSUE_URL 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-03-25 17:48:34 +01:00
Markus Heiser 4d64828237 webapp.py: expose the brand variable in the /config URL. 
E.g. helpful for searx-stats2

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-03-25 17:28:32 +01:00
Markus Heiser ace7d30aed webapp.py: partial code review (no functional change) 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-03-25 17:12:02 +01:00
Markus Heiser d471ec86dd Makefile: add target node.env - download & install npm dependencies 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-03-25 16:38:52 +01:00
Markus Heiser 2d12f221a7 [fix] docker build: set build argument LABEL_VCS_URL to GIT_URL 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-03-25 15:17:11 +01:00
Markus Heiser 3dbade0aed [fix] brands: add GIT_URL variable to the docker build 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-03-25 14:50:39 +01:00
Markus Heiser 757ebb5d9f [fix] brands: add variables from build env to grunt process 
We have some variables in the build environment which are also needed in the
grunt process when building themes.  Theses variables are relavant if one
creates a fork with its own branding.  We treat these variables under the term
'brands'.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-03-25 14:09:47 +01:00
Markus Heiser aaf22baad2 make project: re-build generic files of the searx project 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-03-25 12:14:21 +01:00
Markus Heiser f6b29f68a1 [fix] brands: add variables from build env to setup.py 
We have some variables in the build environment which are also needed in the
setup.py process.  Theses variables are relavant if one creates a fork with
its own branding.  We treat these variables under the term 'brands'.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-03-25 12:03:11 +01:00
Markus Heiser e84fc94300 [fix] brands: add variables from build env to sphinx-doc 
We have some variables in the build environment which are also needed in the
sphinx-process.  Theses variables are relavant if one creates a fork with
its own branding.  We treat these variables under the term 'brands'.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-03-25 11:51:03 +01:00
Markus Heiser 04c687403e [fix] brands: add variables from build env to jinja templating 
We have some variables in the build environment which are also needed in the
templating process.  Theses variables are relavant if one creates a fork with
its own branding.  We treat these variables under the term 'brands'.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-03-25 11:49:33 +01:00
Markus Heiser a5d3585a0c Merge pull request #1866 from return42/fix-news 
bugfix: google-news and bing-news has changed the language parameter
 2020-03-04 11:00:30 +00:00
Markus Heiser ad7a6e6e10 bugfix(!biv) : bing-video do not like "older" User-Agents 
When selecting other languages than 'en', bing-video did not handle the language
correct and gave very bad results.  Since User-Agent is normaly rotated in
searx, the behavior of a !biv search was unpredictable and paging was broken.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-03-01 17:28:59 +01:00
Markus Heiser 1c853f9573 bing_news: parital rollback of c89c05bc 
The bing_news bug (discussed in #1838) was caused by wrong language tags, which
was fixed e0c99d9d / no need to change the bing_news search string.

closes: https://github.com/asciimoo/searx/issues/1838

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-03-01 11:07:59 +01:00
Markus Heiser 79412828cd update languages: engines_languages.json languages.py 
build by Makefile target:

    make project

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-03-01 08:06:51 +01:00
Markus Heiser e0c99d9dcb bugfix: fetch_supported_languages bing, -news, -videos, -images 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-03-01 08:01:36 +01:00
Markus Heiser 40843fe95a searx/data/engines_languages.json: sort json file (no content change) 
To get meaningfull diffs, the json file has to be sorted.  Before applying any
further content patch, the json file needs a inital sort (without changing any
content).

Sorted by::

  import sys, json

  with open('engines_languages.json') as f:
      j = json.load(f)

  with open('engines_languages.json', 'w') as f:
      json.dump(j, f, indent=2, sort_keys=True)

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-03-01 07:56:46 +01:00
Markus Heiser 2f6f9665a9 requirements-dev.txt: add missing pylint for liniting tests 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-02-29 17:01:11 +01:00
Markus Heiser c89c05bceb bugfix: google-news and bing-news has changed the language parameter 
closes: https://github.com/asciimoo/searx/issues/1838

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-02-25 18:44:28 +01:00
Markus Heiser 6a3ef5561b Merge pull request #1861 from return42/fix-prefs 
fix serious bugs of the test procedure
 2020-02-25 08:56:34 +01:00
Markus Heiser 8685d1b7d8 Merge branch 'master' into fix-prefs 2020-02-24 08:16:42 +01:00
Markus Heiser 700574357a make test: bugfix, pyenvinstall is a prerequisite for the pylint test 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-02-24 08:14:09 +01:00
Markus Heiser 692c331b30 Merge pull request #1863 from MarcAbonce/monkey-patch-occitan-locale 
Monkey patch babel get_translations to support Occitan
 2020-02-24 08:08:16 +01:00
Markus Heiser aa95a0d70b searx/testing.py: fixed pep8 error 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-02-24 07:55:14 +01:00
Markus Heiser 81f106e5de searx/testing.py: bugfix process model (do not use Flask's debug mode) 
Don't enable Flask's debug mode, the debugger from Flask will cause a wired
process model, where the server never dies.  Further read:

- debug mode: https://flask.palletsprojects.com/quickstart/#debug-mode
- Flask.run(..): https://flask.palletsprojects.com/api/#flask.Flask.run

closes: https://github.com/asciimoo/searx/issues/1862

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-02-23 23:03:05 +01:00
Markus Heiser 4a94b4cca6 searx/testing.py: pylint & SPDX tag (no functional change) 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-02-23 22:51:07 +01:00
Markus Heiser 1cae4fa88d preferences.py: implement defaults if unset 
Implemnts defaults for:

- search.default_lang, search.autocomplete, search.safe_search,
- ui.default_theme, ui.default_locale
- server.image_proxy

This fixes also:

  https://github.com/asciimoo/searx/pull/1860#issuecomment-590082955

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-02-23 20:56:05 +01:00
Markus Heiser 179be12732 preferences.py: pylint, SPDX tag & docstrings (no functional change) 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-02-23 20:52:00 +01:00
Markus Heiser 09f4e2cd31 Merge pull request #1846 from piplongrun/autocomplete_swisscows 
Add Swisscows autocomplete option
 2020-02-23 14:54:10 +00:00
Markus Heiser f272781ab7 Merge branch 'master' into autocomplete_swisscows 2020-02-23 14:43:33 +00:00
Markus Heiser 57efb45ce5 Merge pull request #1773 from Monogramm/docker/opencontainers 
đź“ť Add Opencontainers labels in docker image
 2020-02-23 14:43:14 +00:00
Markus Heiser b7105da2af Add missing autocomplete backends to settings.yml comment 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-02-23 15:41:08 +01:00
Markus Heiser 78c5216d76 Merge branch 'master' into autocomplete_swisscows 2020-02-23 14:24:42 +00:00
Markus Heiser 55aa7f96c1 Merge branch 'master' into docker/opencontainers 2020-02-23 11:55:20 +00:00
Markus Heiser 8c26097757 Merge pull request #1842 from piplongrun/engine-etools 
Add new eTools.ch engine
 2020-02-23 11:52:29 +00:00
Markus Heiser 98322ac15c Merge branch 'master' into engine-etools 2020-02-23 11:47:49 +00:00
Markus Heiser 90d23e7ef6 Merge pull request #1860 from MarcAbonce/fix-default-locale 
Fix default locale and language issues
 2020-02-23 11:39:04 +00:00
Markus Heiser 2ade2ce10a Merge pull request #1855 from return42/fix-dead-links 
docs: fix dead Searx-instance links to https://searx.space
 2020-02-20 18:31:05 +00:00
Markus Heiser a9d184473f docs: fix dead Searx-instance links to https://searx.space 
Related to #1853 / BTW update year of copyright note

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-02-20 18:11:34 +01:00
Markus Heiser ab2f56e886 Merge pull request #1843 from dalf/searx_space 
[mod] move public instance list to https://searx.space
 2020-02-15 09:06:37 +00:00
Markus Heiser 7f224713e5 Merge pull request #1621 from nfk/locale 
Fix regional settings #844
 2020-02-08 14:54:22 +00:00
Markus Heiser 7c79eb9b1b Merge commit 'refs/pull/1621/head' of https://github.com/asciimoo/searx 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-02-08 15:08:33 +01:00
Markus Heiser 50b070c5d3 Merge pull request #1835 from dalf/uwsgi_fix 
[fix] Disable HTTP keep alive
 2020-02-08 12:52:22 +00:00
Markus Heiser 3f127b6c95 Merge branch 'master' into uwsgi_fix 2020-02-08 12:47:56 +00:00
Markus Heiser 3062e2adf9 Merge pull request #1823 from kvch/make-engines-private 
Thanks! .. excellent work, I see you on #1836 :)
 2020-02-08 12:04:42 +00:00
Markus Heiser 54675c7690 Merge pull request #1766 from dalf/fix-infinite-scroll 
[mod] infinite scroll: XHR requests are sent with the header "Accept: text/html"
 2020-01-28 11:04:02 +00:00
Markus Heiser e64ff38217 Merge branch 'master' into fix-infinite-scroll 2020-01-28 10:59:03 +00:00
Markus Heiser bda1895655 Merge pull request #1804 from unixfox/patch-1 
searx.be stopped using Fathom analytics
 2020-01-12 11:25:47 +00:00
Markus Heiser 22d05b3e59 Merge pull request #1791 from return42/add-docs 
misc docs
 2020-01-06 14:28:24 +00:00
Markus Heiser 86b5163641 docs: move wiki/Searx-instances from wiki to docs 
fix project link in conf.py

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-01-06 15:06:36 +01:00
Markus Heiser f521a279ac Merge branch 'master' of https://github.com/asciimoo/searx into add-docs 2020-01-06 14:32:34 +01:00
Markus Heiser 0f4f0e517e docs(user): move wiki/Searx-instances from wiki to docs 
fixed some reST markups

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-01-06 14:31:18 +01:00
Markus Heiser a3bbf95ad5 Merge pull request #1781 from finn0/bug/oscar-theme 
Oscar: move info box at top of the page
 2020-01-06 08:16:22 +00:00
Markus Heiser 1d86d0054f Merge branch 'master' into bug/oscar-theme 2020-01-06 08:05:29 +00:00
Markus Heiser 3bb97fcb84 docs(user): public instances, fix Searxes@Danwin entry 
fixes: https://github.com/asciimoo/searx/issues/1770

This is not Searx at all. This is Meta-Searx with other engines.

See https://github.com/asciimoo/searx/issues/1770#issuecomment-570776655

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-01-05 10:02:42 +01:00
Markus Heiser 200c3a31f5 docs(user): move wiki/Searx-instances from wiki to docs (WIP) 
Move wiki entry https://github.com/asciimoo/searx/wiki/Searx-instances
into user section of the docs (#1785).

links has been ported from markdown to reST by::

      regexpr:        \[([^\]]*)\]\(([^)]*)\)
      substitution:  `\1 <\2>`__

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-01-04 18:26:04 +01:00
Markus Heiser 7347d9b508 docs(user): move wiki/Searx-instances from wiki to docs 
Move wiki entry https://github.com/asciimoo/searx/wiki/Searx-instances
into user section of the docs (#1785).

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-01-04 17:09:11 +01:00
Markus Heiser 51b9295b84 Merge branch 'master' of https://github.com/asciimoo/searx into add-docs 2020-01-03 14:30:53 +01:00
Markus Heiser 2a7855854b Merge pull request #1623 from ypid/fix/nginx-subdir-hosting 
Fix Nginx subdir URL install docs which allowed download of settings.yml
 2019-12-31 16:26:21 +01:00
Markus Heiser f602cb8e4d docs(admin): moved settings description from wiki to docs 
Move wiki entry https://github.com/asciimoo/searx/wiki/settings.yml
into admin section of the docs (#1785).

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2019-12-30 21:56:09 +01:00
Markus Heiser f9be534b2a docs(dev): fix minor markup typos 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2019-12-30 21:55:15 +01:00
Markus Heiser 10997a01e0 docs(admin): add weight & disabled cols to engine table 
BTW: remove internal suspend_end_time

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2019-12-30 20:29:37 +01:00
Markus Heiser 754a10c1c1 Merge pull request #1661 from 0xhtml/fix-engine-spotify 
Fix engine spotify

As you can read here https://developer.spotify.com/documentation/web-api/#authentication all requests to the spotify api require authentication. You can not test the api without credentials.
 2019-12-30 07:44:31 +01:00
Markus Heiser 36e72a4619 Merge branch 'master' into fix-engine-spotify 2019-12-29 09:47:06 +01:00
Markus Heiser f6d66c0f6f Merge pull request #1776 from return42/makefile-doc 
doc: describe Makefile targets & add reST primer
 2019-12-28 13:55:20 +01:00
Markus Heiser b91e07bbf1 docs(css): render HTML rst-example slightly more discreet 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2019-12-28 01:26:24 +01:00
Markus Heiser d1892b2112 docs(admin): add article 'Buildhosts' with system requirements 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2019-12-28 01:25:16 +01:00
Markus Heiser d6f2802e4b docs(dev): add more markups to reST primer 
- Literal blocks
- Unicode substitution
- Horizontal list
- Math equations

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2019-12-28 01:01:11 +01:00
Markus Heiser 92afe68d65 doc(dev): reST/sphinx add tabbed views extension (sphinx_tabs.tabs) 
See issue #1785:

  idea: in the doc, provide installation instructions with one tab per
  distrubution

preview (don't bookmark):

  https://return42.github.io/searx/dev/reST.html#tabbed-views

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2019-12-26 10:26:12 +01:00
Markus Heiser 62505f8982 docs(dev): add refs to to gitmoji and Semantic PR in contrib section 
preview (don't bookmark):

  https://return42.github.io/searx/dev/contribution_guide.html#code

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2019-12-25 09:57:21 +01:00
Markus Heiser 4ca8b69c81 doc(dev): add remarks about creating good commits (messages) 
preview (don't bookmark):

  https://return42.github.io/searx/dev/contribution_guide.html#code

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2019-12-24 18:48:23 +01:00
Markus Heiser 5eb8cf4ebb Merge branch 'master' of https://github.com/asciimoo/searx into makefile-doc 2019-12-24 18:00:24 +01:00
Markus Heiser a52a638ba8 Merge pull request #1701 from CaffeinatedTech/patch-1 
Update README.rst

for the future: please select meaningful commit messages. Here is a good summarize how a useful commit messages looks like: https://www.conventionalcommits.org/en/v1.0.0-beta.2/#summary

Further read: https://wiki.openstack.org/wiki/GitCommitMessages#Information_in_commit_messages
 2019-12-24 17:56:24 +01:00
Markus Heiser ecb054a7a0 Merge branch 'master' into patch-1 2019-12-24 17:45:13 +01:00
Markus Heiser 5a0a66e9bc Merge pull request #1615 from Nachtalb/ne/fix-infinite_scroll-with-vim_bindings 
Fix not jumping to results loaded by infinite scroll
 2019-12-24 17:34:33 +01:00
Markus Heiser 38dad2e8e3 Merge branch 'master' into ne/fix-infinite_scroll-with-vim_bindings 2019-12-24 15:42:05 +01:00
Markus Heiser a395fb4a8d Merge pull request #1694 from finn0/libgen 
Fix broken Library Gensis Engine
 2019-12-24 13:37:29 +01:00
Markus Heiser fb668e2075 Merge branch 'master' into libgen 2019-12-24 13:33:07 +01:00
Markus Heiser 46dd51afad Merge branch 'master' into makefile-doc 2019-12-24 12:27:36 +01:00
Markus Heiser 6d232e9b69 Merge pull request #1787 from finn0/fix/infobox 
[Fix] oscar: no HTML escaping prior to output
 2019-12-24 11:37:33 +01:00
Markus Heiser 70f7142824 Merge branch 'master' into bug/oscar-theme 2019-12-23 18:47:23 +01:00
Markus Heiser 07c8ca87e6 Merge branch 'master' into makefile-doc 2019-12-23 13:58:53 +00:00
Markus Heiser 3e14bf4d27 Merge pull request #1686 from MarcAbonce/wiki_infobox_fixes 
Infobox fixes
 2019-12-23 12:31:31 +00:00
Markus Heiser c8645d6e37 doc: reST-primer -- imrpove desription of definition lists 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2019-12-23 09:37:51 +01:00
Markus Heiser d3e4e81faf makefile.sphinx: fix gh-pages / pull before add commits 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2019-12-22 23:28:07 +01:00
Markus Heiser 90174e215c doc: add plugin section to admin section (template) 
- Plugins configured at built time (defaults)

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2019-12-22 23:26:06 +01:00
Markus Heiser 31db843c9c doc: CSS - fix alignment of code block in figure blocks 
BTW: minor profread of reST.rst

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2019-12-22 14:08:57 +01:00
Markus Heiser aa3b0265e7 doc: add 'Architecture' article to admin section 
Herein we add some hints and suggestions about typical architectures of
searx infrastructures.  We start with a contribution from @dalf

- https://github.com/asciimoo/searx/pull/1776#issuecomment-567917320

thanks @dalf !!

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2019-12-22 14:05:33 +01:00
Markus Heiser 5bdca1a5bf doc: improved HTML table layout (CSS) 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2019-12-22 11:46:03 +01:00
Markus Heiser aea4667fbc Merge branch 'master' of https://github.com/asciimoo/searx into makefile-doc 2019-12-22 10:12:33 +01:00