summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-03-29Merge PR #1900 of https://github.com/asciimoo/searx into filtronMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-29[fix] travis: reomve 'make style' from travis buildMarkus Heiser
Commit 8a16903a removes Makefile target style Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-29bash: use build environment from MakefileMarkus Heiser
To Makefile target brand, add creation of bash environment in:: utils/brand.env In bash scripts (manage.sh) source env by:: . utils/brand.env manage.sh help: show GIT_URL and more environment Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-29make themes: rename 'style' targtes to 'themes' targetsMarkus Heiser
style.legacy could be renamed themes.legacy : it actually builds the files for the legacy theme, then themes.legacy can be a dependency of themes. Same for the other styles.* Debatable: about style.bootstrap, same convention : theme.bootstrap (even it is more a toolbox for the oscar theme). So there is no need to add the missing make styles in the help target. thanks @dalf: - https://github.com/asciimoo/searx/pull/1900#discussion_r399160355 Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-29[fix] docker 'Error compiling' and 'SyntaxError' messagesMarkus Heiser
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-26travis: use build environment from MakefileMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-26test: move tests from manage.sh to MakefileMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-26build: move build styles from manage.sh to MakefileMarkus Heiser
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.gitignore: make package-lock.json visibleMarkus Heiser
Even if we do not versioning them right now. Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-26Minor improvements of the HTML *about* pageMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-26make project: re-build generic files of the searx projectMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-26Makefile: add target 'useragents.update' to fetch versions of FirefoxMarkus Heiser
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-26Rewrite of the HTL *about* pageMarkus Heiser
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-26brands: hardcode ISSUE_URL and some links on the about-pageMarkus Heiser
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-25brands: add ISSUE_URLMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-25webapp.py: expose the brand variable in the /config URL.Markus Heiser
E.g. helpful for searx-stats2 Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-25webapp.py: partial code review (no functional change)Markus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-25Makefile: add target node.env - download & install npm dependenciesMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-25[fix] docker build: set build argument LABEL_VCS_URL to GIT_URLMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-25[fix] brands: add GIT_URL variable to the docker buildMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-25[fix] brands: add variables from build env to grunt processMarkus Heiser
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-25make project: re-build generic files of the searx projectMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-25[fix] brands: add variables from build env to setup.pyMarkus Heiser
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[fix] brands: add variables from build env to sphinx-docMarkus Heiser
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[fix] brands: add variables from build env to jinja templatingMarkus Heiser
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-23lxc.sh install base: add bash and python3 to LXC_BASE_PACKAGESMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-23LXC: set LXC_ENV_FOLDER=lxc/$(shell hostname)/Markus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-23Merge branch 'filtron' of https://github.com/return42/searx into filtronMarkus Heiser
2020-03-23Merge branch 'filtron' of https://github.com/return42/searx into filtronMarkus Heiser
2020-03-23Merge branch 'master' of https://github.com/asciimoo/searx into filtronMarkus Heiser
2020-03-23[enh] submit search on suggestion select - closes #807Adam Tauber
2020-03-23[fix] load new page with infinite scroll if there is no scrollbar - fixes #759Adam Tauber
2020-03-23[enh] add clear search button to oscar theme - fixes #454Adam Tauber
2020-03-21Merge branch 'master' of https://github.com/asciimoo/searx into filtronMarkus Heiser
2020-03-21docs: building (PDF) books / build user bookMarkus Heiser
BTW: cleaned up Makefile target help Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-18./utils/lxc.sh: add command 'install base'Markus Heiser
to install basic packages like git and *build essentials*:: $ ./utils/lxc.sh install base Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-18LXC: add /.lxcenvMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-16[fix] remove debug printAdam Tauber
2020-03-16[fix] handle weights in accept language parsing - fixes w3ms en;q=1.0Adam Tauber
2020-03-15LXC: utils/makefile.lxc (inital) add /.lxcenv.mk to contaiinersMarkus Heiser
Get LXC environment when building make targets. Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-15Merge branch 'master' of https://github.com/asciimoo/searx into filtronMarkus Heiser
2020-03-13[fix] update csv unit testAdam Tauber
2020-03-13[fix] convert query to string to produce valid filename for csv outputAdam Tauber
2020-03-13[fix] add answers, suggestions, corrections to csv outputAdam Tauber
fixes #1888
2020-03-13[fix] add answers, suggestions, corrections to rss outputAdam Tauber
fixes #1888
2020-03-09searx.sh: add buildhost cmd, installs OS packages for buildsMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-08shellcheck: minor fixes to support all dsitrosMarkus Heiser
checked with:: sudo ./utils/lxc.sh cmd -- make test.sh on ubu1804, ubu1910, fedora31 and archlinux. All checks OK except: ubu1604: uses shellcheck v0.3.7 (from 04/2015) which is no longer supported! Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-08makefile.python: remove python2 supportMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-08searx.sh: add commandline 'install packages'Markus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-08LXC: fixed raw.idmap & removed obsolete uid/gid subordinateMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-14 02:02:21 +0000