9740618 · searx · git.iko.soy

CHANGELOG.rst+6−6

compare with master

unifiedsplit

@@ -13,12 +13,12 @@

13 - Wikivoyage

14 - Rubygems

15 - Engine fixes (google, google images, startpage, gigablast, yacy)

16− - Private engines introduced - more details: https://asciimoo.github.io/searx/blog/private-engines.html

16+ - Private engines introduced - more details: https://searx.github.io/searx/blog/private-engines.html

17− - Greatly improved documentation - check it at https://asciimoo.github.io/searx

17+ - Greatly improved documentation - check it at https://searx.github.io/searx

18 - Added autofocus to all search inputs

19 - CSP friendly oscar theme

20 - Added option to hide engine errors with `display_error_messages` engine option (true/false values, default is true)

21− - Tons of accessibility fixes - see https://github.com/asciimoo/searx/issues/350 for details

21+ - Tons of accessibility fixes - see https://github.com/searx/searx/issues/350 for details

22 - More flexible branding options: configurable vcs/issue tracker links

23 - Added "disable all" & "allow all" options to preferences engine select

24 - Autocomplete keyboard navigation fixes

@@ -142,8 +142,8 @@ News

142

143- Bug fixes

144

145− - https://github.com/asciimoo/searx/issues/1088

145+ - https://github.com/searx/searx/issues/1088

146− - https://github.com/asciimoo/searx/issues/1089

146+ - https://github.com/searx/searx/issues/1089

147

148- Dependency updates

149

@@ -312,7 +312,7 @@ News

312News

313~~~~

314

315−New documentation page is available: https://asciimoo.github.io/searx

315+New documentation page is available: https://searx.github.io/searx

316

317

3180.8.0 2015.09.08

CONTRIBUTING.md+2−2

@@ -2,8 +2,8 @@

2

3## Resources in the documentation

4

