Commit graph

4419 commits

Author SHA1 Message Date
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
Tristan Darricau
a3d46575c7 Merge pull request #3613 from nickvergessen/ticket/13844
Ticket/13844 Better FAQ language files
2015-05-29 15:44:39 +02:00
Tristan Darricau
f5dbc3b6f2 Merge pull request #3616 from s9e/ticket/13847
[ticket/13847] Move quote generation to text_formatter.utils
2015-05-29 15:42:14 +02:00
Tristan Darricau
3c3b099f88 Merge pull request #3622 from s9e/ticket/13860
[ticket/13860] Fixed array-to-string conversion
2015-05-29 13:15:33 +02:00
Tristan Darricau
835a2ebcb8 Merge pull request #3625 from s9e/ticket/11742
[ticket/11742] Remove tabs-to-space conversion in [code]
2015-05-29 13:03:12 +02:00
Nils Adermann
da68f62d4f Merge pull request #3554 from Nicofuma/ticket/13770
[ticket/13770] Wither interface for container_builder
2015-05-29 10:56:54 +02:00
Callum Macrae
be1d1c7d05 [ticket/13882] Lazy load the notification avatars.
This moves them further down the waterfall, making the page load
quicker.

PHPBB3-13882
2015-05-28 18:05:07 +02:00
Marc Alexander
ed064ce0f1 [ticket/13799] Do not rawurlencode category in gallery avatar
Otherwise the directory seperator will incorrectly be transformed to its
HTML replacement.

PHPBB3-13799
2015-05-28 15:36:27 +02:00