makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
25783 commits 18 branches 192 tags 207 MiB
Commit graph

25783 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Matt Friedman
281661c23e [ticket/13778] Update wording of the reCaptcha instructions 
PHPBB3-13778
 2015-04-26 20:57:56 -07: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
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
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
Marc Alexander
3fc7a352ff [ticket/8672] Add fast-image-size library to composer.json 
PHPBB3-8672
 2015-04-24 13:33:13 +02:00
JoshyPHP
245d042e43 [ticket/8672] Updated the text_formatter.s9e service 
PHPBB3-8672
 2015-04-24 13:31:37 +02:00
Marc Alexander
2fa99602c6 [ticket/8672] Add class for retrieving imagesize without download 
getimagesize() always downloads the complete file before checking
the actual image dimensions. This class will be able to do the same
without having to download possibly large files.

PHPBB3-8672
 2015-04-24 13:31:36 +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
746a33b57b Merge pull request #3541 from s9e/ticket/13767 
[ticket/13767] Remove vendor/s9e/text-formatter/.git during build

* s9e/ticket/13767:
  [ticket/13767] Remove vendor/s9e/text-formatter/.git during build
 2015-04-22 23:31:40 +02:00
Andreas Fischer
b334121eeb Merge pull request #3547 from s9e/ticket/13774 
[ticket/13774] Update s9e\TextFormatter

* s9e/ticket/13774:
  [ticket/13774] Updated s9e\TextFormatter
 2015-04-22 23:22:19 +02:00
JoshyPHP
72596429bd [ticket/13774] Updated s9e\TextFormatter 
PHPBB3-13774
 2015-04-22 22:35:47 +02:00
Andreas Fischer
eba5b59533 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13772] Fix typo in phpbb\passwords\manager::__construct()
 2015-04-22 15:15:09 +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
Andreas Fischer
6381c5a731 Merge pull request #3544 from Nicofuma/ticket/13768 
[ticket/13768] Update to symfony 2.8.*@dev

* Nicofuma/ticket/13768:
  [ticket/13768] Fix deprecations
  [ticket/13768] Update to symfony 2.8.*@dev
 2015-04-22 14:01:20 +02:00
brunoais
8769f185f5 [ticket/13772] Fix typo in phpbb\passwords\manager::__construct() 
PHPBB3-13772
 2015-04-21 10:00:30 +01:00
Tristan Darricau
de5a5c41f8 [ticket/13768] Fix deprecations 
PHPBB3-13768
 2015-04-19 17:41:29 +02:00
Tristan Darricau
9939ced81f [ticket/13768] Update to symfony 2.8.*@dev 
PHPBB3-13768
 2015-04-19 17:33:06 +02:00
JoshyPHP
14333f6ebc [ticket/13767] Remove vendor/s9e/text-formatter/.git during build 
PHPBB3-13767
 2015-04-19 13:54:21 +02:00
Tristan Darricau
ecc65f564d Merge pull request #3539 from MateBartus/ticket/13766 
[ticket/13766] Add style_parent_id in textformater's data_access::get_st...
 2015-04-17 00:07:04 +02:00