mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-05 07:07:51 +02:00
Code Issues Releases Wiki Activity
29,644 Commits 18 Branches 192 Tags
Commit Graph

123 Commits

Author SHA1 Message Date
Marc Alexander
cae30929ea
Merge branch '3.1.x' into 3.2.x 2017-01-04 20:31:45 +01:00
David Colón
0fc1de279e [ticket/14941] Apply changes individually for MySQL fulltext search 2016-12-27 14:06:23 -05:00
Jakub Senko
e974f338af [ticket/14739] Remove SQLite 2.8.x database driver 
PHPBB3-14739
 2016-11-16 17:59:28 +01:00
rxu
35c62d1e74 [ticket/14793] Fix "A non-numeric value encountered" PHP warning on PHP 7.1+ 
PHPBB3-14793
 2016-09-22 22:29:18 +07:00
Marc Alexander
2dbc9e1016
Merge branch '3.1.x' into 3.2.x 2016-09-17 00:05:09 +02:00
DavidIQ
2ae08dc3ba [ticket/14782] Don't use 'DISTINCT' when using 'SQL_CALC_FOUND_ROWS' 2016-09-16 17:05:20 -04:00
Andreas Fischer
271e8b43f9 Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14782] Use the $select variable in "Your Posts" search
 2016-09-15 19:30:44 +02:00
DavidIQ
6d589a8bb9 [ticket/14782] Use the $select variable in "Your Posts" search 2016-09-13 14:10:50 -04:00
Marc Alexander
051323dbc6 Merge branch '3.1.x' into 3.2.x 2016-09-06 21:50:25 +02:00
Andreas Fischer
3ee5472a8c [ticket/14109] Increase MySQL Version for InnoDB FULLTEXT Index to 5.6.8. 
This is required for proper overall database operation. In previous versions,
InnoDB might error on ALTER statements when multiple FULLTEXT Indexes are
 defined.

PHPBB3-14109
 2016-08-28 20:40:10 +01:00
Marc Alexander
f2a1fbadbc Merge branch '3.1.x' into 3.2.x 2016-07-17 15:57:28 +02:00
Crizzo
53b9216c78 [ticket/14704] Removes unused function and language files in base.php 
PHPBB3-14704
 2016-07-03 14:22:08 +02:00
Marc Alexander
1600d82b77 Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.x 
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
 2016-03-27 09:59:25 +02:00
Marc Alexander
73900d1857 [ticket/13454] Remove more unused variables 
This should be the last part. Off to checking if the changes were correct.

PHPBB3-13454
 2016-01-06 13:52:11 +01:00
Marc Alexander
7a6a16e3a5 [ticket/13454] Remove unused variables 
This is part 5 and there is more to come.

PHPBB3-13454
 2016-01-06 13:52:11 +01:00
Marc Alexander
266576c6a4 [ticket/13454] Remove unused variables 
Part 4

PHPBB3-13454
 2016-01-06 13:52:11 +01:00
Marc Alexander
f50ba9ab4f [ticket/13454] Remove unused variables 
This is part 2 of the pr.

PHPBB3-13454
 2016-01-06 13:52:11 +01:00
Marc Alexander
685449bfe3 [ticket/14272] Fix invalid or missing min/max settings 
PHPBB3-14272
 2015-11-06 10:31:56 +01:00
Marc Alexander
aca6e64669 [ticket/14272] Only use maxlength and size for allowed input elements 
PHPBB3-14272
 2015-11-06 10:20:05 +01:00
Tristan Darricau
a5ab2eb564 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14098] Add core events to the search backends
 2015-10-12 13:38:42 +02:00
rxu
d75750fd99 [ticket/14098] Add core events to the search backends 
PHPBB3-14098
 2015-10-09 23:06:16 +07:00
Marc Alexander
f2edec90b0 Merge branch '3.1.x' 2015-08-22 10:37:53 +02:00
brunoais
81b4293cc5 [ticket/14104] Fix missing variables from previous commit 
Fixing variables wrongly attributed in PHPBB3-13691

PHPBB3-14104
 2015-08-15 22:04:51 +01:00
Marc Alexander
b1d8f8a22c Merge branch '3.1.x' 2015-08-09 10:00:34 +02:00
Marc Alexander
8d54f06d19 Merge pull request #3822 from brunoais/ticket/14083 
[ticket/14083] Fix wrong variables from previous commit
 2015-08-09 10:00:29 +02:00
Marc Alexander
994b9c2c77 Merge branch '3.1.x' 2015-08-09 09:56:40 +02:00
brunoais
7a2f72df75 [ticket/14083] Fix wrong variables from previous commit 
Fixing variables wrongly attributed in PHPBB3-13693

PHPBB3-14083
 2015-08-08 22:45:38 +01: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