aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/search
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3696 from marc1706/ticket/13930-masterAndreas Fischer2015-06-091-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | [ticket/13930] Check for correct spacing between keyword & parenthesis * marc1706/ticket/13930-master: [ticket/13930] Add missing space to mssql_extractor [ticket/13930] Add missing spaces to code [ticket/13930] Use OpeningParenthesisSniff in legacy ruleset [ticket/13930] Remove not needed return statements [ticket/13930] Add missing spaces to code [ticket/13930] Check for correct spacing between keyword & parenthesis
| * Merge branch 'ticket/13930' into ticket/13930-masterMarc Alexander2015-06-081-1/+1
| |\ | | | | | | | | | | | | Conflicts: phpBB/includes/acp/acp_database.php
| | * [ticket/13930] Add missing spaces to codeMarc Alexander2015-06-071-1/+1
| | | | | | | | | | | | PHPBB3-13930
* | | Merge branch '3.1.x'Marc Alexander2015-06-091-0/+49
|\ \ \
| * \ \ Merge pull request #3486 from brunoais/ticket/13693Marc Alexander2015-06-091-0/+49
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13693] Allow modifying the MySQL author search query
| | * | | [ticket/13693] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13693
| | * | | [ticket/13693] Allow modifying the MySQL author search querybrunoais2015-03-121-0/+49
| | | | | | | | | | | | | | | | | | | | PHPBB3-13693
* | | | | Merge branch '3.1.x'Marc Alexander2015-06-091-0/+49
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3485 from brunoais/ticket/13694Marc Alexander2015-06-091-0/+49
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13694] Allow modifying the Postgres native author search query for results
| | * | | | [ticket/13694] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13694
| | * | | | [ticket/13694] Allow modifying the Postgres native author search querybrunoais2015-03-121-0/+49
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-13694
* | | | | Merge branch '3.1.x'Marc Alexander2015-06-091-0/+43
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3484 from brunoais/ticket/13691Marc Alexander2015-06-091-0/+43
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13691] Allow modifying the fulltext native search query for total results for author
| | * | | | [ticket/13691] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13691
| | * | | | [ticket/13691] Allow changing query to search for posts by author in nativebrunoais2015-03-121-0/+43
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-13691
* | | | | Merge branch '3.1.x'Marc Alexander2015-06-091-0/+62
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3483 from brunoais/ticket/13686Marc Alexander2015-06-091-0/+62
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13686] Allow modify query used for counting in fulltext_native
| | * | | | [ticket/13686] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13686
| | * | | | [ticket/13686] Allow modify query used for counting in fulltext_nativebrunoais2015-03-121-0/+62
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-13686
* | | | | Merge branch '3.1.x'Marc Alexander2015-06-091-0/+49
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3481 from brunoais/ticket/13689Marc Alexander2015-06-091-0/+49
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13689] Allow modifying the query for postgres native fulltext search Conflicts: phpBB/develop/search_fill.php phpBB/includes/acp/acp_main.php phpBB/includes/acp/acp_search.php phpBB/includes/functions_admin.php phpBB/includes/functions_posting.php phpBB/includes/mcp/mcp_main.php phpBB/includes/mcp/mcp_post.php phpBB/install/install_convert.php phpBB/install/install_install.php phpBB/phpbb/search/fulltext_mysql.php phpBB/phpbb/search/fulltext_native.php phpBB/phpbb/search/fulltext_postgres.php phpBB/phpbb/search/fulltext_sphinx.php phpBB/search.php tests/search/mysql_test.php tests/search/native_test.php tests/search/postgres_test.php
| | * | | | [ticket/13689] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13689
| | * | | | [ticket/13689] Allow modifying the query for postgres native fulltext searchbrunoais2015-03-121-0/+49
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-13689
| | * | | [ticket/13685] Add phpbb_dispatcher to fulltext search constructorsbrunoais2015-03-124-4/+36
| | | | | | | | | | | | | | | | | | | | PHPBB3-13685
* | | | | Merge branch '3.1.x'Marc Alexander2015-06-094-4/+85
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | Conflicts: phpBB/includes/mcp/mcp_main.php
| * | | Merge pull request #3479 from brunoais/ticket/13685Marc Alexander2015-06-094-4/+85
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13685] Allow modifying the query for mysql native fulltext search
| | * | | [ticket/13685] phpBB, not PhpBBbrunoais2015-06-094-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-13685
| | * | | [ticket/13685] BUMP version to 3.1.5-devbrunoais2015-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13685
| | * | | [ticket/13685] Allow modifying the query for mysql native fulltext searchbrunoais2015-06-071-0/+49
| | | | | | | | | | | | | | | | | | | | PHPBB3-13685
| | * | | [ticket/13685] Add phpbb_dispatcher to fulltext search constructorsbrunoais2015-06-074-4/+36
| | | |/ | | |/| | | | | | | | | PHPBB3-13685
* | | | Merge branch '3.1.x'Andreas Fischer2015-06-081-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * 3.1.x: [ticket/13888] Fix sql_freeresult() error on author searches
| * | | [ticket/13888] Fix sql_freeresult() error on author searchesCHItA2015-06-071-1/+1
| |/ / | | | | | | | | | PHPBB3-13888
* | | Merge branch '3.1.x'Dhruv2015-03-141-11/+8
|\ \ \ | |/ / | | | | | | | | | Conflicts: phpBB/phpbb/search/fulltext_native.php
| * | [ticket/13674] Missing space after "if"brunoais2015-03-071-1/+1
| | | | | | | | | | | | PHPBB3-13674
| * | [ticket/13674] Change MySQL native total search results calculationbrunoais2015-03-061-11/+8
| |/ | | | | | | | | | | | | | | | | This changes how the native FULLTEXT search calculates the total match number for MySQL. This should improve performance as there is one less query being made and it is being searched using the technique mentioned in the manual PHPBB3-13674
* | [ticket/10748] Replace direct creations of tools();Joas Schilling2015-02-071-1/+2
| | | | | | | | PHPBB3-10748
* | [ticket/13494] Update calls to `set_config()`Gaëtan Muller2015-02-024-10/+10
| | | | | | | | PHPBB3-13494
* | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-291-1/+1
|\ \ | |/ | | | | | | | | * develop-ascraeus: [ticket/12933] Add test cases for * wildcard searches [ticket/12933] Handle case when * is last character of word
| * Merge branch 'ticket/12933-olympus' into ticket/12933Dhruv2015-01-281-1/+1
| |
* | [ticket/13468] Update calls to `add_log()`Gaëtan Muller2015-01-271-1/+3
| | | | | | | | PHPBB3-13468
* | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-191-1/+1
|\ \ | |/ | | | | | | * develop-ascraeus: [ticket/13504] Fix invalid variable $user
| * [ticket/13504] Fix invalid variable $userJoas Schilling2015-01-191-1/+1
| | | | | | | | PHPBB3-13504
* | [ticket/13421] Move tools to subdirectoryJoas Schilling2014-12-061-3/+3
| | | | | | | | PHPBB3-13421
* | [ticket/13421] Always require the interface when possibleJoas Schilling2014-12-061-1/+1
| | | | | | | | PHPBB3-13421
* | [feature/patchwork-utf8] Normalize with intl, use patchwork/utf8 as fallbackNicolas Grekas2014-11-081-18/+16
| |
* | Merge branch 'develop-ascraeus' into developNils Adermann2014-10-201-0/+1
|\ \ | |/ | | | | | | | | * develop-ascraeus: [ticket/13188] Correctly format string concatenation [ticket/13188] Add missing where clause to post_id query in sphinx index
| * Merge pull request #3048 from naderman/ticket/13188Nils Adermann2014-10-201-0/+1
| |\ | | | | | | [ticket/13188] Add missing where clause to post_id query in sphinx index
| | * [ticket/13188] Correctly format string concatenationNils Adermann2014-10-201-1/+1
| | | | | | | | | | | | PHPBB3-13188
| | * [ticket/13188] Add missing where clause to post_id query in sphinx indexNils Adermann2014-10-201-0/+1
| | | | | | | | | | | | PHPBB3-13188
* | | Merge branch 'develop-ascraeus' into developDhruv2014-10-191-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | # By Nils Adermann # Via Dhruv Goel (1) and Nils Adermann (1) * develop-ascraeus: [ticket/13181] Replace database credentials with placeholders in sphinx conf