dev
Forked from tuleap/dev
Clone or download
Read-only
Merge commit 'refs/changes/69/3169/14' of ssh://gerrit.tuleap.net:29418/tuleap into stable
* ssh://gerrit.tuleap.net:29418/tuleap: story #7465: split legacy search and FTS search in two panes Conflicts: plugins/fulltextsearch/include/autoload.php src/common/autoload.php
Modified Files
| Name | ||||
|---|---|---|---|---|
| M | plugins/fulltextsearch/include/ElasticSearch/SearchResult.class.php | +1 | −1 | Go to diff View file |
| M | plugins/fulltextsearch/include/autoload.php | +1 | −1 | Go to diff View file |
| M | plugins/fulltextsearch/include/fulltextsearchPlugin.class.php | +6 | −8 | Go to diff View file |
| M | plugins/fulltextsearch/site-content/en_US/fulltextsearch.tab | +2 | −0 | Go to diff View file |
| M | plugins/fulltextsearch/site-content/fr_FR/fulltextsearch.tab | +2 | −0 | Go to diff View file |
| M | plugins/fulltextsearch/templates/results.mustache | +7 | −7 | Go to diff View file |
| M | plugins/fulltextsearch/www/scripts/full-text-search.js | +48 | −21 | Go to diff View file |
| M | site-content/en_US/search/search.tab | +1 | −1 | Go to diff View file |
| M | site-content/fr_FR/search/search.tab | +1 | −1 | Go to diff View file |
| M | src/common/autoload.php | +4 | −3 | Go to diff View file |
| M | src/common/event/Event.class.php | +5 | −0 | Go to diff View file |
| A | src/common/search/Presenters/AdditionalSearchTabsPresenter.class.php | +35 | −0 | Go to diff View file |
| M | src/common/search/Presenters/SearchPresenter.class.php | +16 | −5 | Go to diff View file |
| M | src/common/search/SearchController.class.php | +26 | −13 | Go to diff View file |
| M | src/common/search/SearchResults.class.php | +1 | −1 | Go to diff View file |
| A | src/templates/search/additional-search-tabs.mustache | +12 | −0 | Go to diff View file |
| M | src/templates/search/site-search.mustache | +2 | −0 | Go to diff View file |
| M | src/www/scripts/tuleap/search.js | +37 | −21 | Go to diff View file |
| M | src/www/themes/FlamingParrot/css/utils/search.less | +50 | −0 | Go to diff View file |
| M | src/www/themes/common/css/utils/search.less | +62 | −7 | Go to diff View file |