Commit graph

10537 commits

Author SHA1 Message Date
Cesar G
47514ca2df [ticket/13755] Ignore dots in path when determining file extension.
PHPBB3-13755
2015-04-10 16:23:51 -07:00
Marc Alexander
eed355b798 [ticket/security-180] Check if redirect URL contains board URL
SECURITY-180
2015-04-10 18:10:32 +02:00
Joas Schilling
a151ad912a [3.1.x] Update development version to 3.1.5-dev 2015-04-10 09:56:20 +02:00
Joas Schilling
313a224c68 Update version to 3.1.4-RC1 2015-04-09 20:26:12 +02:00
Richard McGirr
77c2b2a51d [ticket/13598] Allow topic lock on topic creation
PHPBB3-13598
2015-04-09 08:44:40 -04:00
MateBartus
cc29638bcc [ticket/13636] Fix coding style
PHPBB3-13636
2015-04-06 13:15:39 +02:00
Joas Schilling
34b768cfaf Merge branch '3.1.x' 2015-04-06 11:31:58 +02:00
Joas Schilling
23db98276f Merge pull request #3409 from Senky/ticket/11424
[ticket/11424] Quick-Mod Tools race condition results in NO_MODE
2015-04-06 11:31:53 +02:00
Tristan Darricau
3a6a61a8dd Merge pull request #3461 from s9e/ticket/11768
[3.2][ticket/11768] Integrate s9e\TextFormatter
2015-04-05 23:32:38 +02:00
Tristan Darricau
5ac13c7ddc Merge branch '3.1.x' 2015-04-05 23:22:41 +02:00
Tristan Darricau
30cf75a011 Merge pull request #3430 from MateBartus/ticket/12466
[ticket/12466] Move classes from acp_database.php to their own files
2015-04-05 20:13:38 +02:00
rxu
3521e74939 [ticket/13743] Add $phpbb_root_path and $phpEx definitions in message_parser.php
message_parser.php performs include of bbcode.php at the very start using
$phpbb_root_path and $phpEx vars, so there's a possibility those can be
undefined at that point, especially when message_parser.php is being included
in event listener or another extension file where $phpbb_root_path and $phpEx
don't exist. This can be fixed by adding the appropriate vars definitions.

PHPBB3-13743
2015-04-05 18:48:43 +07:00
JoshyPHP
718ace2121 [ticket/11768] Updated annotation [ci skip]
PHPBB3-11768
2015-04-02 19:16:03 +02:00
JoshyPHP
37106bae7a [ticket/11768] Reverted change to bbcode_uid
On the off-chance some other routine expect bbcode_uid to never be empty.

PHPBB3-11768
2015-04-02 19:16:03 +02:00
JoshyPHP
ec77ff7838 [ticket/11768] Invalidate the text_formatter cache whenever a style is installed
The acp_styles module purges the cache every time a style is uninstalled,
modified or made default, but it does not purge the cache when a new style
is installed. Here we invalidate the text_formatter cache (not purge the
whole cache) so that new styles take effect immediately.

PHPBB3-11768
2015-04-02 19:16:03 +02:00
JoshyPHP
cfbf02bcba [ticket/11768] Re-added the code that got lost in rebase
PHPBB3-11768
2015-04-02 19:16:01 +02:00
s9e
147a713cc0 [ticket/11768] This commit integrates s9e\TextFormatter
This commit integrates s9e\TextFormatter as outlined in
http://area51.phpbb.com/phpBB/viewtopic.php?f=108&t=44467

PHPBB3-11768
2015-04-02 19:16:01 +02:00
Nicofuma
a3f7e0f441 Merge branch '3.1.x' 2015-03-29 19:50:58 +02:00
Nicofuma
d9f4964d91 Merge pull request #3376 from marc1706/ticket/13568-asc
[ticket/13568] Validate imagick path as readable absolute path

closes #3376
2015-03-29 19:50:19 +02:00
Nicofuma
b9db47e3f5 Merge pull request #3359 from marc1706/ticket/13568
[ticket/13568] Validate imagick path as readable absolute path

closes #3359
2015-03-29 19:41:13 +02:00
Nicofuma
9e66a10bac Merge branch '3.1.x' 2015-03-24 23:57:26 +01:00
Nicofuma
50b3c2b49e Merge pull request #3398 from marc1706/ticket/13612
[ticket/13612] Run meta refresh until extension is fully enabled
2015-03-24 23:32:29 +01:00
Nicofuma
9a5aefd4c2 Merge branch '3.1.x' 2015-03-24 23:20:03 +01:00
Marc Alexander
2e7a60d986 [ticket/13564] Try to unlink user account for every auth provider
PHPBB3-13564
2015-03-24 17:09:52 +01:00
Cesar G
0bc2f9f242 [ticket/13698] Pass parameters for link in LOGIN_ERROR_PASSWORD error message.
LOGIN_ERROR_PASSWORD may be returned as the message if the password is invalid
while hitting the LOGIN_ERROR_ATTEMPTS error.

