Commit graph

10537 commits

Author SHA1 Message Date
Tristan Darricau
1ad64f89b8
Merge pull request #4471 from dsinn/ticket/14802
[ticket/14802] Empty/blank lines should not be additional poll options

* dsinn/ticket/14802:
  [ticket/14802] Add test for empty/blank lines in poll options
  [ticket/14802] Empty/blank lines should not be additional poll options
2016-10-03 20:05:49 +02:00
Daniel Sinn
59b52d6312 [ticket/14804] Merge remote-tracking branch 'upstream/3.1.x' into ticket/14804
PHPBB3-14804
2016-10-03 10:24:30 -04:00
Marc Alexander
cb226f83be
[prep-release-3.1.10] Update version numbers for 3.1.10 2016-10-02 21:06:56 +01:00
Tristan Darricau
bd71c3d8e2
Merge branch '3.2.x'
* 3.2.x:
  [ticket/14789] Remove obsolete check_form_key() and add missing hashes
  [ticket/14789] Move form key checks to where they actually do something
2016-10-02 17:18:35 +02:00
Tristan Darricau
5075090d4f
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14789] Remove obsolete check_form_key() and add missing hashes
  [ticket/14789] Move form key checks to where they actually do something
2016-10-02 17:18:32 +02:00
Tristan Darricau
6b798d02fb
Merge branch 'prep-release-3.1.10' into 3.1.x
* prep-release-3.1.10:
  [ticket/14789] Remove obsolete check_form_key() and add missing hashes
  [ticket/14789] Move form key checks to where they actually do something
2016-10-02 17:18:22 +02:00
Marc Alexander
c30a2b27a5
Merge branch '3.2.x' 2016-10-01 16:58:15 +01:00
Marc Alexander
328a7afcc3
Merge branch '3.1.x' into 3.2.x 2016-10-01 16:58:07 +01:00
Marc Alexander
4e5f29a21b
[ticket/14789] Remove obsolete check_form_key() and add missing hashes
PHPBB3-14789
2016-09-30 23:26:04 +01:00
Marc Alexander
88d7c4fe57
[ticket/14789] Move form key checks to where they actually do something
PHPBB3-14789
2016-09-30 22:32:54 +01:00
Daniel Sinn
32d569c594 [ticket/14804] Fix undefined $topic_data after trying to port 3.2 changes to 3.1
PHPBB3-14804
2016-09-30 16:34:11 -04:00
Daniel Sinn
c6383d3f89 [ticket/14804] Rename event to mcp_forum_merge_topics_after; update @since
PHPBB3-14804
2016-09-30 15:58:10 -04:00
Daniel Sinn
1d25c80a9c [ticket/14804] Add core event to MCP after merging topics
Renamed $topic_data and defined $to_topic_data in order to avoid ambiguity
and to stop overwriting a variable.

PHPBB3-14804
2016-09-30 15:23:17 -04:00
Daniel Sinn
0b3951cb81 [ticket/14802] Empty/blank lines should not be additional poll options
PHPBB3-14802
2016-09-29 14:43:36 -04:00
Jakub Senko
c588332aa5 [ticket/14795] Merge topic views when merging topics
PHPBB3-14795
2016-09-25 19:49:01 +02:00
Tristan Darricau
a713f5159a
Merge branch '3.2.x'
* 3.2.x:
  [ticket/10809] Reflect MSSQL removal in docs files
  [ticket/10809] Remove MSSQL support
2016-09-25 17:19:18 +02:00
Tristan Darricau
de2c70127f
Merge pull request #4265 from Senky/ticket/10809
[ticket/10809] Remove MSSQL support

* Senky/ticket/10809:
  [ticket/10809] Reflect MSSQL removal in docs files
  [ticket/10809] Remove MSSQL support
2016-09-25 17:19:13 +02:00
Marc Alexander
51d830a6d3
[3.1.x] Increase version for 3.1.11 development 2016-09-24 21:39:47 +02:00
Marc Alexander
2f17757f4e
[prep-release-3.1.10] Update version to 3.1.10-RC1 2016-09-24 14:50:46 +02:00
Marc Alexander
1b57fed387
Merge branch '3.2.x' 2016-09-24 10:28:42 +02:00
Marc Alexander
1fff455862
Merge branch '3.1.x' into 3.2.x 2016-09-24 10:28:39 +02:00
Marc Alexander
18f9c9f6e2
Merge pull request #3527 from Elsensee/ticket/13709
[ticket/13709] Add fallback for email templates used by extensions
2016-09-24 10:28:37 +02:00
Marc Alexander
b15517e700
Merge branch '3.2.x' 2016-09-23 21:10:29 +02:00
Marc Alexander
9a64bffd68
Merge pull request #4459 from rxu/ticket/14794
[ticket/14794] Adjust redirect() behavior for PHP 7.1+ compatibility
2016-09-23 21:10:26 +02:00
Marc Alexander
bbb1ff325b
Merge branch '3.2.x' 2016-09-23 20:55:24 +02:00
rxu
a5ccdc7997 [ticket/14794] Adjust redirect() behavior for PHP 7.1+ compatibility
PHPBB3-14794
2016-09-23 19:47:05 +07:00
rxu
35c62d1e74 [ticket/14793] Fix "A non-numeric value encountered" PHP warning on PHP 7.1+
PHPBB3-14793
2016-09-22 22:29:18 +07:00
Tristan Darricau
3c2b7d026b
Merge branch '3.2.x'
* 3.2.x:
  [ticket/14789] Add form tokens to tests and uncomment add_form_key
  [ticket/14789] Add link hashes and form tokens to all acp links/buttons
