Commit graph

24721 commits

Author SHA1 Message Date
Andreas Fischer
d833f29069 [3.0.x] Add changelog for 3.0.14 release. 2015-04-28 18:57:03 +02:00
Marc Alexander
46a789de5c [ticket/12542] Add initial drag-n-drop animation
PHPBB3-12542
2015-04-28 16:12:58 +02:00
Matt Friedman
c818873d48 [ticket/11521] Add missing lang strings for migration exceptions
PHPBB3-11521
2015-04-28 00:02:42 -07:00
Andreas Fischer
ce74a0bd6c [3.0.x] Bump version numbers for 3.0.14-RC1 release. 2015-04-27 23:22:44 +02:00
Andreas Fischer
cd6c0427fb [3.0.x] Bumping version numbers to final for 3.0.14 releases. 2015-04-27 23:13:56 +02:00
Andreas Fischer
0bc352ea7e Merge pull request #3557 from VSEphpbb/ticket/13778
[ticket/13778] Update wording of the reCaptcha instructions

* VSEphpbb/ticket/13778:
  [ticket/13778] Update wording of the reCaptcha instructions
2015-04-27 22:56:35 +02:00
Andreas Fischer
78c0221855 Merge pull request #3555 from akoeplinger/ticket/12101
[ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserver

* akoeplinger/ticket/12101:
  [ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserver
2015-04-27 22:15:56 +02:00
javiexin
f80dc9dc16 [ticket/13786] Add events to add MCP post options
Three new events are included:
1) Core event to perform new moderator action in includes/mcp/mcp_post.php
2) Core event to add/modify template data in includes/mcp/mcp_post.php
3) Template event to present new options in template/mcp_post.html
Fix another typo.

PHPBB3-13786
2015-04-27 17:36:43 +02:00
javiexin
18e8f281be [ticket/13786] Add events to add MCP post options
Three new events are included:
1) Core event to perform new moderator action in includes/mcp/mcp_post.php
2) Core event to add/modify template data in includes/mcp/mcp_post.php
3) Template event to present new options in template/mcp_post.html
Fix typo.

PHPBB3-13786
2015-04-27 15:35:09 +02:00
javiexin
e98a5afd07 [ticket/13786] Add events to add MCP post options
Three new events are included:
1) Core event to perform new moderator action in includes/mcp/mcp_post.php
2) Core event to add/modify template data in includes/mcp/mcp_post.php
3) Template event to present new options in template/mcp_post.html

PHPBB3-13786
2015-04-27 13:21:23 +02:00
Matt Friedman
281661c23e [ticket/13778] Update wording of the reCaptcha instructions
PHPBB3-13778
2015-04-26 20:57:56 -07:00
Wolfsblvt
55a3d88793 [ticket/13787] Remove duplicate entry of poll_delete in prosilver template
When options are shown and poll delete is allowed, the option to
delete
polls is shown twice. This is fixed here by moving the if poll
delete
check out of the outer if, wich makes it also more consistent
with the
new event.

