Marc Alexander
994b9c2c77
Merge branch '3.1.x'
2015-08-09 09:56:40 +02:00
brunoais
84a40b6ad1
[ticket/14082] Fix wrong variables from previous commit
...
Fixing variables wrongly attributed in PHPBB3-13686
PHPBB3-14082
2015-08-08 22:23:17 +01:00
Andreas Fischer
1f4976f590
Merge pull request #3696 from marc1706/ticket/13930-master
...
[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
2015-06-09 21:27:23 +02:00
Andreas Fischer
c952622fa0
Merge pull request #3694 from marc1706/ticket/13930
...
[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
2015-06-09 21:27:07 +02:00
Marc Alexander
47ef99f6ef
Merge branch '3.1.x'
2015-06-09 17:22:02 +02:00
Marc Alexander
405681f138
Merge pull request #3486 from brunoais/ticket/13693
...
[ticket/13693] Allow modifying the MySQL author search query
2015-06-09 17:21:54 +02:00
Marc Alexander
6d3c4d3879
Merge branch '3.1.x'
2015-06-09 17:19:49 +02:00
Marc Alexander
b7db12a593
Merge pull request #3485 from brunoais/ticket/13694
...
[ticket/13694] Allow modifying the Postgres native author search query for results
2015-06-09 17:19:42 +02:00
Marc Alexander
39c273e346
Merge branch '3.1.x'
2015-06-09 17:18:12 +02:00
Marc Alexander
4143f65b46
Merge pull request #3484 from brunoais/ticket/13691
...
[ticket/13691] Allow modifying the fulltext native search query for total results for author
2015-06-09 17:18:04 +02:00
Marc Alexander
35f3c5c4b0
Merge branch '3.1.x'
2015-06-09 17:14:58 +02:00
Marc Alexander
5f7fa4c89c
Merge pull request #3483 from brunoais/ticket/13686
...
[ticket/13686] Allow modify query used for counting in fulltext_native
2015-06-09 17:14:23 +02:00
Marc Alexander
a21650e689
Merge branch '3.1.x'
2015-06-09 17:11:20 +02:00
Marc Alexander
83d8ea013b
Merge pull request #3481 from brunoais/ticket/13689
...
[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
2015-06-09 17:10:44 +02:00
Marc Alexander
b2ada8ba09
Merge branch '3.1.x'
...
Conflicts:
phpBB/includes/mcp/mcp_main.php
2015-06-09 15:24:08 +02:00
Marc Alexander
072f4c9260
Merge pull request #3479 from brunoais/ticket/13685
...
[ticket/13685] Allow modifying the query for mysql native fulltext search
2015-06-09 14:27:13 +02:00
brunoais
3ac95f48f8
[ticket/13685] phpBB, not PhpBB
...
PHPBB3-13685
2015-06-09 12:55:27 +01:00
Marc Alexander
2e31cae7bf
Merge branch 'ticket/13930' into ticket/13930-master
...
Conflicts:
phpBB/includes/acp/acp_database.php
2015-06-08 15:39:47 +02:00
Andreas Fischer
03bfcba582
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13888] Fix sql_freeresult() error on author searches
2015-06-08 01:59:09 +02:00
Marc Alexander
9203bf3141
[ticket/13930] Add missing spaces to code
...
PHPBB3-13930
2015-06-07 22:53:41 +02:00
brunoais
823783773c
[ticket/13685] BUMP version to 3.1.5-dev
...
PHPBB3-13685
2015-06-07 18:40:50 +01:00
brunoais
94aff53e3f
[ticket/13685] Allow modifying the query for mysql native fulltext search
...
PHPBB3-13685
2015-06-07 18:40:49 +01:00
brunoais
1e45a05000
[ticket/13685] Add phpbb_dispatcher to fulltext search constructors
...
PHPBB3-13685
2015-06-07 18:40:44 +01:00
CHItA
29cda5f2ad
[ticket/13888] Fix sql_freeresult() error on author searches
...
PHPBB3-13888
2015-06-07 17:41:17 +02:00
brunoais
c701e8a131
[ticket/13694] BUMP version to 3.1.5-dev
...
PHPBB3-13694
2015-05-06 23:05:30 +01:00
brunoais
5465c594ca
[ticket/13691] BUMP version to 3.1.5-dev
...
PHPBB3-13691
2015-05-06 23:03:23 +01:00
brunoais
f2fb8e339d
[ticket/13686] BUMP version to 3.1.5-dev
...
PHPBB3-13686
2015-05-06 23:02:21 +01:00
brunoais
b8a31241a3
[ticket/13689] BUMP version to 3.1.5-dev
...
PHPBB3-13689
2015-05-06 22:59:05 +01:00
brunoais
59a1f4e8ac
[ticket/13693] BUMP version to 3.1.5-dev
...
PHPBB3-13693
2015-05-06 22:50:52 +01:00
Dhruv
24f26478c4
Merge branch '3.1.x'
...
Conflicts:
phpBB/phpbb/search/fulltext_native.php
2015-03-14 23:44:58 +08:00
brunoais
cfdaf2d63f
[ticket/13694] Allow modifying the Postgres native author search query
...
PHPBB3-13694
2015-03-12 22:14:20 +00:00
brunoais
29ccbd8098
[ticket/13693] Allow modifying the MySQL author search query
...
PHPBB3-13693
2015-03-12 12:23:53 +00:00
brunoais
1a001fc233
[ticket/13691] Allow changing query to search for posts by author in native
...
PHPBB3-13691
2015-03-12 12:23:29 +00:00
brunoais
d5dd9c929d
[ticket/13689] Allow modifying the query for postgres native fulltext search
...
PHPBB3-13689
2015-03-12 12:22:45 +00:00
brunoais
3bda9a3c11
[ticket/13686] Allow modify query used for counting in fulltext_native
...
PHPBB3-13686
2015-03-12 12:22:07 +00:00
brunoais
c3a0e09ddb
[ticket/13685] Add phpbb_dispatcher to fulltext search constructors
...
PHPBB3-13685
2015-03-12 12:21:15 +00:00
brunoais
9b030fd174
[ticket/13674] Missing space after "if"
...
PHPBB3-13674
2015-03-07 14:57:42 +00:00
brunoais
f4c423cea1
[ticket/13674] Change MySQL native total search results calculation
...
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
2015-03-06 22:23:45 +00:00
Joas Schilling
37ae99c75d
[ticket/10748] Replace direct creations of tools();
...
PHPBB3-10748
2015-02-07 14:41:39 +01:00
Gaëtan Muller
79d4ff5538
[ticket/13494] Update calls to set_config()
...
PHPBB3-13494
2015-02-02 19:28:23 +01:00
Andreas Fischer
d7741cea60
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12933] Add test cases for * wildcard searches
[ticket/12933] Handle case when * is last character of word
2015-01-29 00:02:42 +01:00
Dhruv
252018b813
Merge branch 'ticket/12933-olympus' into ticket/12933
2015-01-28 21:41:24 +05:30
Gaëtan Muller
7fc586080b
[ticket/13468] Update calls to add_log()
...
PHPBB3-13468
2015-01-27 18:34:33 +01:00
Andreas Fischer
2535e9da00
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13504] Fix invalid variable $user
2015-01-19 23:23:57 +01:00
Joas Schilling
7e8bb68999
[ticket/13504] Fix invalid variable $user
...
PHPBB3-13504
2015-01-19 21:42:22 +01:00
Joas Schilling
ec90f2b380
[ticket/13421] Move tools to subdirectory
...
PHPBB3-13421
2014-12-06 17:10:07 +01:00
Joas Schilling
d78bb2865b
[ticket/13421] Always require the interface when possible
...
PHPBB3-13421
2014-12-06 16:17:04 +01:00
Nicolas Grekas
5a7caf6508
[feature/patchwork-utf8] Normalize with intl, use patchwork/utf8 as fallback
2014-11-08 11:36:13 +01:00
Nils Adermann
79d6f67e81
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13188] Correctly format string concatenation
[ticket/13188] Add missing where clause to post_id query in sphinx index
2014-10-20 15:31:06 -04:00
Nils Adermann
973dfbf868
Merge pull request #3048 from naderman/ticket/13188
...
[ticket/13188] Add missing where clause to post_id query in sphinx index
2014-10-20 15:30:08 -04:00
