1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-04 14:47:52 +02:00

9602 Commits

Author SHA1 Message Date
Tristan Darricau
5442a25967 Merge pull request #4182 from marc1706/ticket/14481
[ticket/14481] Respect HTTP_X_FORWARDED headers for implying https

* marc1706/ticket/14481:
  [ticket/14481] Add tests for x_forwarded_proto header
  [ticket/14481] Use port 443 if https is specified in x-forwarded-proto
  [ticket/14481] Respect HTTP_X_FORWARDED headers for implying https
2016-03-27 12:56:03 +02:00
Tristan Darricau
640070e133 Merge pull request #3874 from lavigor/ticket/14134
[ticket/14134] Send warning notification PM in user's language.

* lavigor/ticket/14134:
  [ticket/14134] Fix Okay in a comment.
  [ticket/14134] Fix code comments.
  [ticket/14134] Send warning notification PM in user's language.
2016-03-26 18:59:31 +01:00
lavigor
18a4505b23 [ticket/14134] Fix Okay in a comment.
PHPBB3-14134
2016-03-25 23:11:43 +03:00
Tristan Darricau
7f9ba9849b Merge pull request #4190 from marc1706/ticket/14437
[ticket/14437] Correctly assume index from attachment display order

* marc1706/ticket/14437:
  [ticket/14437] Make sure attachments array is properly ordered before processing
  [ticket/14437] Preserve attachment ID order by ordering by attach_id
  [ticket/14437] Sort attachments after assigning inline attachments
  [ticket/14437] Correctly assume index from attachment display order
2016-03-25 11:48:29 +01:00
Tristan Darricau
2168cb7f8e Merge pull request #4231 from Senky/ticket/13630
[ticket/13630] Prevent empty parameter select_single

* Senky/ticket/13630:
  [ticket/13630] Prevent empty parameter select_single
2016-03-25 11:20:06 +01:00
Marc Alexander
826b338275 [ticket/14290] Correctly use modified since header
PHPBB3-14290
2016-03-24 18:09:51 +01:00
Marc Alexander
244d171cb0 [ticket/14136] Add back X-UA-Compatible meta tag
This was previously removed without needing to. Adding it back to force
users to not emulate the page for previous versions of IE. The
imagetoolbar http-equiv tag was not restored as IE does not contain that
anymore since IE7. Also, the chome=1 has been removed from the
X-UA-Compatible content as ChromeFrame does not receive any further
updates since 2014 and is potentially broken.

PHPBB3-14136
2016-03-24 16:07:07 +01:00
Jakub Senko
f77142c0b6 [ticket/13630] Prevent empty parameter select_single
PHPBB3-13630
2016-03-20 16:58:35 +01:00
Marc Alexander
9bcf8df5d0 Merge pull request #4184 from lavigor/ticket/14486
[ticket/14486] Add an event and fix an event in login_box()
2016-03-10 12:18:47 +01:00
Máté Bartus
5e84d47a03 Merge pull request #4205 from marc1706/ticket/13264
[ticket/13264] Do not force approved state if post visibility is known
2016-03-09 19:39:29 +01:00
Marc Alexander
dd115d1896 [ticket/13264] Link to post if user can view it
PHPBB3-13264
2016-03-08 15:25:45 +01:00
Marc Alexander
d461ee4f5c [ticket/13264] Do not force approved state if post visibility is known
Post visibility is used if it is set to a valid value.

PHPBB3-13264
2016-03-07 22:18:26 +01:00
Marc Alexander
62a2619300 [ticket/14483] Do not send headers by default on access via controller
PHPBB3-14483
2016-03-06 21:10:42 +01:00
Marc Alexander
3d7d0c40b8 [ticket/14437] Make sure attachments array is properly ordered before processing
PHPBB3-14437
2016-03-06 11:22:53 +01:00
Marc Alexander
1e10664739 [ticket/14437] Sort attachments after assigning inline attachments
This does not seem to cause any issues but prevents us from having to consider
the currenty display order.

PHPBB3-14437
2016-03-06 00:14:47 +01:00
Marc Alexander
a4040e53b7 Merge pull request #4153 from gn36/ticket/14443
[ticket/14443] Introduce additional parameter to messenger
2016-02-28 10:15:41 +01:00
lavigor
40bd4c8b72 [ticket/14486] Use empty() and move error check.
PHPBB3-14486
2016-02-27 20:05:59 +03:00
Martin Beckmann
5d579631d7 [ticket/14443] substr($var, 0, 1) -> $var[0]
PHPBB3-14443
2016-02-27 15:17:17 +01:00
lavigor
276d48ed4f [ticket/14134] Fix code comments.
PHPBB3-14134
2016-02-27 16:55:05 +03:00
Marc Alexander
747a70964e Merge pull request #4086 from rxu/ticket/14366
[ticket/14366] Add core events to the function decode_message()
2016-02-27 11:41:50 +01:00
Marc Alexander
ee7cba5df7 Merge pull request #4085 from rxu/ticket/14365
[ticket/14365] Add core event to the function topic_review()
2016-02-27 11:04:52 +01:00
rxu
cd3b93b9e2 [ticket/14366] Add core events to the function decode_message()
Remove match/replace vars, use alternative var for the message var,
update the target phpBB version.

