ZaclysIndustries
/
searxngRebrandZaclys
forked from zaclys/searxng
2
0
Fork 0
Code Issues Pull Requests Activity
1,746 Commits 3 Branches 17 Tags 53 MiB
Commit Graph

1746 Commits

Author SHA1 Message Date
Adam Tauber 45734ee5f4 Merge pull request #136 from pointhi/template_oscar_fix 
[oscar_template] split up js-files, FIX #132
 2014-12-01 21:02:14 +01:00
Thomas Pointhuber 427ee531be [fix] .travis.yml - add grunt-cli to npm install 2014-11-30 13:32:32 +01:00
Thomas Pointhuber f72f66a0cf [fix] fix .travis.yml to install npm dependent packages 2014-11-30 13:25:16 +01:00
Thomas Pointhuber e687f5c290 [enh][oscar_template] split js-files and compile them together 2014-11-30 13:21:58 +01:00
Adam Tauber 623ce79885 Merge pull request #134 from Reventl0v/patch-1 
Adding `import sys` to fix the installer
 2014-11-28 07:56:16 +01:00
Reventl0v 262e12202a Adding `import sys` to fix the installer 2014-11-27 23:05:36 +01:00
Adam Tauber c4a27970c5 [doc] domain name change 2014-11-27 20:36:00 +01:00
Adam Tauber 25a83c33aa [enh] translation update 2014-11-26 20:42:16 +01:00
Adam Tauber 84aba71f6a [enh] french translation build 2014-11-26 20:40:37 +01:00
Adam Tauber da456604be Merge branch 'master' of github.com:asciimoo/searx 2014-11-26 20:39:15 +01:00
Adam Tauber 8dbf394a1a Merge pull request #133 from vincib/translation 
update of french translation
 2014-11-26 20:38:43 +01:00
Benjamin Sonntag 075fa2da7d update of french translation 2014-11-26 20:36:18 +01:00
Adam Tauber 3dfeb73912 [enh] user agent string update 2014-11-22 18:37:42 +01:00
Adam Tauber 91384c1f31 Merge pull request #130 from pointhi/template_oscar_fix 
[fix][template_oscar] make overpass-api call over https and add better error-message
 2014-11-20 15:49:31 +01:00
Adam Tauber a5fc08c369 Merge pull request #129 from courgette/courgette 
responsive theme courgette
 2014-11-20 15:48:31 +01:00
Thomas Pointhuber 08f4b7f506 [fix][template_oscar] make overpass-api call over https 
and add better error message if ajax-call fail
 2014-11-20 15:31:00 +01:00
Thomas LEBEAU 3ed43cf31a responsive theme courgette 2014-11-20 15:14:03 +01:00
Adam Tauber 075a5fe898 Merge pull request #127 from pointhi/template_oscar_map 
Template oscar, add map support
 2014-11-19 16:19:03 +01:00
Thomas Pointhuber 807db97690 [enh][translation] update translation files and add german translation 2014-11-19 15:49:55 +01:00
Thomas Pointhuber 4b75d41f86 [enh][oscar_template] loading map informations from overpass-api 2014-11-19 15:49:55 +01:00
Adam Tauber 1a81c20d73 [fix] sidebar overflow 2014-11-18 20:30:06 +01:00
Adam Tauber cfdfca0d41 [fix] whitespace remove 2014-11-18 19:55:39 +01:00
Adam Tauber 6b31f55c90 [fix] suggestions display 2014-11-18 19:53:38 +01:00
Adam Tauber b8efd1214f [enh] category select warning message 2014-11-18 19:44:33 +01:00
Adam Tauber cb15a21681 [fix] syggestions max width 2014-11-18 19:03:52 +01:00
Adam Tauber 444416a9ed Merge pull request #125 from pointhi/versions 
[enh] make version of searx readable
 2014-11-18 13:16:54 +01:00
