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
Joas Schilling
23a45fcace
[prep-release-3.1.5] Add migration for 3.1.5-RC1
2015-06-09 20:32:15 +02:00
Joas Schilling
00c15c76c3
Merge branch '3.1.x'
2015-06-09 20:23:29 +02:00
Joas Schilling
832c9f64e0
Merge pull request #3551 from rxu/ticket/13779
...
[ticket/13779] Set new auth options to the role only if matching the role type
2015-06-09 20:23:08 +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
1fae4152ef
[ticket/13930] Add missing space to mssql_extractor
...
PHPBB3-13930
2015-06-08 15:55:03 +02: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
Marc Alexander
77bc8ee68b
Merge branch '3.1.x'
...
Conflicts:
phpBB/includes/acp/acp_board.php
phpBB/includes/acp/acp_jabber.php
2015-06-07 14:59:33 +02:00
Marc Alexander
bac02a348e
Merge pull request #22 from phpbb/ticket/sec-184
...
[ticket/sec-184] Do not output passwords to HTML
2015-06-07 14:57:06 +02:00
Tristan Darricau
12c793bcd1
Merge branch '3.1.x'
2015-06-06 11:45:42 +02:00
Tristan Darricau
bed8df20d2
Merge pull request #3680 from marc1706/ticket/13917
...
[ticket/13917] Use hash_equals() if possible in password driver helper
2015-06-06 11:45:22 +02:00
Joas Schilling
f3f82bd377
Merge branch '3.1.x'
2015-06-04 17:30:16 +02:00
Joas Schilling
9005711ad7
Merge pull request #3502 from marc1706/ticket/13564
...
[ticket/13564] Unlink user accounts upon deleting user
2015-06-04 17:30:09 +02:00
Marc Alexander
fb94bd11fb
[ticket/13917] Do not pass non-string variables to hash_equals()
...
PHPBB3-13917
2015-06-04 17:16:22 +02:00
Marc Alexander
852337cacd
[ticket/13917] Use hash_equals() if it's available
...
PHPBB3-13917
2015-06-04 16:52:08 +02:00
Joas Schilling
78b0c938a2
[ticket/sec-184] Do not output LDAP password to HTML
...
SECURITY-184
2015-06-04 14:29:03 +02:00
MateBartus
8d443c3de7
[ticket/13777] Remove module_class_not_defined_exception
...
PHPBB3-13777
2015-05-31 16:27:16 +02:00
MateBartus
4044b5df89
[ticket/13777] Reorder get_module_infos() method's arguments
...
PHPBB3-13777
2015-05-31 16:03:11 +02:00
MateBartus
77ee0e62ca
[ticket/13777] Use module manager in phpBB core files
...
PHPBB3-13777
2015-05-31 13:22:45 +02:00
MateBartus
71d03647f0
[ticket/13777] Move module management into service
...
PHPBB3-13777
2015-05-31 13:22:44 +02:00
JoshyPHP
b69e33c2b0
[ticket/13901] Add whitespace to short, multiline quotes for readability
...
PHPBB3-13901
2015-05-30 22:20:52 +02:00
JoshyPHP
2f0d11ba3c
[ticket/13901] Add more whitespace to long quotes for readability
...
PHPBB3-13901
2015-05-30 22:17:14 +02:00
JoshyPHP
2a7d26d3de
[ticket/13803] Use accurate flags for generate_text_for_edit()
...
PHPBB3-13803
2015-05-30 17:29:49 +02:00
JoshyPHP
1275f77da5
[ticket/13803] Renamed var
...
PHPBB3-13803
2015-05-30 17:26:01 +02:00
JoshyPHP
1bff7d1175
[ticket/13803] Fixed method name
...
PHPBB3-13803
2015-05-30 17:26:01 +02:00
JoshyPHP
75eb283f8d
[ticket/13803] Renamed methods
...
PHPBB3-13803
2015-05-30 17:26:01 +02:00
JoshyPHP
54b18df084
[ticket/13803] Added contact_admin_info tests
...
PHPBB3-13803
2015-05-30 17:26:01 +02:00
JoshyPHP
3827a131ae
[ticket/13803] Rewrote the poll_option plugin
...
As it turns out, poll_option_id is not a primary key.
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
7a8ac4bb71
[ticket/13803] Added get_max_id() tests
...
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
ae6ad754a4
[ticket/13803] Moved the add_missing_fields() call to the base class
...
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
a870f8f860
[ticket/13803] Added user_signature tests
...
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
212fc277b4
[ticket/13803] Reordered methods [ci skip]
...
PHPBB3-13803
2015-05-30 17:26:00 +02:00
