Commit graph

25744 commits

Author SHA1 Message Date
Andreas Fischer
271e8b43f9 Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14782] Use the $select variable in "Your Posts" search
2016-09-15 19:30:44 +02:00
Andreas Fischer
32ba128ea5 Merge pull request #4444 from DavidIQ/ticket/14782
[ticket/14782] Use the $select variable in "Your Posts" search

* DavidIQ/ticket/14782:
  [ticket/14782] Use the $select variable in "Your Posts" search
2016-09-15 19:30:29 +02:00
Marc Alexander
53d96f66e5
Merge branch '3.2.x' 2016-09-14 20:51:42 +02:00
Marc Alexander
142f937354
Merge branch '3.1.x' into 3.2.x 2016-09-14 20:51:13 +02:00
Marc Alexander
70aa4407d3
Merge remote-tracking branch 'VSEphpbb/ticket/14783' into 3.1.x 2016-09-14 20:49:13 +02:00
Matt Friedman
5503c09cd5 [ticket/14783] Add template event before custom BBCodes in ACP
PHPBB3-14783
2016-09-14 10:37:27 -07:00
Marc Alexander
c571d99c0f Merge pull request #4441 from Nicofuma/ticket/14769
[ticket/14769] Fix CLI installer configuration compatibility with SF 3
2016-09-13 21:39:59 +02:00
DavidIQ
6d589a8bb9 [ticket/14782] Use the $select variable in "Your Posts" search 2016-09-13 14:10:50 -04:00
Tristan Darricau
6d7d7d4c0f
Revert "Deploy on Heroku"
This reverts commit 89842299d7.
2016-09-13 01:04:26 +02:00
Tristan Darricau
89842299d7
Deploy on Heroku 2016-09-13 01:01:01 +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
Tristan Darricau
b8260cadf0
[ticket/14769] Fix CLI installer configuration compatibility with SF 3
PHPBB3-14769
2016-09-11 13:41:33 +02:00
Marc Alexander
6f31d334e0 Merge branch '3.2.x' 2016-09-11 11:08:41 +02:00
Marc Alexander
316b69805b Merge branch '3.1.x' into 3.2.x
Conflicts:
	phpBB/styles/subsilver2/template/posting_body.html
2016-09-11 11:08:24 +02:00
Marc Alexander
4b8e8df55c Merge pull request #4371 from imkingdavid/ticket/14695
[ticket/14695] Add posting_editor_subject_prepend/append template events
2016-09-11 11:07:48 +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
Marc Alexander
dccb5564d2 Merge pull request #4438 from danchr/ticket/12133
[ticket/12133] fix download file names for WebKit-derived browsers
2016-09-09 23:39:20 +02:00
Marc Alexander
0fdb72dd29 Merge branch '3.2.x' 2016-09-07 21:25:35 +02:00
Marc Alexander
0aa289e4d9 Merge branch '3.1.x' into 3.2.x
Conflicts:
	phpBB/styles/subsilver2/template/mcp_topic.html
2016-09-07 21:25:17 +02:00
Marc Alexander
857a085496 Merge pull request #4428 from rmcgirr83/ticket/14755
[ticket/14755] Fix max length in mcp topic html file
2016-09-07 21:24:29 +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
66e481c501 Merge branch '3.2.x' 2016-09-06 21:50:28 +02:00
Marc Alexander
051323dbc6 Merge branch '3.1.x' into 3.2.x 2016-09-06 21:50:25 +02:00
Marc Alexander
2efdaaa0e2 Merge pull request #4426 from bantu/ticket/14109
[ticket/14109] Increase MySQL Version for InnoDB FULLTEXT Index to 5.…
2016-09-06 21:50:22 +02:00
Marc Alexander
d13ef57ff4 Merge branch '3.2.x' 2016-09-06 21:45:52 +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
f6b376def8 [ticket/14764] Implements feedback to wording in install db updater
PHPBB3-14764
2016-09-05 20:57:28 +02:00
Marc Alexander
b8423ed6ff Merge branch '3.2.x' 2016-09-04 17:47:57 +02:00
Marc Alexander
a4f42ced3d Merge pull request #4436 from rxu/ticket/14765
[ticket/14765] Fix the typo in the installer routing config
2016-09-04 17:47:51 +02:00
rxu
a01c773fa2 [ticket/14765] Fix the typo in the installer routing config
PHPBB3-14765
2016-09-03 22:13:34 +07:00
Tristan Darricau
a94cb72b8e
Merge branch '3.2.x'
* 3.2.x:
  [ticket/14763] Specify correct class for local files class type
2016-09-03 14:54:05 +02:00
Jakub Senko
64178b40b8 [ticket/14747] Add post_data to core.modify_posting_auth
PHPBB3-14747
2016-09-03 11:11:55 +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
Marc Alexander
62e8ba3d49 [ticket/14763] Specify correct class for local files class type
PHPBB3-14763
2016-09-02 21:08:06 +02:00
Tristan Darricau
c61465dbe7
Merge branch '3.2.x'
* 3.2.x:
  [ticket/14727] Event core.search_modify_submit_parameters

 Conflicts:
	phpBB/search.php
2016-09-01 16:25:13 +02:00
Tristan Darricau
08f558d8f7
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14727] Event core.search_modify_submit_parameters
2016-09-01 16:24:07 +02:00
Tristan Darricau
65921a7891
Merge pull request #4396 from ErnadoO/ticket/14727
[ticket/14727] Event core.search_modify_submit_parameters

* ErnadoO/ticket/14727:
  [ticket/14727] Event core.search_modify_submit_parameters
2016-09-01 16:23:50 +02:00
Tristan Darricau
e6be2e558f
Merge branch '3.2.x'
* 3.2.x:
  [ticket/10961] Send HTTP 403 when applicable
2016-09-01 14:54:06 +02:00
Tristan Darricau
0c91160856
Merge pull request #4412 from Senky/ticket/14573
[ticket/14573] Extend breadcrumb to support more pages

* Senky/ticket/14573:
  [ticket/14573] Add Whoisonline breadcrumbs
  [ticket/14573] Add Memberlist breadcrumbs
  [ticket/14573] Add MCP breadcrumbs
  [ticket/14573] Add UCP breadcrumbs
  [ticket/14573] Add Search breadcrumbs
  [ticket/14573] Add FAQ breadcrumbs
2016-09-01 14:50:15 +02:00
Jakub Senko
4b6c2c8cde [ticket/10961] Send HTTP 403 when applicable
PHPBB3-10961
2016-09-01 08:48:37 +02:00
Marc Alexander
7a9f8ddee9 Merge branch '3.2.x' 2016-08-31 21:42:15 +02:00
Marc Alexander
dff950162c Merge branch '3.1.x' into 3.2.x
Conflicts:
	phpBB/phpbb/db/migration/tool/module.php
2016-08-31 21:41:17 +02:00
Marc Alexander
f008708d5c Merge pull request #4377 from rxu/ticket/14703
[ticket/14703] Fix parent module selection for custom extension modules
2016-08-31 21:39:09 +02:00
Tristan Darricau
9e53c7e0c3
Merge branch '3.2.x'
* 3.2.x:
  [ticket/14673] Changes wrong language variable in mcp_forum
2016-08-31 19:08:27 +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