Thomas Pointhuber aba65369d2 [enh] make version of searx readable 2014-11-18 11:37:42 +01:00
Adam Tauber b1234ee889 [fix] startpage engine compatibility 2014-11-17 10:19:23 +01:00
Adam Tauber 55234d96b7 Merge pull request #124 from matejc/oscarfix 
change package data in setup.py for oscar theme
 2014-11-14 11:03:59 +01:00
Matej Cotman c511b6fda8 change package data in setup.py for oscar theme 2014-11-14 10:24:40 +01:00
Adam Tauber b6da893c78 [fix] html attribute quote 2014-11-11 18:59:26 +01:00
Adam Tauber 0d80d5d3b4 Merge pull request #105 from pointhi/template_oscar 
new template: oscar
 2014-11-11 09:36:39 +01:00
Adam Tauber b422788eb4 [fix] wikipedia autocompleter url param 2014-11-04 19:53:42 +01:00
Thomas Pointhuber a9b4f458e9 Merge pull request #6 from pointhi/template_oscar 
[enh] add no-js support
 2014-11-04 14:32:53 +01:00
Thomas Pointhuber 46dd502592 [fix][template][oscar] print ',' only if postcode is found 2014-11-04 12:58:12 +01:00
Thomas Pointhuber 25312c53e1 [enh] add no-js support 
* image results have url, which can be clicked
* preferences full functionable without js
 2014-11-03 22:18:40 +01:00
Thomas Pointhuber c0fc248213 [enh] template_oscar: improve visualisation of torrent results 2014-11-03 19:00:56 +01:00
Thomas Pointhuber 9274a59045 [fix] template_oscar: improve visualisation of video-results 2014-11-03 18:57:48 +01:00
Thomas Pointhuber bc12a76fbb [fix] use address.city if possible 2014-11-03 18:53:04 +01:00
Thomas Pointhuber 3b7b106684 [enh] template_oscar: add layer to leaflet map 2014-11-03 18:47:18 +01:00
Thomas Pointhuber c38917bb2a [enh] template_oscar: show addressdata if possible 2014-11-03 18:46:58 +01:00
Thomas Pointhuber 2e7723a6c1 [enh] oscar_template: improve result visualisation 
* highlight parts of result
* add link to archiv.to
* fix little bugs
* add little icons
* change style of "show map" button
 2014-11-03 10:39:47 +01:00
Thomas Pointhuber b2c976a5a3 [enh] template_oscar: maxZoom if fitting bounds 2014-11-02 22:35:06 +01:00
Thomas Pointhuber 740594a4b7 [enh] oscar_template: initial osm-map support for map results 
* TODO: remove leaflet.min.css if not required
 2014-11-02 13:00:28 +01:00
Thomas Pointhuber b4829891f9 fix missing string in translation 2014-11-01 21:15:46 +01:00
Adam Tauber ee8cabf496 Merge pull request #122 from pointhi/bugfix 
[fix] #121, HTTP 500 Error if res["content"] == None
 2014-11-01 17:49:18 +01:00
Thomas Pointhuber 5a7f85ecee [fix] #121, HTTP 500 Error if res["content"] == None 2014-11-01 17:32:26 +01:00
Adam Tauber 58cc03351a Merge pull request #118 from dalf/master 
default theme : small modifications
 2014-10-30 08:09:07 +01:00
Thomas Pointhuber a697a1eaa5 oscar template: display answers 2014-10-26 19:20:20 +01:00
Thomas Pointhuber 0e1035eac1 Merge https://github.com/asciimoo/searx into template_oscar 
Conflicts:
	searx/translations/de/LC_MESSAGES/messages.po
	searx/translations/en/LC_MESSAGES/messages.po
	searx/translations/es/LC_MESSAGES/messages.po
	searx/translations/fr/LC_MESSAGES/messages.po
	searx/translations/hu/LC_MESSAGES/messages.po
	searx/translations/it/LC_MESSAGES/messages.po
	searx/translations/nl/LC_MESSAGES/messages.po
	searx/webapp.py
 2014-10-26 19:11:28 +01:00