aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/search
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.xMarc Alexander2016-03-273-7/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/adm/style/acp_icons.html phpBB/includes/acp/acp_groups.php phpBB/includes/acp/acp_users.php phpBB/includes/functions_acp.php phpBB/includes/ucp/ucp_groups.php phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html phpBB/styles/prosilver/template/ucp_avatar_options_remote.html phpBB/styles/subsilver2/template/mcp_topic.html phpBB/styles/subsilver2/template/posting_attach_body.html phpBB/styles/subsilver2/template/posting_body.html phpBB/styles/subsilver2/template/posting_poll_body.html phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html
| * [ticket/14272] Fix invalid or missing min/max settingsMarc Alexander2015-11-061-2/+2
| | | | | | | | PHPBB3-14272
| * [ticket/14272] Only use maxlength and size for allowed input elementsMarc Alexander2015-11-063-7/+7
| | | | | | | | PHPBB3-14272
* | [ticket/13454] Remove more unused variablesMarc Alexander2016-01-061-1/+0
| | | | | | | | | | | | This should be the last part. Off to checking if the changes were correct. PHPBB3-13454
* | [ticket/13454] Remove unused variablesMarc Alexander2016-01-061-1/+1
| | | | | | | | | | | | This is part 5 and there is more to come. PHPBB3-13454
* | [ticket/13454] Remove unused variablesMarc Alexander2016-01-063-6/+1
| | | | | | | | | | | | Part 4 PHPBB3-13454
* | [ticket/13454] Remove unused variablesMarc Alexander2016-01-062-6/+2
| | | | | | | | | | | | This is part 2 of the pr. PHPBB3-13454
* | Merge branch '3.1.x'Tristan Darricau2015-10-124-13/+263
|\ \ | |/ | | | | | | * 3.1.x: [ticket/14098] Add core events to the search backends
| * [ticket/14098] Add core events to the search backendsrxu2015-10-094-13/+263
| | | | | | | | PHPBB3-14098
* | Merge branch '3.1.x'Marc Alexander2015-08-221-0/+4
|\ \ | |/
| * [ticket/14104] Fix missing variables from previous commitbrunoais2015-08-151-0/+4
| | | | | | | | | | | | Fixing variables wrongly attributed in PHPBB3-13691 PHPBB3-14104
* | Merge branch '3.1.x'Marc Alexander2015-08-091-0/+4
|\ \ | |/
| * Merge pull request #3822 from brunoais/ticket/14083Marc Alexander2015-08-091-0/+4
| |\ | | | | | | | | | [ticket/14083] Fix wrong variables from previous commit
| | * [ticket/14083] Fix wrong variables from previous commitbrunoais2015-08-081-0/+4
| | | | | | | | | | | | | | | | | | Fixing variables wrongly attributed in PHPBB3-13693 PHPBB3-14083
* | | Merge branch '3.1.x'Marc Alexander2015-08-091-5/+7
|\ \ \ | |/ /
| * | [ticket/14082] Fix wrong variables from previous commitbrunoais2015-08-081-5/+7
| |/ | | | | | | | | | | Fixing variables wrongly attributed in PHPBB3-13686 PHPBB3-14082
| * Merge pull request #3694 from marc1706/ticket/13930Andreas Fischer2015-06-091-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13930] Check for correct spacing between keyword & parenthesis * marc1706/ticket/13930: [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 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