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
javiexin
56f47c1344
[ticket/13908] "After" clause in migration not working
...
In a migration file, if you try to add a column to a table and specify
the order, by specifying an "after" clause, it is not used at all, even
for databases that support it (like mysql).
This fixes the issue, for mysql databases. Typo fixed.
PHPBB3-13908
2015-06-02 09:00:05 +02:00
javiexin
86945bdf84
[ticket/13908] "After" clause in migration not working
...
In a migration file, if you try to add a column to a table and specify
the order, by specifying an "after" clause, it is not used at all, even
for databases that support it (like mysql).
This fixes the issue, for mysql databases.
PHPBB3-13908
2015-06-01 19:50:32 +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
JoshyPHP
70cd911281
[ticket/13803] Added tests
...
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
9bf0f794b5
[ticket/13803] Added pm_text tests
...
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
ea445ffa47
[ticket/13803] Added methods to detect whether a given feature is in use
...
They test whether a given BBCode was enabled and has been used in a text,
or smilies, or magic URLs.
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
459f1d4c1f
[ticket/13803] Refactored test
...
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
b5911281ae
[ticket/13803] Added tests, fixed param order in generate_text_for_storage()
...
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
986af43f37
[ticket/13803] Added plugins
...
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
e11ae7e9cd
[ticket/13803] Hyphenated class names
...
PHPBB3-13803
2015-05-30 17:26:00 +02:00
JoshyPHP
de52580a78
[ticket/13803] WIP implementation
...
PHPBB3-13803
2015-05-30 17:26:00 +02:00
Nils Adermann
073f3e6fdc
Merge pull request #3592 from Nicofuma/ticket/13388
...
[ticket/13388] Integrate routing and di parameters resolution
2015-05-30 13:21:22 +02:00
Tristan Darricau
ea7114e785
[ticket/13388] Fix coding style
...
PHPBB3-13388
2015-05-30 13:14:27 +02:00
Tristan Darricau
41efc55be9
[ticket/13896] Fix coding style
...
PHPBB3-13896
2015-05-30 12:27:31 +02:00
Marc Alexander
1ba86eaa8e
[ticket/13799] Correctly urlencode category and show selected avatar
...
PHPBB3-13799
2015-05-30 11:54:54 +02:00
Nils Adermann
f958d05aed
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13790] Update phpcs
Conflicts:
phpBB/composer.json
phpBB/composer.lock
2015-05-30 10:58:40 +02:00
Nils Adermann
01073ffcbf
Merge pull request #3560 from Nicofuma/ticket/13790
...
[ticket/13790] Update phpcs
2015-05-30 10:53:47 +02:00
Tristan Darricau
d129ee6c94
[ticket/13388] Fix deprecations
...
PHPBB3-13388
2015-05-29 16:53:54 +02:00
Tristan Darricau
80375c98f0
[ticket/13388] Fix rebase
...
PHPBB3-13388
2015-05-29 16:52:21 +02:00
Tristan Darricau
6656567424
[ticket/13388] Address comments
...
PHPBB3-13388
2015-05-29 16:48:51 +02:00
Tristan Darricau
66c0e0c6a8
[ticket/13388] Integrate routing and di parameters resolution
...
PHPBB3-13388
2015-05-29 16:48:51 +02:00
Tristan Darricau
86ad1a92c8
Merge pull request #3561 from s9e/ticket/10922
...
[ticket/10922] Added support for body and subject in email BBCode
2015-05-29 16:15:04 +02:00