aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3881 from VSEphpbb/ticket/14142Marc Alexander2015-09-082-2/+2
|\ | | | | | | [ticket/14142] Remove unused ignore_configs from avatar drivers
| * [ticket/14142] Remove unused ignore_configs from avatar driversMatt Friedman2015-09-042-2/+2
| | | | | | | | PHPBB3-14142
* | [ticket/14143] Flush the mail queue when writing itTristan Darricau2015-09-051-0/+2
| | | | | | | | PHPBB3-14143
* | Merge pull request #3877 from Nicofuma/ticket/14140Andreas Fischer2015-09-051-167/+201
|\ \ | | | | | | | | | | | | | | | | | | [ticket/14140] Update Symfony to 2.3.32 * Nicofuma/ticket/14140: [ticket/14140] Update SYmfony to 2.3.32
| * | [ticket/14140] Update SYmfony to 2.3.32Tristan Darricau2015-09-031-167/+201
| | | | | | | | | | | | PHPBB3-14140
* | | Merge branch 'prep-release-3.1.6' into 3.1.xJoas Schilling2015-09-051-0/+31
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| * | [prep-release-3.1.6] Add migration for 3.1.6Joas Schilling2015-09-051-0/+31
| | |
| * | [prep-release-3.1.6] Update version for final 3.1.6 releaseJoas Schilling2015-09-052-2/+2
| | |
* | | Merge pull request #3855 from VSEphpbb/ticket/14123Tristan Darricau2015-09-022-2/+8
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | [ticket/14123] Add descriptive help to the CLI help output * VSEphpbb/ticket/14123: [ticket/14123] Fix typo [ticket/14123] Remove redundant help messages [ticket/14123] Add descriptive help to the CLI help output
| * | [ticket/14123] Fix typoMatt Friedman2015-08-281-2/+2
| | | | | | | | | | | | PHPBB3-14123
| * | [ticket/14123] Remove redundant help messagesMatt Friedman2015-08-2815-95/+6
| | | | | | | | | | | | PHPBB3-14123
| * | [ticket/14123] Add descriptive help to the CLI help outputMatt Friedman2015-08-2316-1/+96
| | | | | | | | | | | | PHPBB3-14123
* | | Merge pull request #3853 from marc1706/ticket/14075Tristan Darricau2015-09-023-0/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14075] Add template event after poll preview panel * marc1706/ticket/14075: [ticket/14075] Update version to 3.1.7-RC1 [ticket/14075] Add template event after poll preview panel
| * | | [ticket/14075] Update version to 3.1.7-RC1Marc Alexander2015-08-251-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14075
| * | | [ticket/14075] Add template event after poll preview paneljaviexin2015-08-223-0/+11
| | | | | | | | | | | | | | | | PHPBB3-14075
* | | | Merge pull request #3860 from kinerity/ticket/14126Tristan Darricau2015-09-023-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14126] Add viewtopic_topic_title_after template event * kinerity/ticket/14126: [ticket/14126] Add viewtopic_topic_title_after template event
| * | | | [ticket/14126] Add viewtopic_topic_title_after template eventKailey Truscott2015-08-243-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add content directly after the topic title link on the View topic screen (outside of the h2 HTML tag). PHPBB3-14126
* | | | | Merge pull request #3872 from Zoddo/ticket/11468Tristan Darricau2015-09-021-2/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11468] Allow controllers to set paramters of page_header() * Zoddo/ticket/11468: [ticket/11468] Allow controllers to set paramters of page_header()
| * | | | | [ticket/11468] Allow controllers to set paramters of page_header()Zoddo2015-08-301-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11468
* | | | | | Merge pull request #3765 from Zoddo/ticket/13950Tristan Darricau2015-09-012-0/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13950] Hide undefined permissions * Zoddo/ticket/13950: [ticket/13950] Hide undefined categories [ticket/13950] Hide undefined permissions
| * | | | | | [ticket/13950] Hide undefined categoriesZoddo2015-08-282-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This hides the categories added by disabled extensions PHPBB3-13950
| * | | | | | [ticket/13950] Hide undefined permissionsZoddo2015-08-282-0/+16
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This hides the permissions of the disabled extensions PHPBB3-13950
* | | | | | [ticket/14133] Comment fix for phpbb_get_user_rank()lavigor2015-08-311-1/+1
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-14133
* | | | | Merge pull request #3764 from Zoddo/ticket/13988Tristan Darricau2015-08-281-4/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13988] Use absolute path for image attachments in feeds * Zoddo/ticket/13988: [ticket/13988] Update tests [ticket/13988] Use absolute path for image attachments in feeds
| * | | | | [ticket/13988] Use absolute path for image attachments in feedsCarstenF2015-07-151-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, atom feeds use relative links for image attachments PHPBB3-13988
* | | | | | Merge pull request #3835 from rxu/ticket/14106Tristan Darricau2015-08-281-9/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14106] Fix topics sorting in MCP for topics merging. * rxu/ticket/14106: [ticket/14106] Fix topics sorting in MCP for topics merging.
| * | | | | | [ticket/14106] Fix topics sorting in MCP for topics merging.rxu2015-08-161-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "bug" in the deleted code comment is non-existent now. The PR is for 3.1 only. PHPBB3-14106
* | | | | | | Merge pull request #3802 from Oyabun1/ticket/14058Tristan Darricau2015-08-281-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14058] Contact us form missing email subject field in subsilver2 * Oyabun1/ticket/14058: [ticket/14058] Contact us form missing email subject field in subsilver2
| * | | | | | | [ticket/14058] Contact us form missing email subject field in subsilver2Oyabun12015-07-311-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14058
* | | | | | | | Merge pull request #3809 from marc1706/ticket/14070Tristan Darricau2015-08-281-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14070] Properly pass whether config should be ignored for avatars * marc1706/ticket/14070: [ticket/14070] Properly pass whether config should be ignored for avatars
| * | | | | | | | [ticket/14070] Properly pass whether config should be ignored for avatarsMarc Alexander2015-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14070
* | | | | | | | | [ticket/14127] Fix the BBCode FAQ about auto-linking w/o protocolZoddo2015-08-251-1/+1
| |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This error was accidentally introduced in the patch for PHPBB3-13967 (PR #3729) PHPBB3-14127
* | | | | | | | [3.1.x] Update version to 3.1.7-devJoas Schilling2015-08-232-2/+2
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | [prep-release-3.1.6] Add changelog for 3.1.6-RC1Joas Schilling2015-08-231-0/+89
| | | | | | |
* | | | | | | [prep-release-3.1.6] Add migration for 3.1.6-RC1Joas Schilling2015-08-231-0/+31
| | | | | | |
* | | | | | | [prep-release-3.1.6] Update version to 3.1.6-RC1Joas Schilling2015-08-235-7/+7
| | | | | | |
* | | | | | | Merge pull request #3829 from Nicofuma/ticket/14099Joas Schilling2015-08-233-21/+48
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14099] Update Twig to 1.20.0
| * | | | | | | [ticket/14099] Fix the assetsTristan Darricau2015-08-181-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14099
| * | | | | | | [ticket/14099] Fix testsTristan Darricau2015-08-141-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14099
| * | | | | | | [ticket/14099] Update twig/twig to 1.20.0Tristan Darricau2015-08-142-21/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14099
* | | | | | | | Merge pull request #3823 from lavigor/ticket/14087Marc Alexander2015-08-221-1/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14087] Add an event to ucp_activate.php.
| * | | | | | | | [ticket/14087] Add an event to ucp_activate.php.lavigor2015-08-091-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14087
* | | | | | | | | Merge pull request #3834 from brunoais/ticket/14104Marc Alexander2015-08-221-0/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14104] Fix missing variables from previous commit
| * | | | | | | | | [ticket/14104] Fix missing variables from previous commitbrunoais2015-08-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing variables wrongly attributed in PHPBB3-13691 PHPBB3-14104
* | | | | | | | | | Merge pull request #3831 from rxu/ticket/14101Marc Alexander2015-08-221-0/+24
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14101] Add core event to the download/file.php
| * | | | | | | | | | [ticket/14101] Add core event to the download/file.phprxu2015-08-151-0/+24
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14101
* | | | | | | | | | Merge pull request #3852 from marc1706/ticket/14068Marc Alexander2015-08-223-0/+22
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14068] Add template events before and after poll panel in viewtopic
| * | | | | | | | | | [ticket/14068] Add template events before and after poll paneljaviexin2015-08-223-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In viewtopic. PHPBB3-14068
* | | | | | | | | | | Merge pull request #3771 from Zoddo/ticket/14025Marc Alexander2015-08-223-2/+22
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14091] Add mcp_topic_subject_* template events Conflicts: phpBB/docs/events.md
| * | | | | | | | | | [ticket/14091] Add mcp_topic_subject_* template eventsZoddo2015-08-113-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some options (field, checkbox, ...) before/after the subject field when split a subject PHPBB3-14091