searxng

History

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

css

Merge branch 'master' of https://github.com/asciimoo/searx into code_results

2015-01-09 21:30:09 +01:00

fonts

[enh] themes static content refactor

2015-01-01 17:48:12 +01:00

img

[enh] themes static content refactor

2015-01-01 17:48:12 +01:00

Merge branch 'master' of https://github.com/asciimoo/searx into code_results

2015-01-09 21:30:09 +01:00

less

Merge branch 'master' of https://github.com/asciimoo/searx into code_results

2015-01-09 21:30:09 +01:00

.gitignore

[enh] themes static content refactor

2015-01-01 17:48:12 +01:00

gruntfile.js

Merge branch 'master' of https://github.com/asciimoo/searx into code_results

2015-01-09 21:30:09 +01:00

package.json

Merge branch 'master' of https://github.com/asciimoo/searx into code_results

2015-01-09 21:30:09 +01:00

README.rst

[fix] filename strip

2015-01-01 18:06:51 +01:00

README.rst

install dependencies
~~~~~~~~~~~~~~~~~~~~

run this command in the directory ``searx/static/themes/oscar``

``npm install``

compile sources
~~~~~~~~~~~~~~~

run this command in the directory ``searx/static/themes/oscar``

``grunt``

or in the root directory:

``make grunt``