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

20928 commits

Author SHA1 Message Date
Andreas Fischer
aa0c55ed8f Merge branch 'prep-release-3.1.4' into 3.1.x 
* prep-release-3.1.4:
  [ticket/security-180] Use language variable for redirect error in 3.1+
  [ticket/security-180] Merge if statement with previous one in 3.1.x
  [ticket/security-180] Add tests for redirecting to main URL
  [ticket/security-180] Always fail when redirecting to an insecure URL
  [ticket/security-180] Make sure that redirect goes to full URL plus slash
  [ticket/security-180] Check if redirect URL contains board URL
 2015-04-28 22:17:37 +02:00
Marc Alexander
d7c96cc60c [ticket/security-180] Use language variable for redirect error in 3.1+ 
SECURITY-180
 2015-04-28 22:12:04 +02:00
Marc Alexander
416728fc17 Merge branch 'ticket/security-180' into ticket/security-180-asc 
Conflicts:
	tests/security/redirect_test.php
 2015-04-28 22:12:03 +02:00
Marc Alexander
ec207d0a71 [ticket/security-180] Merge if statement with previous one in 3.1.x 
SECURITY-180
 2015-04-28 22:08:19 +02:00
Marc Alexander
89723b17d9 Merge branch 'ticket/security-180' into ticket/security-180-asc 
Conflicts:
	tests/security/redirect_test.php
 2015-04-28 22:08:15 +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
d833f29069 [3.0.x] Add changelog for 3.0.14 release. 2015-04-28 18:57:03 +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
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
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
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
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
brunoais
8769f185f5 [ticket/13772] Fix typo in phpbb\passwords\manager::__construct() 
PHPBB3-13772
 2015-04-21 10:00:30 +01:00
Richard McGirr
60f31d48e2 [ticket/13763] Fix typo in extension lang file 
PHPBB3-13763
 2015-04-15 07:35:42 -04: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
073f3e4470 [prep-release-3.1.4] Add changelog for 3.1.4-RC1 2015-04-09 21:11:08 +02: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
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
Joas Schilling
02202b1503 Merge pull request #3492 from RMcGirr83/ticket/13710 
[ticket/13710] Allow template events near smilies display
 2015-04-06 14:44:37 +02:00
Joas Schilling
b16a56394b Merge pull request #3488 from Crizz0/ticket/13701 
[ticket/13701] Adds two new events to posting_pm_layout.html

Conflicts:
	phpBB/docs/events.md
 2015-04-06 14:42:59 +02:00
Joas Schilling
7d08bf5b3e Merge pull request #3517 from Wolfsblvt/ticket/13739 
[ticket/13739] Add template core event posting_poll_body_options_after
 2015-04-06 14:26:35 +02:00
Tristan Darricau
73a0988f59 Merge pull request #3458 from nickvergessen/ticket/8494 
[ticket/8494] Ignore errors from the database schema preparation
 2015-04-06 11:47:46 +02:00
Joas Schilling
90025ae3e7 Merge pull request #3437 from marc1706/ticket/12368 
[ticket/12368] Correctly check if avatars migration is installed
 2015-04-06 11:36:00 +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
Joas Schilling
c60497f009 Merge pull request #3402 from brunoais/ticket/13621 
[ticket/13621] Prepend $where_sql and postpend closing bracket on statements with return
 2015-04-06 11:13:33 +02:00
Joas Schilling
009a8cb2d5 Merge pull request #3333 from marc1706/ticket/13522 
[ticket/13522] Remove empty answers from possible answers in Q&A
 2015-04-06 11:04:35 +02:00
Joas Schilling
9ab27fe129 Merge pull request #3284 from Elsensee/ticket/13469 
[ticket/13469] Fall back to soft_delete if no permissions for delete
 2015-04-06 10:59:33 +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
Marc Alexander
558d604d83 Merge pull request #3518 from marc1706/ticket/13703 
[ticket/13703] Use correct avatar path for PHPBB_USE_BOARD_URL_PATH
 2015-04-04 11:04:29 +02:00
Kevin Roy
ddff81c21f [ticket/13742] Use correct avatar path for local avatar 
Prior to this change, the path might have been incorrect when using
PHPBB_USE_BOARD_URL_PATH.

PHPBB3-13742
 2015-04-03 23:08:26 +02:00
Kevin Roy
a875802c06 [ticket/13703] Use correct avatar path for PHPBB_USE_BOARD_URL_PATH 
This change makes the uploaded avatars use the PHPBB_USE_BOARD_URL_PATH
constant, which is needed when trying to use the get_user_avatar()
function in a listener for index changes.

PHPBB3-13703
 2015-04-03 23:04:52 +02:00
Wolfsblvt
1d34968967 [ticket/13739] Add template core event posting_poll_body_options_after 
Fixing order of if statement and event

PHPBB3-13739
 2015-04-03 19:20:16 +02:00
Wolfsblvt
284a5671c5 [ticket/13739] Add template core event posting_poll_body_options_after 
Fixing if else construct in prosilver so that the event is placed correctly

PHPBB3-13739
 2015-04-03 18:56:53 +02:00
Joas Schilling
71177c38dc Merge pull request #3515 from cyberalien/ticket/13741 
Ticket/13741 Remove outdated comments and references in css files
 2015-04-03 18:56:15 +02:00
Wolfsblvt
d5021aeda4 [ticket/13739] Add template core event posting_poll_body_options_after 
Template event added for the poll options while posting a topic
so that you may add additional options for polls.

PHPBB3-13739
 2015-04-03 17:02:43 +02:00
Marc Alexander
55f6329c1d Merge pull request #3467 from dragosvr92/patch-5 
[ticket/13602] Adding a new event overall_header_navbar_before
 2015-04-03 16:48:26 +02:00
cyberalien
e120e6ac97 [ticket/13741] Remove outdated references to tweaks.css 
PHPBB3-13741
 2015-04-03 11:14:20 +03:00
cyberalien
9f54d2b590 [ticket/13741] Remove reference to unused body font-size declaration 
Remove reference to font-size declaration that is no longer used in prosilver

PHPBB3-13741
 2015-04-03 11:04:47 +03:00
cyberalien
6c308d81bd [ticket/13741] Remove reference to oudated rollover code that no longer exists 
Rollover code referenced in that comment has been removed in 3.1

PHPBB3-13741
 2015-04-03 11:03:47 +03:00