Commit graph

30449 commits

Author SHA1 Message Date
Andreas Fischer
0f707ddb99 Merge branch '3.1.x'
* 3.1.x:
  [3.0.x] Add changelog for 3.0.14 release.
  [3.0.x] Bump version numbers for 3.0.14-RC1 release.
  [3.0.x] Bumping version numbers to final for 3.0.14 releases.
2015-04-28 21:43:46 +02:00
Andreas Fischer
62abead26d Merge branch 'prep-release-3.1.4' into 3.1.x
* prep-release-3.1.4:
  [3.0.x] Add changelog for 3.0.14 release.
  [3.0.x] Bump version numbers for 3.0.14-RC1 release.
  [3.0.x] Bumping version numbers to final for 3.0.14 releases.
2015-04-28 21:42:39 +02:00
Andreas Fischer
969718fc91 Merge branch 'prep-release-3.0.14' into prep-release-3.1.4
* prep-release-3.0.14:
  [3.0.x] Add changelog for 3.0.14 release.
  [3.0.x] Bump version numbers for 3.0.14-RC1 release.
  [3.0.x] Bumping version numbers to final for 3.0.14 releases.

Conflicts:
	build/build.xml
	phpBB/docs/CHANGELOG.html
	phpBB/docs/INSTALL.html
	phpBB/includes/constants.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/imageset/imageset.cfg
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/prosilver/template/template.cfg
	phpBB/styles/prosilver/theme/theme.cfg
	phpBB/styles/subsilver2/imageset/imageset.cfg
	phpBB/styles/subsilver2/style.cfg
	phpBB/styles/subsilver2/template/template.cfg
	phpBB/styles/subsilver2/theme/theme.cfg
2015-04-28 21:40:23 +02:00
Andreas Fischer
6d8df7332c [3.0.x] Increment version number to 3.0.15-dev. 2015-04-28 20:40:20 +02:00
Andreas Fischer
d833f29069 [3.0.x] Add changelog for 3.0.14 release. 2015-04-28 18:57:03 +02:00
JoshyPHP
5c78be56ec [ticket/10922] Added test
PHPBB3-10922
2015-04-28 16:17:54 +02:00
Marc Alexander
46a789de5c [ticket/12542] Add initial drag-n-drop animation
PHPBB3-12542
2015-04-28 16:12:58 +02:00
JoshyPHP
d242610d0f [ticket/10922] Added test data
PHPBB3-10922
2015-04-28 15:36:51 +02:00
Matt Friedman
c818873d48 [ticket/11521] Add missing lang strings for migration exceptions
PHPBB3-11521
2015-04-28 00:02:42 -07:00
JoshyPHP
6dc14f4cf0 [ticket/10922] Added tests
PHPBB3-10922
2015-04-28 03:23:21 +02:00
JoshyPHP
3f54fd49b5 [ticket/10922] Replaced urlencode() with rawurlencode()
RFC-6068 asks for percent-encoding so that seems more correct.
Not sure about that one.

PHPBB3-10922
2015-04-28 02:53:40 +02:00
JoshyPHP
102b6c2df3 [ticket/10922] Added support for body and subject in email BBCode
PHPBB3-10922
2015-04-28 02:40:33 +02: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
6870293a9e Merge branch '3.1.x'
* 3.1.x:
  [ticket/13778] Update wording of the reCaptcha instructions
2015-04-27 22:56:35 +02:00
Andreas Fischer
7c2115d95a Merge branch '3.1.x'
* 3.1.x:
  [ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserver
2015-04-27 22:15:57 +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
Tristan Darricau
734b89e75c Merge pull request #3524 from marc1706/ticket/8672
[ticket/8672] Add class for retrieving imagesize without download
2015-04-27 16:26:40 +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
Andreas Fischer
e7d2977401 Merge pull request #3548 from s9e/ticket/12745
[ticket/12745] Allow Unicode characters from the SMP to be used in text

* s9e/ticket/12745:
  [ticket/12745] Added HTML entity test
  [ticket/12745] Added support for Unicode characters outside BMP
  [ticket/12745] Updated s9e\TextFormatter
2015-04-26 20:25:14 +02:00
Marc Alexander
03eae6fddd Merge branch '3.1.x' 2015-04-26 09:24:09 +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
JoshyPHP
98bdcd0cde [ticket/12745] Added HTML entity test
https://github.com/phpbb/phpbb/pull/3548#issuecomment-96219167

PHPBB3-12745
2015-04-25 23:43:38 +02:00
JoshyPHP
25acba2259 [ticket/12745] Added support for Unicode characters outside BMP
PHPBB3-12745
2015-04-25 23:43:32 +02:00
JoshyPHP
572a905c02 [ticket/12745] Updated s9e\TextFormatter
PHPBB3-12745
2015-04-25 23:42:54 +02:00
Andreas Fischer
3305885fc8 Merge branch '3.1.x'
* 3.1.x:
2015-04-25 18:19:49 +02: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
80d4fb1847 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
2015-04-25 18:11:19 +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
9088f44863 [ticket/8672] Update hash of lock file
PHPBB3-8672
2015-04-24 13:39:15 +02:00
Marc Alexander
55c5bc126d [ticket/8672] User $user->lang() instead of sprintf
PHPBB3-8672
2015-04-24 13:34:18 +02:00
Marc Alexander
31bcdb23a2 [ticket/8672] Remove unnecessary lines from clean-vendor-dir
The new version of fastImageSize already makes sure that these files
and/or folders do not exist.

PHPBB3-8672
2015-04-24 13:33:17 +02:00
Marc Alexander
2665e68592 [ticket/8672] Update fastImageSize to 1.0.2
PHPBB3-8672
2015-04-24 13:33:16 +02:00
Marc Alexander
19011cb842 [ticket/8672] Add fastImageSize to clean-vendor-dir in build.xml
PHPBB3-8672
2015-04-24 13:33:16 +02:00
Marc Alexander
0a6ac0226d [ticket/8672] Update fastImageSize to 1.0.1
PHPBB3-8672
2015-04-24 13:33:15 +02:00
Marc Alexander
f92d894470 [ticket/8672] Remove outdated imagesize class
PHPBB3-8672
2015-04-24 13:33:14 +02:00
Marc Alexander
39d6180c68 [ticket/8672] Use fastImageSize in classes
PHPBB3-8672
2015-04-24 13:33:14 +02:00