PHPBB3-14366
2016-02-27 12:08:58 +07:00
rxu
2076280947 [ticket/14365] Fix a typo in the docblock.
PHPBB3-14365
2016-02-27 11:55:41 +07:00
Jakub Senko
ec70ec96e7 [ticket/14189] Add core.gen_sort_selects_after event
PHPBB3-14189
2016-02-26 23:10:18 +01:00
Marc Alexander
c5c2f7f7d0 [ticket/14437] Correctly assume index from attachment display order
PHPBB3-14437
2016-02-21 14:10:45 +01:00
Marc Alexander
bd12427fd4 [ticket/13681] Invalidate and reset opcache where necessary
PHPBB3-13681
2016-02-18 19:03:56 +01:00
lavigor
4b4584bcd4 [ticket/14486] Add an event and fix an event in login_box()
PHPBB3-14486
2016-02-18 19:22:11 +03:00
Marc Alexander
9eedf29021 [ticket/14481] Use port 443 if https is specified in x-forwarded-proto
PHPBB3-14481
2016-02-16 16:33:19 +01:00
Joas Schilling
17e21d5140 [3.1.x] Increase dev version for 3.1.9 2016-02-13 18:01:32 +01:00
Joas Schilling
9590ff3c18 Merge pull request #4176 from Elsensee/ticket/14409
[ticket/14409] Update session page info before displaying online list
2016-02-13 16:45:04 +01:00
Joas Schilling
4f07a0bafb Merge pull request #4177 from marc1706/ticket/14475
[ticket/14475] Do not log removal of users from newly registered group
2016-02-13 16:40:16 +01:00
Oliver Schramm
1bd4895d7a [ticket/14409] Update session page info before displaying online list
PHPBB3-14409
2016-02-13 15:58:05 +01:00
Marc Alexander
6d57136264 [ticket/14475] Do not log removal of users from newly registered group
PHPBB3-14475
2016-02-13 15:36:38 +01:00
Joas Schilling
3e8a62f309 [prep-release-3.1.8] Update version to 3.1.8-RC1 2016-02-13 14:52:57 +01:00
Marc Alexander
f2f9ce544f Merge pull request #4141 from exussum12/ticket/14431-3.1
[ticket/14431] Remote avatar uploading
2016-02-03 10:29:39 +01:00
Scott Dutton
366a92c36a [ticket/14430] Remote avatar uploading
Remove support for redirects

PHPBB3-14431
2016-02-03 05:33:45 +00:00
Martin Beckmann
a35314c6ea [ticket/14443] Avoid duplicate slashes
PHPBB3-14443
2016-02-02 20:30:57 +01:00
Martin Beckmann
fdd5a18763 [ticket/14443] Introduce additional parameter to messenger
PHPBB3-14443
2016-02-01 23:11:39 +01:00
rxu
68abcb9058 [ticket/14439] Do not call avatar manager if avatars are disabled
PHPBB3-14439
2016-01-31 23:45:24 +07:00
Scott Dutton
610048cc6d [ticket/14431] Remote avatar uploading
Allow HTTPS images to be remotely uploaded.
Also includes support for redirects (currently up to 5)

PHPBB3-14431
2016-01-25 20:11:18 +00:00
lavigor
5832698f4f [ticket/14423] Display database size for Aria storage engine
PHPBB3-14423
2016-01-20 21:34:30 +03:00
Marc Alexander
12a10de0d1 Merge pull request #4122 from lavigor/ticket/12441
[ticket/12441] Correct database size detection in MariaDB 10
2016-01-16 23:18:13 +01:00
lavigor
fef03a1946 [ticket/14412] Comment fixes for PHPDoc in the events
PHPBB3-14412
2016-01-15 14:07:50 +03:00
lavigor
b34dbc2e84 [ticket/12441] Correct database size detection in MariaDB 10
PHPBB3-12441
2016-01-14 12:29:17 +03:00
Marc Alexander
826d6aac74 Merge pull request #3929 from kilianr/ticket/12618
[ticket/12618] Allow extension author to use SSL for version-check.
2016-01-12 04:11:56 +01:00
Joas Schilling
fd5e66cbf1 Merge branch 'prep-release-3.1.7' into 3.1.x
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
2016-01-09 18:42:07 +01:00
Joas Schilling
89da4e8bf7 [prep-release-3.1.7] Update version to 3.1.7-pl1 2016-01-09 09:35:03 +01:00
Joas Schilling
c2d59b3352 Merge pull request #24 from phpbb/ticket/security-188
[ticket/security-188] Check form key in acp_bbcodes
2016-01-09 09:13:50 +01:00
kasimi
80c32fb7ef [ticket/14343] Added missing $phpbb_dispatcher
PHPBB3-14343
2016-01-09 09:13:20 +01:00
Oliver Schramm
a7648b0eaa [ticket/14397] Fix @since tag in event 'core.ucp_prefs_view_after'
PHPBB3-14397
2016-01-08 17:04:18 +01:00