Commit graph

10320 commits

Author SHA1 Message Date
Tristan Darricau
cd348b200a Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/11483] Add tests for generating user act key on force reactivate
  [ticket/11483] Generate user act key if database entry is empty
2016-11-06 15:41:59 +01:00
Tristan Darricau
dc32b900c5 Merge pull request #4486 from marc1706/ticket/11483
[ticket/11483] Generate user act key if database entry is empty

* github.com:phpbb/phpbb:
  [ticket/11483] Add tests for generating user act key on force reactivate
  [ticket/11483] Generate user act key if database entry is empty
2016-11-06 15:41:46 +01:00
Marc Alexander
f658e062b2
Merge branch '3.1.x' into 3.2.x 2016-10-28 21:06:21 +02:00
Marc Alexander
85898d3d2c
Merge pull request #4489 from rxu/ticket/14830
[ticket/14830] Fix FORM_INVALID error during some ACP setting operations
2016-10-28 19:36:49 +02:00
Marc Alexander
466bdee8e6 [ticket/14823] Move check_form_key() inside actual save data step
PHPBB3-14823
2016-10-28 21:37:00 +07:00
Tristan Darricau
b8ef36ddb1
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14818] Optimize generate_board_url function
2016-10-24 23:08:09 +02:00
Tristan Darricau
e3a85ff0a7
Merge pull request #4487 from gmixo/patch-2
[ticket/14818] Optimize generate_board_url function

* gmixo/patch-2:
  [ticket/14818] Optimize generate_board_url function
2016-10-24 23:08:06 +02:00
rxu
a41b16d06a [ticket/14830] Fix FORM_INVALID error on cpf settings changing
PHPBB3-14830
2016-10-24 23:22:00 +07:00
Marc Alexander
2a038d45df
Merge branch '3.1.x' into 3.2.x 2016-10-23 11:48:56 +02:00
Marc Alexander
3cb09358fe
Merge pull request #4490 from kasimi/ticket/14827
[ticket/14827] Fix adding multiple form keys
2016-10-23 11:48:53 +02:00
rxu
8afa9fdf28 [ticket/14830] Fix FORM_INVALID error during AСP search index deletion
PHPBB3-14830
2016-10-21 01:23:45 +07:00
rxu
eca10dc08f [ticket/14830] Fix FORM_INVALID error on search backend changing
PHPBB3-14830
2016-10-21 01:23:44 +07:00
rxu
8e54c9ef8b [ticket/14830] Fix link hash checking case
PHPBB3-14830
2016-10-21 01:23:43 +07:00
rxu
832a87b924 [ticket/14830] Fix FORM_INVALID error during AXP search index creation/deletion
PHPBB3-14830
2016-10-21 01:23:43 +07:00
kasimi
f02afe58bc
[ticket/14827] Possibility to add multiple form keys
PHPBB3-14827
2016-10-19 22:42:52 +02:00
MIkhail Gulyaev
868d55913d [ticket/14818] Optimize generate_board_url function
if $config['force_server_vars'] no need to calculate $request
2016-10-17 12:54:08 +07:00
Marc Alexander
20148e4d06
[ticket/11483] Generate user act key if database entry is empty
The force reactivation action in the ACP will no longer overwrite the
generated activation key in case the key stored in the database is empty.
It will also save the generated key back to the database to actually allow
the activation by the user.

PHPBB3-11483
2016-10-16 11:16:06 +02:00
Marc Alexander
1dd0ceabf6
Merge branch 'prep-release-3.1.10' into 3.1.x 2016-10-12 21:40:59 +02:00
Tristan Darricau
7bb4e88acd
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [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:20:54 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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