PHPBB3-13787
2015-04-27 02:27:29 +02:00
Alexander Köplinger
e25e411e2b [ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserver
The code was added as a workaround for bugs in very old versions of IIS,
dating back to 2002: see commit 849d766974.

Newer IIS versions handle the 'Location' header just fine, so we can avoid
the unnecessary HTML page for redirects. Given that it seems to work fine
since IIS 6.0 (on WinServer 2003), I don't think it's worth adding a special
check for earlier versions as they are no longer supported by MS as well.

PHPBB3-12101
2015-04-26 22:10:06 +02:00
Marc Alexander
59a178f3cb Merge pull request #3532 from prototech/ticket/13755
[ticket/13755] Ignore dots in path when determining file extension.
2015-04-26 09:24:03 +02:00
rxu
2308472eb0 [ticket/13779] Set new auth options to the role only if matching the role type
Migrations' permission tool allows setting permissions to the role which
doesn't match the role type, e.g. m_ permissions for u_ role types and so on.
As one of side effects, this may lead to granting users moderative/admin
permissions silently.
With this patch the only new permissions matching the role type will be set.

PHPBB3-13779
2015-04-26 11:57:02 +07:00
Andreas Fischer
887f83589f Merge branch 'prep-release-3.1.4' into 3.1.x
* prep-release-3.1.4:
2015-04-25 18:19:43 +02:00
Andreas Fischer
eae592691c Merge pull request #3550 from bantu/ticket/13765-3.1.4
[ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.

* bantu/ticket/13765-3.1.4:
  [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
2015-04-25 18:19:24 +02:00
Andreas Fischer
196eb98ba8 Merge branch '3.0.x' into 3.1.x
* 3.0.x:
2015-04-25 18:11:12 +02:00
Andreas Fischer
0fc70d4b15 Merge pull request #3550 from bantu/ticket/13765-3.1.4
[ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.

* bantu/ticket/13765-3.1.4:
  [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
2015-04-25 18:11:07 +02:00
Andreas Fischer
4d63032024 Merge pull request #3549 from bantu/ticket/13765
[ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.

* bantu/ticket/13765:
  [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
2015-04-25 18:10:45 +02:00
Andreas Fischer
901875a1fb Merge branch 'ticket/13765' into ticket/13765-3.1.4
* ticket/13765:
  [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.

Conflicts:
	phpBB/includes/functions.php
	phpBB/includes/startup.php
2015-04-25 17:41:17 +02:00
Joas Schilling
463c62df18 [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
PHPBB3-13765
2015-04-25 17:22:10 +02:00
Marc Alexander
c5178a19b2 [ticket/13564] Add tests for unlinking account upon deleting user
PHPBB3-13564
2015-04-25 15:48:24 +02:00
Marc Alexander
18fc621d73 [ticket/security-180] Add tests for redirecting to main URL
SECURITY-180
2015-04-23 15:27:30 +02:00
Andreas Fischer
552f35952a Merge pull request #3546 from brunoais/ticket/13772
[ticket/13772] Fix typo in phpbb\passwords\manager::__construct()

* brunoais/ticket/13772:
  [ticket/13772] Fix typo in phpbb\passwords\manager::__construct()
2015-04-22 15:15:08 +02:00
RMcGirr83
a53b57c8a2 [ticket/13759] Take post_time into account
PHPBB3-13759
2015-04-21 06:11:13 -04:00
brunoais
8769f185f5 [ticket/13772] Fix typo in phpbb\passwords\manager::__construct()
PHPBB3-13772
2015-04-21 10:00:30 +01:00
Matt Friedman
4a7f905c6a [ticket/13771] Allow AJAX errors to support exceptions messages
PHPBB3-13771
2015-04-21 00:19:41 -07:00
Andreas Fischer
c46024bfa2 Merge pull request #3537 from RMcGirr83/ticket/13763
[ticket/13763] Fix typo in extension lang file

* RMcGirr83/ticket/13763:
  [ticket/13763] Fix typo in extension lang file
2015-04-16 13:38:48 +02:00
Richard McGirr
60f31d48e2 [ticket/13763] Fix typo in extension lang file
PHPBB3-13763
2015-04-15 07:35:42 -04:00
rxu
615e5c1076 [ticket/13745] Add viewtopic.php core events to allow manipulating poll data
PHPBB3-13745
2015-04-15 14:12:49 +07:00
Dhruv Goel
ba1e3fd661 Merge pull request #3533 from Elsensee/ticket/13756
[ticket/13756] Fix resize after upload with plupload
2015-04-14 09:09:14 +05:30
Oliver Schramm
366dfce846 [ticket/13756] Add test for generate_resize_string()
PHPBB3-13756
2015-04-12 14:20:07 +02:00
Oliver Schramm
70c74df009 [ticket/13756] Fix resize after upload with plupload
PHPBB3-13756
2015-04-11 23:08:45 +02:00
Joas Schilling
ee658bfe7b [ticket/security-180] Always fail when redirecting to an insecure URL
SECURITY-180
2015-04-11 17:08:28 +02:00
Marc Alexander
bca1b96b2e [ticket/security-180] Make sure that redirect goes to full URL plus slash
SECURITY-180
2015-04-11 16:41:20 +02:00
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
fcc7e7d333 Merge branch 'prep-release-3.1.4' into 3.1.x 2015-04-10 09:53:58 +02:00
Joas Schilling
073f3e4470 [prep-release-3.1.4] Add changelog for 3.1.4-RC1 2015-04-09 21:11:08 +02:00
Matt Friedman
ef0838e931 [ticket/13753] Fix event documentation
PHPBB3-13753
2015-04-09 12:00:33 -07:00
Joas Schilling
bc04581b80 [prep-release-3.1.4] Add migration for 3.1.4-RC1 2015-04-09 20:28:28 +02:00
Joas Schilling
313a224c68 Update version to 3.1.4-RC1 2015-04-09 20:26:12 +02:00
Matt Friedman
96339b7c86 [ticket/13753] Add template events to forum category row headers
PHPBB3-13753
2015-04-09 11:04:25 -07:00
rxu
b0f5ef0b1a [ticket/13752] Add viewonline.php core event to allow modifying forum data SQL
PHPBB3-13752
2015-04-09 23:20:07 +07:00
Richard McGirr
77c2b2a51d [ticket/13598] Allow topic lock on topic creation
PHPBB3-13598
2015-04-09 08:44:40 -04:00
Oliver Schramm
17620bba46 Merge pull request #3525 from marc1706/ticket/13749
[ticket/13749] Add missing slash to base uri in helper route tests
2015-04-06 23:54:27 +02:00
Marc Alexander
9d181daa71 [ticket/13749] Add missing slash to base uri in helper route tests
PHPBB3-13749
2015-04-06 22:59:34 +02:00
Joas Schilling
53ed8a3cd9 Merge pull request #3392 from marc1706/ticket/13493
[ticket/13493] Append page name to base url if it doesn't contain it
2015-04-06 16:54:35 +02:00