5−* [Development quickstart](http://asciimoo.github.io/searx/dev/contribution_guide.html)

5+* [Development quickstart](http://searx.github.io/searx/dev/contribution_guide.html)

6−* [Contribution guide](http://asciimoo.github.io/searx/dev/contribution_guide.html)

6+* [Contribution guide](http://searx.github.io/searx/dev/contribution_guide.html)

7

8## Submitting PRs

9

Makefile+4−4

@@ -2,10 +2,10 @@

2.DEFAULT_GOAL=help

3

4# START Makefile setup

5−export GIT_URL=https://github.com/asciimoo/searx

5+export GIT_URL=https://github.com/searx/searx

6export GIT_BRANCH=master

7export SEARX_URL=https://searx.me

8−export DOCS_URL=https://asciimoo.github.io/searx

8+export DOCS_URL=https://searx.github.io/searx

9# END Makefile setup

10

11include utils/makefile.include

@@ -121,14 +121,14 @@ buildenv:

121 $(Q)echo "build searx/brand.py"

122 $(Q)echo "GIT_URL = '$(GIT_URL)'" > searx/brand.py

123 $(Q)echo "GIT_BRANCH = '$(GIT_BRANCH)'" >> searx/brand.py

124− $(Q)echo "ISSUE_URL = 'https://github.com/asciimoo/searx/issues'" >> searx/brand.py

124+ $(Q)echo "ISSUE_URL = 'https://github.com/searx/searx/issues'" >> searx/brand.py

125 $(Q)echo "SEARX_URL = '$(SEARX_URL)'" >> searx/brand.py

126 $(Q)echo "DOCS_URL = '$(DOCS_URL)'" >> searx/brand.py

127 $(Q)echo "PUBLIC_INSTANCES = 'https://searx.space'" >> searx/brand.py

128 $(Q)echo "build utils/brand.env"

129 $(Q)echo "export GIT_URL='$(GIT_URL)'" > utils/brand.env

130 $(Q)echo "export GIT_BRANCH='$(GIT_BRANCH)'" >> utils/brand.env

131− $(Q)echo "export ISSUE_URL='https://github.com/asciimoo/searx/issues'" >> utils/brand.env

131+ $(Q)echo "export ISSUE_URL='https://github.com/searx/searx/issues'" >> utils/brand.env

132 $(Q)echo "export SEARX_URL='$(SEARX_URL)'" >> utils/brand.env

133 $(Q)echo "export DOCS_URL='$(DOCS_URL)'" >> utils/brand.env

134 $(Q)echo "export PUBLIC_INSTANCES='https://searx.space'" >> utils/brand.env

README.rst+16−16

@@ -1,7 +1,7 @@

1.. SPDX-License-Identifier: AGPL-3.0-or-later

2

3−.. figure:: https://raw.githubusercontent.com/asciimoo/searx/master/searx/static/themes/oscar/img/logo_searx_a.png

3+.. figure:: https://raw.githubusercontent.com/searx/searx/master/searx/static/themes/oscar/img/logo_searx_a.png

4− :target: https://asciimoo.github.io/searx/

4+ :target: https://searx.github.io/searx/

5 :alt: searX

6 :width: 100%

7 :align: center

@@ -22,25 +22,25 @@ Privacy-respecting, hackable `metasearch engine`_ / *pronunciation* **səːks**.

22.. _metasearch engine: https://en.wikipedia.org/wiki/Metasearch_engine

23

24.. |searx install| image:: https://img.shields.io/badge/-install-blue

25− :target: https://asciimoo.github.io/searx/admin/installation.html

25+ :target: https://searx.github.io/searx/admin/installation.html

26

27.. |searx homepage| image:: https://img.shields.io/badge/-homepage-blue

28− :target: https://asciimoo.github.io/searx

28+ :target: https://searx.github.io/searx

29

30.. |searx wiki| image:: https://img.shields.io/badge/-wiki-blue

31− :target: https://github.com/asciimoo/searx/wiki

31+ :target: https://github.com/searx/searx/wiki

32

33.. |AGPL License| image:: https://img.shields.io/badge/license-AGPL-blue.svg

34− :target: https://github.com/asciimoo/searx/blob/master/LICENSE

34+ :target: https://github.com/searx/searx/blob/master/LICENSE

35

36−.. |Issues| image:: https://img.shields.io/github/issues/asciimoo/searx?color=yellow&label=issues

36+.. |Issues| image:: https://img.shields.io/github/issues/searx/searx?color=yellow&label=issues

37− :target: https://github.com/asciimoo/searx/issues

37+ :target: https://github.com/searx/searx/issues

38

39−.. |PR| image:: https://img.shields.io/github/issues-pr-raw/asciimoo/searx?color=yellow&label=PR

39+.. |PR| image:: https://img.shields.io/github/issues-pr-raw/searx/searx?color=yellow&label=PR

40− :target: https://github.com/asciimoo/searx/pulls

40+ :target: https://github.com/searx/searx/pulls

41

42−.. |commits| image:: https://img.shields.io/github/commit-activity/y/asciimoo/searx?color=yellow&label=commits

42+.. |commits| image:: https://img.shields.io/github/commit-activity/y/searx/searx?color=yellow&label=commits

43− :target: https://github.com/asciimoo/searx/commits/master

43+ :target: https://github.com/searx/searx/commits/master

44

45.. |OpenCollective searx backers| image:: https://opencollective.com/searx/backers/badge.svg

46 :target: https://opencollective.com/searx#backer

@@ -55,10 +55,10 @@ Otherwise jump to the user_, admin_ and developer_ handbooks you will find on

55our homepage_.

56

57.. _searx.space: https://searx.space

58−.. _user: https://asciimoo.github.io/searx/user

58+.. _user: https://searx.github.io/searx/user

59−.. _admin: https://asciimoo.github.io/searx/admin

59+.. _admin: https://searx.github.io/searx/admin

60−.. _developer: https://asciimoo.github.io/searx/dev

60+.. _developer: https://searx.github.io/searx/dev

61−.. _homepage: https://asciimoo.github.io/searx

61+.. _homepage: https://searx.github.io/searx

62

63contact:

64 openhub_ // twitter_ // IRC: #searx @ freenode

docs/admin/arch_public.dot+4−4

@@ -4,11 +4,11 @@ digraph G {

4 edge [fontname="Sans"];

5

6 browser [label="Browser", shape=Mdiamond];

7− rp [label="Reverse Proxy", href="https://asciimoo.github.io/searx/utils/filtron.sh.html#public-reverse-proxy"];

7+ rp [label="Reverse Proxy", href="https://searx.github.io/searx/utils/filtron.sh.html#public-reverse-proxy"];

8− filtron [label="Filtron", href="https://asciimoo.github.io/searx/utils/filtron.sh.html"];

8+ filtron [label="Filtron", href="https://searx.github.io/searx/utils/filtron.sh.html"];

9− morty [label="Morty", href="https://asciimoo.github.io/searx/utils/morty.sh.html"];

9+ morty [label="Morty", href="https://searx.github.io/searx/utils/morty.sh.html"];

10 static [label="Static files", href="url to configure static files"];

11− uwsgi [label="uwsgi", href="https://asciimoo.github.io/searx/utils/searx.sh.html"]

11+ uwsgi [label="uwsgi", href="https://searx.github.io/searx/utils/searx.sh.html"]

12 searx1 [label="Searx #1"];

13 searx2 [label="Searx #2"];

14 searx3 [label="Searx #3"];

docs/admin/installation-docker.rst+1−1

@@ -49,7 +49,7 @@ It's also possible to build searx from the embedded Dockerfile.

49

50.. code:: sh

51

52− git clone https://github.com/asciimoo/searx.git

52+ git clone https://github.com/searx/searx.git

53 cd searx

54 make docker

55

docs/admin/installation.rst+1−1

@@ -36,7 +36,7 @@ and some maintenance tasks (alternatively you can create your own fork).

36.. code:: bash

37

38 $ cd ~/Downloads

39− $ git clone https://github.com/asciimoo/searx searx

39+ $ git clone https://github.com/searx/searx searx

40 $ cd searx

41

42**Install** :ref:`searx service <searx.sh>`

docs/blog/lxcdev-202006.rst+1−1

@@ -81,7 +81,7 @@ fork:

81 .. code:: sh

82

83 $ cd ~/Downloads

84− $ git clone https://github.com/asciimoo/searx.git

84+ $ git clone https://github.com/searx/searx.git

85 $ cd searx

86

87The :ref:`lxc-searx.env` consists of several images, see ``export

docs/blog/python3.rst+1−1

@@ -54,7 +54,7 @@ If you found bugs

54Please open an issue on `GitHub`_. Make sure that you mention your Python

55version in your issue, so we can investigate it properly.

56

57−.. _GitHub: https://github.com/asciimoo/searx/issues

57+.. _GitHub: https://github.com/searx/searx/issues

58

59Acknowledgment

60==============

docs/build-templates/searx.rst+1−1

@@ -81,7 +81,7 @@ ${fedora_build}

81 .. code-block:: sh

82

83 $ sudo -H -u ${SERVICE_USER} -i

84− (${SERVICE_USER})$ git clone "https://github.com/asciimoo/searx.git" "$SEARX_SRC"

84+ (${SERVICE_USER})$ git clone "https://github.com/searx/searx.git" "$SEARX_SRC"

85

86.. END clone searx

87

docs/conf.py+4−4

@@ -35,8 +35,8 @@ jinja_contexts = {

35extlinks = {}

36

37# upstream links

38−extlinks['wiki'] = ('https://github.com/asciimoo/searx/wiki/%s', ' ')

38+extlinks['wiki'] = ('https://github.com/searx/searx/wiki/%s', ' ')

39−extlinks['pull'] = ('https://github.com/asciimoo/searx/pull/%s', 'PR ')

39+extlinks['pull'] = ('https://github.com/searx/searx/pull/%s', 'PR ')

40

41# links to custom brand

42extlinks['origin'] = (GIT_URL + '/blob/' + GIT_BRANCH + '/%s', 'git://')

@@ -81,7 +81,7 @@ intersphinx_mapping = {

81 "sphinx" : ("https://www.sphinx-doc.org/en/master/", None),

82}

83

84−issues_github_path = "asciimoo/searx"

84+issues_github_path = "searx/searx"

85

86# HTML -----------------------------------------------------------------

87

@@ -99,7 +99,7 @@ html_theme_options = {"index_sidebar_logo": True}

99html_context = {

100 "project_links": [

101 ProjectLink("Source", GIT_URL),

102− ProjectLink("Wiki", "https://github.com/asciimoo/searx/wiki"),

102+ ProjectLink("Wiki", "https://github.com/searx/searx/wiki"),

103 ProjectLink("Public instances", "https://searx.space/"),

104 ProjectLink("Twitter", "https://twitter.com/Searx_engine"),

105 ]

docs/dev/contribution_guide.rst+1−1

@@ -182,4 +182,4 @@ needed git add, commit and push:

182 cd gh-pages; git checkout gh-pages >/dev/null

183 Switched to a new branch 'gh-pages'

184 ...

185− doc available at --> https://asciimoo.github.io/searx

185+ doc available at --> https://searx.github.io/searx

docs/dev/quickstart.rst+1−1

@@ -25,7 +25,7 @@ searx-ve virtualenv and install the required packages using ``manage.sh``.

25.. code:: sh

26

27 cd ~/myprojects

28− git clone https://github.com/asciimoo/searx.git

28+ git clone https://github.com/searx/searx.git

29 cd searx

30 python3 -m venv searx-ve

31 . ./searx-ve/bin/activate

searx/brand.py+3−3

@@ -1,6 +1,6 @@

1−GIT_URL = 'https://github.com/asciimoo/searx'

1+GIT_URL = 'https://github.com/searx/searx'

2GIT_BRANCH = 'master'

3−ISSUE_URL = 'https://github.com/asciimoo/searx/issues'

3+ISSUE_URL = 'https://github.com/searx/searx/issues'

4SEARX_URL = 'https://searx.me'

5−DOCS_URL = 'https://asciimoo.github.io/searx'

5+DOCS_URL = 'https://searx.github.io/searx'

6PUBLIC_INSTANCES = 'https://searx.space'

searx/engines/searx_engine.py+2−2

@@ -1,8 +1,8 @@

1"""

2 Searx (all)

3

4− @website https://github.com/asciimoo/searx

4+ @website https://github.com/searx/searx

5− @provide-api yes (https://asciimoo.github.io/searx/dev/search_api.html)

5+ @provide-api yes (https://searx.github.io/searx/dev/search_api.html)

6

7 @using-api yes

8 @results JSON

searx/settings.yml+1−1

@@ -60,7 +60,7 @@ outgoing: # communication with search engines

60# - 1.1.1.2

61

62# External plugin configuration

63−# See http://asciimoo.github.io/searx/dev/plugins.html for more details

63+# See http://searx.github.io/searx/dev/plugins.html for more details

64#

65# plugins:

66# - plugin1

searx/templates/__common__/about.html+3−3

@@ -10,7 +10,7 @@

10 More about searx...

11

12 <ul>

13− <li><a href="https://github.com/asciimoo/searx">github</a></li>

13+ <li><a href="https://github.com/searx/searx">github</a></li>

14 <li><a href="https://twitter.com/Searx_engine">twitter</a></li>

15 <li>IRC: #searx @ freenode (<a href="https://kiwiirc.com/client/irc.freenode.com/searx">webclient</a>)</li>

16 <li><a href="https://www.transifex.com/projects/p/searx/">transifex</a></li>

@@ -31,7 +31,7 @@

31 </li>

32 <li>

33 Searx is free software, the code is 100% open and you can help to make it

34− better. See more on <a href="https://github.com/asciimoo/searx">github</a>.

34+ better. See more on <a href="https://github.com/searx/searx">github</a>.

35 </li>

36 </ul>

37

@@ -81,7 +81,7 @@

81

82

83 Searx appreciates your concern regarding logs, so take the

84− code from the <a href="https://github.com/asciimoo/searx">original searx project</a> and

84+ code from the <a href="https://github.com/searx/searx">original searx project</a> and

85 run it yourself!

86

87

searx/templates/courgette/github_ribbon.html+1−1

@@ -1,3 +1,3 @@

1−<a href="https://github.com/asciimoo/searx" class="github">

1+<a href="https://github.com/searx/searx" class="github">

2 <img style="position: absolute; top: 0; right: 0; border: 0;" src="{{ url_for('static', filename='img/github_ribbon.png') }}" alt="Fork me on GitHub" class="github"/>

3</a>

searx/templates/legacy/github_ribbon.html+1−1

@@ -1,3 +1,3 @@

1−<a href="https://github.com/asciimoo/searx" class="github">

1+<a href="https://github.com/searx/searx" class="github">

2 <img style="position: absolute; top: 0; right: 0; border: 0;" src="{{ url_for('static', filename='img/github_ribbon.png') }}" alt="Fork me on GitHub" class="github"/>

3</a>

utils/brand.env+3−3

@@ -1,6 +1,6 @@

1−export GIT_URL='https://github.com/asciimoo/searx'

1+export GIT_URL='https://github.com/searx/searx'

2export GIT_BRANCH='master'

3−export ISSUE_URL='https://github.com/asciimoo/searx/issues'

3+export ISSUE_URL='https://github.com/searx/searx/issues'

4export SEARX_URL='https://searx.me'

5−export DOCS_URL='https://asciimoo.github.io/searx'

5+export DOCS_URL='https://searx.github.io/searx'

6export PUBLIC_INSTANCES='https://searx.space'

utils/fabfile.py+1−1

@@ -86,7 +86,7 @@ def init():

86 sudo('/etc/init.d/nginx restart')

87

88 with cd(base_dir):

89− sudo('git clone https://github.com/asciimoo/searx')

89+ sudo('git clone https://github.com/searx/searx')

90

91 sudo('chown -R {user}:{user} {searx_dir}'.format(user=current_user, searx_dir=searx_dir))

92 put(StringIO(uwsgi_file), searx_dir + '/uwsgi.ini')

utils/lib.sh+1−1

@@ -1325,7 +1325,7 @@ git_clone() {

1325 # into <path>. If repository is allready cloned, pull from <branch> and

1326 # update working tree (if needed, the caller has to stash local changes).

1327 #

1328− # git clone https://github.com/asciimoo/searx searx-src origin/master searxlogin

1328+ # git clone https://github.com/searx/searx searx-src origin/master searxlogin

1329 #

1330

1331 local url="$1"