aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-171-6/+123
|\
| * Merge pull request #4398 from wesleyfok/ticket/14638-3.1.xMarc Alexander2016-09-171-6/+123
| |\ | | | | | | | | | Ticket/14638 3.1.x New UCP hooks for subscriptions
| | * [ticket/14638] Rollback changes from 3.2.x versionWesley Fok2016-08-031-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Merge remote-tracking branch 'upstream/3.1.x' into ticket/14638-3.1.xWesley Fok2016-08-0354-687/+545
| | |\
| | * | [ticket/14638] New UCP hooks for subscriptionsWesley Fok2016-08-031-15/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-173-11/+59
|\ \ \ \ | |/ / /
| * | | Merge pull request #4403 from rxu/ticket/14738Marc Alexander2016-09-173-11/+59
| |\ \ \ | | | | | | | | | | | | | | | [ticket/14738] Add core events to improve modifying forum lists
| | * | | [ticket/14738] Add core events to improve modifying forum listsrxu2016-08-073-11/+59
| | | | | | | | | | | | | | | | | | | | PHPBB3-14738
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-171-4/+108
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4406 from rmcgirr83/ticket/14581Marc Alexander2016-09-171-4/+108
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14581] Add core events to content_visibility
| | * | | | [ticket/14581] Add core events to content_visibilityRichard McGirr2016-08-101-4/+108
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Events added for both changing the content visibility for both posts and topics, executing right before and after the SQL UPDATE query for setting the visibillity. https://tracker.phpbb.com/browse/PHPBB3-14581 PHPBB3-14581
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-171-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4449 from DavidIQ/ticket/14782Marc Alexander2016-09-171-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14782] Don't use 'DISTINCT' when using 'SQL_CALC_FOUND_ROWS'
| | * | | | [ticket/14782] Don't use 'DISTINCT' when using 'SQL_CALC_FOUND_ROWS'DavidIQ2016-09-161-1/+1
| | | | | |
* | | | | | Merge branch '3.1.x' into 3.2.xAndreas Fischer2016-09-151-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14782] Use the $select variable in "Your Posts" search
| * | | | | Merge pull request #4444 from DavidIQ/ticket/14782Andreas Fischer2016-09-151-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14782] Use the $select variable in "Your Posts" search * DavidIQ/ticket/14782: [ticket/14782] Use the $select variable in "Your Posts" search
| | * | | | [ticket/14782] Use the $select variable in "Your Posts" searchDavidIQ2016-09-131-1/+1
| | | | | |
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-142-0/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'VSEphpbb/ticket/14783' into 3.1.xMarc Alexander2016-09-142-0/+8
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | [ticket/14783] Add template event before custom BBCodes in ACPMatt Friedman2016-09-142-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14783
* | | | | | Merge pull request #4440 from danchr/ticket/14774Tristan Darricau2016-09-112-50/+110
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14774] Support partial downloads of attachments * danchr/ticket/14774: [ticket/14774] Support partial downloads of attachments
| * | | | | | [ticket/14774] Support partial downloads of attachmentsDan Villiom Podlaski Christiansen2016-09-072-50/+110
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-112-1/+19
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/posting_body.html
| * | | | | Merge pull request #4371 from imkingdavid/ticket/14695Marc Alexander2016-09-113-2/+26
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14695] Add posting_editor_subject_prepend/append template events
| | * | | | | [ticket/14695] Add posting_editor_subject_append/prepend subsilver2 to events.mdDavid King2016-08-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per request in PR. PHPBB3-14695
| | * | | | | [ticket/14695] Added posting_editor_subject_append/prepend events to subsilverDavid King2016-08-091-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per request in PR. PHPBB3-14695
| | * | | | | [ticket/14695] Put posting_editor_subject_append/prepend events on newlinesDavid King2016-08-091-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per request in the PR. PHPBB3-14695
| | * | | | | [ticket/14695] Updated version number in events.mdDavid King2016-06-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14695
| | * | | | | [ticket/14695] Add posting_editor_subject_prepend/append template eventsDavid King2016-06-252-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14695
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-091-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #4438 from danchr/ticket/12133Marc Alexander2016-09-091-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12133] fix download file names for WebKit-derived browsers
| | * | | | | | [ticket/12133] fix download file names for WebKit-derived browsersDan Villiom Podlaski Christiansen2016-09-071-1/+1
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-071-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/mcp_topic.html
| * | | | | | Merge pull request #4428 from rmcgirr83/ticket/14755Marc Alexander2016-09-072-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14755] Fix max length in mcp topic html file
| | * | | | | | [ticket/14755] Fix subsilver2Richard McGirr2016-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14755
| | * | | | | | [ticket/14755] Fix max length in mcp topic html fileRMcGirr832016-08-301-1/+1
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move posts does not accept a topic number greater than 999999 topic_id set in both posts table and topics table accepts 10 digits https://tracker.phpbb.com/browse/PHPBB3-14755 PHPBB3-14755
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-062-2/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #4426 from bantu/ticket/14109Marc Alexander2016-09-062-2/+4
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | [ticket/14109] Increase MySQL Version for InnoDB FULLTEXT Index to 5.…
| | * | | | | [ticket/14109] Increase MySQL Version for InnoDB FULLTEXT Index to 5.6.8.Andreas Fischer2016-08-282-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is required for proper overall database operation. In previous versions, InnoDB might error on ALTER statements when multiple FULLTEXT Indexes are defined. PHPBB3-14109
* | | | | | | Merge pull request #4435 from Crizz0/ticket/14764Marc Alexander2016-09-062-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14764] Wrong link to database update script has been fixed
| * | | | | | | [ticket/14764] Implements feedback to wording in install db updaterCrizzo2016-09-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14764
| * | | | | | | [ticket/14764] Wrong link to database update script has been fixedCrizzo2016-09-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14764
* | | | | | | | Merge pull request #4436 from rxu/ticket/14765Marc Alexander2016-09-041-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14765] Fix the typo in the installer routing config
| * | | | | | | | [ticket/14765] Fix the typo in the installer routing configrxu2016-09-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14765
* | | | | | | | | Merge pull request #4434 from marc1706/ticket/14763Tristan Darricau2016-09-031-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14763] Specify correct class for local files class type * marc1706/ticket/14763: [ticket/14763] Specify correct class for local files class type
| * | | | | | | | [ticket/14763] Specify correct class for local files class typeMarc Alexander2016-09-021-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14763
* | | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-09-011-0/+20
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14727] Event core.search_modify_submit_parameters
| * | | | | | | Merge pull request #4396 from ErnadoO/ticket/14727Tristan Darricau2016-09-011-0/+20
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14727] Event core.search_modify_submit_parameters * ErnadoO/ticket/14727: [ticket/14727] Event core.search_modify_submit_parameters
| | * | | | | | | [ticket/14727] Event core.search_modify_submit_parametersErwan Nader2016-07-311-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14727
* | | | | | | | | Merge pull request #4340 from Senky/ticket/10961Tristan Darricau2016-09-0126-0/+98
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/10961] Send HTTP 403 when applicable * Senky/ticket/10961: [ticket/10961] Send HTTP 403 when applicable