2016-09-18 21:17:18 +02:00
Tristan Darricau
19bbbfe0f3
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14789] Add form tokens to tests and uncomment add_form_key
  [ticket/14789] Add link hashes and form tokens to all acp links/buttons
2016-09-18 21:14:47 +02:00
Marc Alexander
72f6241aa2
[ticket/14789] Add form tokens to tests and uncomment add_form_key
PHPBB3-14789
2016-09-18 15:30:25 +02:00
Marc Alexander
585a3ed863
[ticket/14789] Add link hashes and form tokens to all acp links/buttons
This will further harden the ACP security by adding link hashes to links and
form tokens to forms that did not have these yet and result in modified
settings or write action on the filesystem or database. These few links and
forms were still relying on the global ACP protection, mainly due to them
not posing further risks of compromising data. After this change these will
now also be properly protected against tampering.

PHPBB3-14789
2016-09-18 15:29:50 +02:00
Marc Alexander
3fdeb74e02
Merge branch '3.2.x' 2016-09-18 13:08:55 +02:00
Marc Alexander
631b0f2dba
Merge branch '3.1.x' into 3.2.x 2016-09-18 13:08:35 +02:00
Marc Alexander
c3578bc3e3
Merge pull request #4442 from rxu/ticket/14781
[ticket/14781] Add core event to the function group_user_attributes()
2016-09-18 13:07:47 +02:00
Marc Alexander
ce3d46c19a
Merge branch '3.2.x' 2016-09-17 16:27:57 +02:00
Marc Alexander
e76ea47fb8
Merge branch '3.1.x' into 3.2.x 2016-09-17 16:27:25 +02:00
Marc Alexander
bf397cb985
Merge pull request #4398 from wesleyfok/ticket/14638-3.1.x
Ticket/14638 3.1.x New UCP hooks for subscriptions
2016-09-17 13:04:32 +02:00
Marc Alexander
ea4a0e3439
Merge branch '3.2.x' 2016-09-17 13:00:24 +02:00
Marc Alexander
b0ff957684
Merge branch '3.1.x' into 3.2.x 2016-09-17 12:59:56 +02:00
Marc Alexander
73b9327631
Merge pull request #4403 from rxu/ticket/14738
[ticket/14738] Add core events to improve modifying forum lists
2016-09-17 12:58:18 +02:00
Crizzo
29b1b95226 [ticket/14780] Only use $max_setting in this function
PHPBB3-14780
2016-09-15 22:44:34 +02:00
Crizzo
b9761f116d [ticket/14780] Correct if sentence to let group setting overwrite global
PHPBB3-14780
2016-09-12 21:17:58 +02:00
rxu
43c52b073b [ticket/14781] Add core event to the function group_user_attributes()
PHPBB3-14781
2016-09-12 13:44:33 +07:00
Tristan Darricau
d9aea27c75
Merge branch '3.2.x'
* 3.2.x:
  [ticket/14774] Support partial downloads of attachments
2016-09-11 13:59:08 +02:00
Tristan Darricau
1a187e0607
Merge pull request #4440 from danchr/ticket/14774
[ticket/14774] Support partial downloads of attachments

* danchr/ticket/14774:
  [ticket/14774] Support partial downloads of attachments
2016-09-11 13:59:06 +02:00
Marc Alexander
38866f927c Merge branch '3.2.x' 2016-09-09 23:39:25 +02:00
Marc Alexander
14cc4f3ae2 Merge branch '3.1.x' into 3.2.x 2016-09-09 23:39:23 +02:00
Dan Villiom Podlaski Christiansen
d2750b650f [ticket/14774] Support partial downloads of attachments
phpBB already had limited support for partial downloads, but only for
resuming downloads, disregarding any range ending before EOF.

WebKit on iOS and OS X uses partial downloads when fetching media
files. Previously, only MP3 attachments could play directly in the
browser, reported as a live stream, but with this change, all
supported media formats should render as expected.

Tested using cURL by verifying that partial downloads give exactly the
same results compared to Apache.

PHPBB3-14774
2016-09-07 03:58:33 +02:00
Dan Villiom Podlaski Christiansen
ce48b4de57 [ticket/12133] fix download file names for WebKit-derived browsers
All browser engines that descend from WebKit declare themselves as
Safari in the user agent, including Chrome. Currently, the code
assumes that any Safari-like browser cannot handle the RFC-compliant
filename syntax. At least for recent versions of Safari, this is no
longer the case, and the legacy syntax results in URI-quoted
filenames. Using the standard syntax works as expected in both Safari
9 and Chrome 45.

The ticket reporting this issue is from January 2014, so we can safely
ignore compatibility: any browser still relying on the previous
behaviour is unlikely to receive security updates.

PHPBB3-12133
2016-09-07 03:17:44 +02:00
Marc Alexander
d13ef57ff4 Merge branch '3.2.x' 2016-09-06 21:45:52 +02:00