1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00

10282 Commits

Author SHA1 Message Date
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
Marc Alexander
801519ca4d Merge pull request #4435 from Crizz0/ticket/14764
[ticket/14764] Wrong link to database update script has been fixed
2016-09-06 21:45:49 +02:00
Crizzo
86752fc6df [ticket/14764] Wrong link to database update script has been fixed
PHPBB3-14764
2016-09-02 22:05:37 +02:00
Jakub Senko
4b6c2c8cde [ticket/10961] Send HTTP 403 when applicable
PHPBB3-10961
2016-09-01 08:48:37 +02:00
Tristan Darricau
05e6ed04ed
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14673] Changes wrong language variable in mcp_forum
2016-08-31 19:08:11 +02:00
Crizzo
429ecb938c [ticket/14673] Changes wrong language variable in mcp_forum
PHPBB3-14673
2016-08-22 21:23:01 +02:00
Marc Alexander
43762950bc Merge pull request #4418 from Elsensee/ticket/14636
[ticket/14636] Restore BC with compatibility functions
2016-08-21 18:57:33 +02:00
Oliver Schramm
cd2649273b [ticket/14636] Inject into set_config methods
PHPBB3-13573
PHPBB3-14636
2016-08-21 13:14:54 +02:00
Marc Alexander
06bfae8edb Merge branch '3.1.x' into 3.2.x 2016-08-21 09:51:26 +02:00
Oliver Schramm
e4671c1521 [ticket/14636] Restore BC with request_var
PHPBB3-14636
2016-08-20 03:30:17 +02:00
Jakub Senko
c016e09ca4 [ticket/12925] Pluralize permanent delete checkbox label
PHPBB3-12925
2016-08-15 18:27:33 +02:00
rxu
3bf64de247 [ticket/14738] Add core events to improve modifying forum lists
PHPBB3-14738
2016-08-07 16:10:49 +07:00
Wesley Fok
3038bf5eaf [ticket/14638] Rollback changes from 3.2.x version
Mistakenly brought in the modified 3.2.x version verbatim instead of diffing
against the 3.1.x version of ucp_main.php. Removed any changes I didn't
explicitly make.

PHPBB3-14638
2016-08-03 13:27:06 -04:00
Wesley Fok
ba13832085 Merge remote-tracking branch 'upstream/3.1.x' into ticket/14638-3.1.x 2016-08-03 13:20:42 -04:00
Wesley Fok
2081a78095 [ticket/14638] New UCP hooks for subscriptions
Adds various event hooks to the Manage subscriptions page of the User
Control Panel. core.ucp_subscribed_post_data allows us to handle
additional post data from the form that unwatches subscriptions.
core.ucp_main_subscribed_forums_modify_query,
core.ucp_main_topiclist_count_modify_query and
core.ucp_main_topiclist_modify_query all modify the queries used to get
the list of subscribed forums and subscribed/bookmarked topics.
core.ucp_main_subscribed_forum_modify_template_vars and
core.ucp_main_topiclist_topic_modify_template_vars modify the template
variable array associated with each subscribed forum and topic row.

This is a backport to 3.1.x of the code in PR #4318.

PHPBB3-14638
2016-08-03 13:18:43 -04:00
Marc Alexander
3d4660a703 Merge branch '3.1.x' into 3.2.x 2016-08-01 20:42:13 +02:00
Oliver Schramm
f222f8a84a [ticket/14721] Avoid renaming deleted users
PHPBB3-14721
2016-08-01 00:26:47 +02:00
Marc Alexander
d3f017c149 Merge branch '3.1.x' into 3.2.x 2016-07-17 15:54:15 +02:00
rxu
a840d70bbf [ticket/14713] Add core event to the admin function get_forum_list()
PHPBB3-14713
2016-07-17 12:40:21 +07:00
Marc Alexander
b14c088ce7 Merge branch '3.1.x' into 3.2.x 2016-07-16 19:49:28 +02:00
Marc Alexander
6f109dd1ef Merge pull request #4374 from TheKigen/ticket/14616
[ticket/14616] Fixed auto-prune failing on large forums
2016-07-16 19:49:25 +02:00
Wesley Fok
d53f75f668 [ticket/14709] add post_id to mod log
Add the missing post_id value to the moderator log entry created upon
deleting one or more posts in the MCP topic view.

PHPBB3-14709
2016-07-13 12:00:06 -04:00
Marc Alexander
45ba2e9770 Merge branch '3.1.x' into 3.2.x
Conflicts:
	phpBB/install/install_install.php
	phpBB/language/en/install.php
2016-07-07 19:19:40 +02:00
Marc Alexander
55b854906d Merge pull request #4342 from Senky/ticket/14654
[ticket/14654] Change Imagemagick to ImageMagick
2016-07-07 19:15:33 +02:00
Max Krivanek
1c52968df6 [ticket/14616] Switch prune limit to sql_query_limit instead of sql_and
PHPBB3-14616
2016-07-06 23:00:35 -05:00
Marc Alexander
24b80d6bd7 Merge pull request #4375 from bantu/ticket/14692
[ticket/14692] Remove duplicate subexpression in questionnaire.php
2016-07-06 19:30:22 +02:00
Marc Alexander
bb83af0a0a Merge branch '3.1.x' into 3.2.x 2016-07-06 19:24:02 +02:00
Marc Alexander
cddb884be6 Merge pull request #4354 from Stanzilla/smtp_explain
[ticket/14184] Add a _EXPLAIN translation entry for the SMTP server option
2016-07-06 19:23:54 +02:00
kilida
8829772631 [ticket/14692] Remove duplicate subexpression in questionnaire.php
Subexpression `($ip_address_ary[0] == '192' && $ip_address_ary[1] == '168')`
was repeated.

PHPBB3-14692
2016-07-02 10:35:27 +02:00
Max Krivanek
c4b93c9c1c [ticket/14616] Added comma expected by test scripts.
PHPBB3-14616
2016-07-01 04:09:42 -05:00
Max Krivanek
65a4f0d631 [ticket/14616] Added prune_limit to event core.prune_sql
PHPBB3-14616
2016-06-28 20:47:46 -05:00
Tristan Darricau
37cf178c0c
[Release 3.2.0-RC1] Update version to 3.2.0-RC2-dev 2016-06-27 21:58:31 +02:00
Tristan Darricau
dbf02b4514
Merge remote-tracking branch 'upstream/prep-release-3.2.0-RC1' into 3.2.x
* upstream/prep-release-3.2.0-RC1:
  [prep-release-3.2.0-RC1] Update changelog
  [prep-release-3.2.0-RC1] Add migration
  [prep-release-3.2.0-RC1] Update schema.json
  [prep-release-3.2.0-RC1] Update version to 3.2.0-RC1
2016-06-27 21:54:41 +02:00
Max Krivanek
9170261885 [ticket/14616] Removed misplaced tab.
PHPBB3-14616
2016-06-27 04:42:01 -05:00
Max Krivanek
f75a01182f [ticket/14616] Fixed auto-prune failing on large forums
PHPBB3-14616
2016-06-27 04:20:12 -05:00
rxu
1a0e40489f [ticket/14690] Create email queue cache file in the current env cache folder
PHPBB3-14690
2016-06-23 01:20:45 +07:00
rxu
fa878f2818 [ticket/14660] Remove redundant empty line in ucp_profile.php
PHPBB3-14660
2016-06-20 14:28:22 +07:00