aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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
* Merge pull request #3764 from Zoddo/ticket/13988Tristan Darricau2015-08-282-5/+3
|\ | | | | | | | | | | | | | | [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] Update testsZoddo2015-07-181-1/+1
| | | | | | | | PHPBB3-13988
| * [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
* | | | | Merge pull request #3862 from Zoddo/ticket/14127Tristan Darricau2015-08-271-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14127] Fix the BBCode FAQ about auto-linking w/o protocol * Zoddo/ticket/14127: [ticket/14127] Fix the BBCode FAQ about auto-linking w/o protocol
| * | | | | [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-233-3/+3
| | | | |
* | | | | Merge branch 'prep-release-3.1.6' into 3.1.xJoas Schilling2015-08-238-8/+128
|\ \ \ \ \
| * | | | | [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-236-8/+8
|/ / / / /
* | | | | Merge pull request #3829 from Nicofuma/ticket/14099Joas Schilling2015-08-235-30/+50
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14099] Update Twig to 1.20.0
| * | | | | [ticket/14099] Fix the assetsTristan Darricau2015-08-181-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14099
| * | | | | [ticket/14099] Make composer.phar executable againTristan Darricau2015-08-171-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14099
| * | | | | [ticket/14099] Fix testsTristan Darricau2015-08-142-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14099
| * | | | | [ticket/14099] Update twig/twig to 1.20.0Tristan Darricau2015-08-142-21/+29
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14099
| * | | | | [ticket/14099] Update composer.pharTristan Darricau2015-08-141-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | Merge pull request #3813 from rxu/ticket/14072Marc Alexander2015-08-221-0/+23
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | [ticket/14072] Add core event to the function format_display()
| * | | | | | | | | [ticket/14072] Add core event to the function format_display()rxu2015-08-061-0/+23
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14072
* | | | | | | | | Merge pull request #3803 from rxu/ticket/14064Marc Alexander2015-08-223-2/+74
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14064] Add template events to ucp_pm_history.html
| * | | | | | | | | [ticket/14064] Add template events to ucp_pm_history.htmlrxu2015-08-033-2/+74
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14064
* | | | | | | | | Merge pull request #3806 from rxu/ticket/14067Marc Alexander2015-08-223-0/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14067] Add template events to overall_header.html around feeds
| * | | | | | | | | [ticket/14067] Add template events to overall_header.html around feedsrxu2015-08-053-0/+10
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14067
* | | | | | | | | Merge pull request #3804 from rxu/ticket/14065Marc Alexander2015-08-223-3/+40
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14065] Add template events to attachment.html
| * | | | | | | | | [ticket/14065] Add template events to attachment.htmlrxu2015-08-033-3/+40
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additionally remove some unnecessary empty lines. PHPBB3-14065
* | | | | | | | | Merge pull request #3849 from marc1706/ticket/14037Marc Alexander2015-08-201-0/+20
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14037] Allows adapting memberlist profile fields headline
| * | | | | | | | | [ticket/14037] Minor coding style improvements to eventMarc Alexander2015-08-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14037
| * | | | | | | | | [ticket/14037] Allows adapting memberlist profile fields headlinejaviexin2015-08-201-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds an event to allow modifying the profile fields headline in line with modifications to profile fields data. PHPBB3-14037
* | | | | | | | | | Merge pull request #3797 from RMcGirr83/ticket/13863Marc Alexander2015-08-203-6/+14
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13863] Add topic_row_append/prepend to mcp_forum.html
| * | | | | | | | | | [ticket/13863] Spaces not tabsRMcGirr832015-07-291-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13863
| * | | | | | | | | | [ticket/13863] Add topic_row_append/prepend to mcp_forum.htmlRichard McGirr2015-07-283-6/+14
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13863
* | | | | | | | | | Merge pull request #3783 from Zoddo/ticket/14041Marc Alexander2015-08-202-0/+17
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | [ticket/14041] Add viewtopic_dropdown_*_custom template event
| * | | | | | | | | [ticket/14041] Add viewtopic_dropdown_*_custom template eventZoddo2015-07-212-0/+17
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows an extension to create a custom dropdown menu. PHPBB3-14041 PHPBB3-14042