PHPBB3-13698
2015-03-23 17:52:17 -07:00
Cesar G
8a6e3f208a Merge branch '3.1.x'
* 3.1.x:
  [ticket/13719] Remove superfluous $search_options in acp_search.
2015-03-23 09:43:43 -07:00
brunoais
754b5d6349 [ticket/13719] Remove superfluous $search_options in acp_search.
PHPBB3-13719
2015-03-23 12:58:05 +00:00
brunoais
94da39cd88 [ticket/13660] Fix @since version.
PHPBB3-13660
2015-03-10 15:42:07 +00:00
Marc Alexander
6f3ca35ae7 Merge branch '3.1.x' 2015-03-10 15:20:28 +01:00
Marc Alexander
3cb1907e76 Merge pull request #3445 from RMcGirr83/ticket/13650
[ticket/13650] Move core event
2015-03-10 15:20:26 +01:00
Marc Alexander
3a4e1ce215 Merge branch '3.1.x' 2015-03-07 21:23:59 +01:00
Marc Alexander
2348580255 Merge pull request #3452 from RobertHeim/ticket/13658
[ticket/13658] add event before and after topics are deleted
2015-03-07 21:23:57 +01:00
Marc Alexander
5e7560845b Merge branch '3.1.x' 2015-03-06 14:36:22 +01:00
Marc Alexander
d7f4715b96 Merge pull request #3473 from RMcGirr83/ticket/13675
[ticket/13675] Add validate to acp_profile event and add template events
2015-03-06 14:36:20 +01:00
Marc Alexander
bd22b8319b Merge branch '3.1.x' 2015-03-06 14:30:14 +01:00
Marc Alexander
3d7def4196 Merge pull request #3450 from brunoais/ticket/13142
[ticket/13142] Before query to get the total number of reports
2015-03-06 14:30:11 +01:00
Marc Alexander
2eb7c21ae0 Merge branch '3.1.x' 2015-03-06 13:50:44 +01:00
Marc Alexander
d087d85618 Merge pull request #3426 from kinerity/ticket/13637
[ticket/13637] Add core.ucp_pm_compose_alter_vars PHP event
2015-03-06 13:50:18 +01:00
Richard McGirr
6b87e06292 [ticket/13675] Add validate to acp_profile event and add template events
for acp users profile

PHPBB3-13675
2015-03-06 07:26:35 -05:00
brunoais
4cdcb6d5d3 [ticket/13672] Allow changing the data from the user-submitted report
PHPBB3-13672
2015-03-05 18:31:11 +00:00
Kailey Truscott
0f13635fb8 [ticket/13637] Update msg_id docblock
Change topic_id to post_id

PHPBB3-13637
2015-03-05 13:28:19 -05:00
brunoais
8a6d55520d [ticket/13668] Allow changing the query to obtain the user-submitted report.
PHPBB3-13668
2015-03-05 16:21:23 +00:00
brunoais
fa474c4378 [ticket/13668] Convert the mcp report_details query to a built query
PHPBB3-13668
2015-03-05 16:19:36 +00:00
Marc Alexander
f85d49aada Merge branch '3.1.x' 2015-03-05 15:47:04 +01:00
Marc Alexander
8f09ff210f Merge pull request #3413 from kasimi/ticket/13540
[ticket/13540] Add topic info and total posts count to mcp_topic_review_modify_row event
2015-03-05 15:46:33 +01:00
Marc Alexander
7c26cd25c7 Merge pull request #3434 from nickvergessen/ticket/13647
[ticket/13647] Move FAQ page to a controller
2015-03-05 15:25:30 +01:00
brunoais
21cc1fda85 [ticket/13664] Added alias to table to make modding easier.
PHPBB3-13664
2015-03-01 20:57:06 +00:00
brunoais
5fa6871ebf [ticket/13664] Add event to allow changing number of unapproved posts listed
PHPBB3-13664
2015-03-01 20:26:12 +00:00
brunoais
5ad69bbecf [ticket/13664] From string query in mcp_front unapproved posts to built query
PHPBB3-13664
2015-03-01 19:55:43 +00:00
brunoais
8b23272c33 [ticket/13660] Allow changing the query for total reports in mcp_front
PHPBB3-13660
2015-02-28 08:57:43 +00:00